diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-04 20:37:14 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-04 21:16:16 +0100 |
| commit | ba26251f4d2b76f7f3e027d75542e8e0965a2aed (patch) | |
| tree | 6f95d6dc3785912125cbfc3a77e9cee61479865e /solenv | |
| parent | 4f346c9c1610a1c4b7ecc11ff3b99980763635a0 (diff) | |
gbuild: add gb_Helper_register_packages_for_install
Change-Id: I855a7e260a9ad05d655d121dbed97597b21187d2
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/AutoInstall.mk | 5 | ||||
| -rw-r--r-- | solenv/gbuild/Helper.mk | 7 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/post_PackageInfo.mk | 1 |
3 files changed, 12 insertions, 1 deletions
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk index de3b67f3f384..cdcef0aad34d 100644 --- a/solenv/gbuild/AutoInstall.mk +++ b/solenv/gbuild/AutoInstall.mk @@ -25,13 +25,16 @@ $(call gb_AutoInstall_get_target,%) : $(SRCDIR)/Repository.mk $(GBUILDDIR)/AutoI $(call gb_AutoInstall__make_define,\ $(foreach lib,$(gb_Library_MODULE_$*),auto_$*_lib_$(lib)) \ $(foreach exe,$(gb_Executable_MODULE_$*),auto_$*_exe_$(exe)) \ - $(foreach jar,$(gb_Jar_MODULE_$*),auto_$*_jar_$(jar))) + $(foreach jar,$(gb_Jar_MODULE_$*),auto_$*_jar_$(jar)) \ + $(foreach pkg,$(gb_Package_MODULE_$*),auto_$*_pkg_$(pkg))) $(foreach lib,$(gb_Library_MODULE_$*),\ echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@;) $(foreach exe,$(gb_Executable_MODULE_$*),\ echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(subst -,_,$(exe)),$(call gb_Executable_get_filename,$(exe)))" >> $@;) $(foreach jar,$(gb_Jar_MODULE_$*),\ echo '$(SCP2JARTEMPLATE)(auto_$*_jar_$(subst -,_,$(jar)),$(jar).jar)' >> $@;) + $(foreach pkg,$(gb_Package_MODULE_$*),\ + echo 'PACKAGE_FILELIST(auto_$*_pkg_$(subst -,_,$(pkg)),$(pkg).filelist)' >> $@;) $(call gb_AutoInstall_get_clean_target,%) : diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 16a991a27f21..f640812c8ebf 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -186,6 +186,13 @@ gb_Jar_MODULE_$(2) += $(3) endef +# $(call gb_Helper_register_packages_for_install,installmodule,packages) +define gb_Helper_register_packages_for_install + +gb_Package_MODULE_$(1) += $(2) + +endef + define gb_Helper_define_if_set $(foreach def,$(1),$(if $(filter TRUE YES,$($(def))),-D$(def))) endef diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk b/solenv/gbuild/extensions/post_PackageInfo.mk index 6ae47ee39229..0063e88d8a43 100644 --- a/solenv/gbuild/extensions/post_PackageInfo.mk +++ b/solenv/gbuild/extensions/post_PackageInfo.mk @@ -29,6 +29,7 @@ define gb_PackageInfo_emit_binaries_command @$(foreach executable,$(gb_Executable_MODULE_$(1)),echo "$(patsubst $(INSTDIR)/%,%,$(call gb_Executable_get_target,$(executable)))" >> $(gb_PackageInfo_get_target)/$(1).executables &&) true @$(foreach library,$(gb_Library_MODULE_$(1)),echo "$(patsubst $(INSTDIR)/%,%,$(call gb_Library_get_target,$(library)))" >> $(gb_PackageInfo_get_target)/$(1).libraries &&) true @$(foreach jar,$(gb_Jar_MODULE_$(1)),echo "$(patsubst $(INSTDIR)/%,%,$(call gb_Jar_get_target,$(jar)))" >> $(gb_PackageInfo_get_target)/$(1).jars &&) true +@$(foreach pkg,$(gb_Package_MODULE_$(1)),echo "$(call gb_Package_get_target,$(pkg))" >> $(gb_PackageInfo_get_target)/$(1).packages &&) true @echo "$(foreach suf,executables libraries files,$(gb_PackageInfo_get_target)/$(1).$(suf)) \\" >> $(WORKDIR)/Dep/packageinfo.d endef |