summaryrefslogtreecommitdiffstats
path: root/solenv/gbuild/extensions
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-02-04 18:01:24 +0100
committerMichael Stahl <mstahl@redhat.com>2014-02-04 21:16:16 +0100
commit429255d1636e364b8054cc8fc4c417f10f783a54 (patch)
treeb5bddf25e136529ab2fad2f063e5b24f46167492 /solenv/gbuild/extensions
parentremove lang path substitution (diff)
downloadcore-429255d1636e364b8054cc8fc4c417f10f783a54.tar.gz
core-429255d1636e364b8054cc8fc4c417f10f783a54.zip
gbuild: add gb_Helper_register_jars_for_install
Change-Id: I560a8eded4747a9332f5dac29009eafd3d6e68b7
Diffstat (limited to 'solenv/gbuild/extensions')
-rw-r--r--solenv/gbuild/extensions/post_PackageInfo.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk b/solenv/gbuild/extensions/post_PackageInfo.mk
index 03a0f2439111..6ae47ee39229 100644
--- a/solenv/gbuild/extensions/post_PackageInfo.mk
+++ b/solenv/gbuild/extensions/post_PackageInfo.mk
@@ -28,6 +28,7 @@ define gb_PackageInfo_emit_binaries_command
@touch $(foreach suf,executables libraries files,$(gb_PackageInfo_get_target)/$(1).$(suf))
@$(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
@echo "$(foreach suf,executables libraries files,$(gb_PackageInfo_get_target)/$(1).$(suf)) \\" >> $(WORKDIR)/Dep/packageinfo.d
endef
@@ -100,6 +101,10 @@ install-package-%: $(gb_PackageInfo_get_target)/packageinfo_all
do \
install -D -m644 $(INSTDIR)/$${library} $(INSTALLDIR)/$${library}; \
done
+ for jar in `cat $(gb_PackageInfo_get_target)/$*.jars`; \
+ do \
+ install -D -m644 $(INSTDIR)/$${jar} $(INSTALLDIR)/$${jar}; \
+ done
for file in `cat $(gb_PackageInfo_get_target)/$*.files`; \
do \
install -D -m644 $(INSTDIR)/$${file} $(INSTALLDIR)/$${file}; \