[Libreoffice-commits] core.git: 5 commits - Repository.mk scp2/AutoInstall.mk scp2/inc scp2/source solenv/gbuild testtools/Jar_testComponent.mk
Michael Stahl
mstahl at redhat.com
Tue Feb 4 12:22:35 PST 2014
Repository.mk | 15 +++-
scp2/AutoInstall.mk | 4 -
scp2/inc/macros.inc | 15 ++++
scp2/source/ooo/ure.scp | 95 ---------------------------
solenv/gbuild/AutoInstall.mk | 13 ++-
solenv/gbuild/Helper.mk | 15 ++++
solenv/gbuild/Jar.mk | 3
solenv/gbuild/extensions/post_PackageInfo.mk | 6 +
testtools/Jar_testComponent.mk | 2
9 files changed, 65 insertions(+), 103 deletions(-)
New commits:
commit 5784cafe46338d3b94818213a4443d11c1324af9
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 4 20:56:25 2014 +0100
scp2: migrate URE Packages to AutoInstall
Change-Id: I98a272e8cf009aa04bbd07ee333f9853e2a906d2
diff --git a/Repository.mk b/Repository.mk
index 98c9da5..9f5a723 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -697,6 +697,15 @@ $(eval $(call gb_Helper_register_jars,NONE,\
))
endif
+$(eval $(call gb_Helper_register_packages_for_install,ure,\
+ ure_install \
+ $(if $(ENABLE_JAVA),\
+ jvmfwk_javavendors \
+ jvmfwk_jreproperties \
+ $(if $(filter MACOSX,$(OS)),bridges_jnilib_java_uno) \
+ ) \
+))
+
# External executables
$(eval $(call gb_ExternalExecutable_register_executables,\
genbrk \
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 8bd22f9..7069ee6 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -265,30 +265,6 @@ ProfileItem gid_Profileitem_Dl_Uno_Uno_Services
End
#endif
-File gid_File_ure_install
- Dir = FILELIST_DIR;
- Name = "ure_install.filelist";
- Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED);
-End
-
-
-#if defined ENABLE_JAVA
-File gid_File_Dl_JrepropertiesClass
- TXT_FILE_BODY;
- Dir = FILELIST_DIR;
- Name = "jvmfwk_jreproperties.filelist";
- Styles = (FILELIST, PACKED);
-End
-#endif
-
-#if defined ENABLE_JAVA && defined MACOSX
-File gid_File_bridges_jnilib_java_uno
- Dir = FILELIST_DIR;
- Name = "bridges_jnilib_java_uno.filelist";
- Styles = (FILELIST);
-End
-#endif
-
#if defined _MSC_VER
File gid_File_Dl_Cli_Uno
@@ -526,17 +502,6 @@ File gid_File_Misc_ServicesRdb
Styles = (PACKED);
End
-// Private Miscellaneous Files:
-
-#if defined ENABLE_JAVA
-File gid_File_Misc_JavavendorsXml
- TXT_FILE_BODY;
- Dir = FILELIST_DIR;
- Name = "jvmfwk_javavendors.filelist";
- Styles = (FILELIST, PACKED);
-End
-#endif
-
//Module
Module gid_Module_Root_Ure_Hidden
@@ -585,9 +550,6 @@ Module gid_Module_Root_Ure_Hidden
gid_Unixlink_File_Dl_Salhelper,
gid_File_Dl_Profile_Uno,
gid_Unixlink_File_Dl_Rmcxt,
- gid_File_Dl_JrepropertiesClass,
- gid_File_bridges_jnilib_java_uno,
- gid_File_ure_install,
gid_File_Dl_Jpipe,
gid_File_Dl_Jpipx,
gid_File_Dl_Libxml2,
@@ -599,8 +561,7 @@ Module gid_Module_Root_Ure_Hidden
gid_File_Lib_Msvcm80_Ure,
gid_File_Msvcm80crt_Manifest_Ure,
gid_File_Misc_TypesRdb,
- gid_File_Misc_ServicesRdb,
- gid_File_Misc_JavavendorsXml);
+ gid_File_Misc_ServicesRdb);
Unixlinks = (gid_Unixlink_File_Dl_Sal,
gid_Unixlink_File_Dl_Salhelper,
gid_Unixlink_File_Dl_Cppu,
commit ba26251f4d2b76f7f3e027d75542e8e0965a2aed
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 4 20:37:14 2014 +0100
gbuild: add gb_Helper_register_packages_for_install
Change-Id: I855a7e260a9ad05d655d121dbed97597b21187d2
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index a1580fd..c70bafd 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -140,6 +140,13 @@
Styles = (FILELIST,HELPPACK,LANGUAGEMODULE)
#endif
+#define PACKAGE_FILELIST(id,name) \
+File id \
+ Dir = FILELIST_DIR; \
+ Name = name; \
+ Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED); \
+End
+
#define PACKED_LIB_FILE_BODY \
LIB_FILE_BODY; \
Styles = (PACKED); \
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index de3b67f..cdcef0a 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 16a991a..f640812 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 6ae47ee..0063e88 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
commit 4f346c9c1610a1c4b7ecc11ff3b99980763635a0
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 4 18:28:46 2014 +0100
gbuild: component files for Jars in NONE layer and move testComponent
... from URE to NONE.
Change-Id: If43e07b88f2ab0e845f77d1f1a835627e5c48dd7
diff --git a/Repository.mk b/Repository.mk
index 576e5a4..98c9da5 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -645,10 +645,6 @@ $(eval $(call gb_Helper_register_jars_for_install,URE,ure, \
unoloader \
))
-$(eval $(call gb_Helper_register_jars,URE, \
- testComponent \
-))
-
$(eval $(call gb_Helper_register_jars,OOO, \
ConnectivityTools \
ScriptFramework \
@@ -697,6 +693,7 @@ $(eval $(call gb_Helper_register_jars,NONE,\
TestExtension \
test \
test-tools \
+ testComponent \
))
endif
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 1253c22..56a4ef8 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -255,8 +255,9 @@ gb_Jar_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dLO_JAVA_DIR/ \
URE:vnd.sun.star.expand:\dURE_INTERNAL_JAVA_DIR/ \
OXT:./ \
+ NONE:$(call gb_Helper_make_url,$(WORKDIR)/Jar) \
-# get component prefix from layer name ("OOO", "URE", "OXT", "INTERN")
+# get component prefix from layer name ("OOO", "URE", "OXT", "NONE")
gb_Jar__get_componentprefix = \
$(patsubst $(1):%,%,$(or \
$(filter $(1):%,$(gb_Jar_COMPONENTPREFIXES)), \
diff --git a/testtools/Jar_testComponent.mk b/testtools/Jar_testComponent.mk
index ab2a50c..b2df551 100644
--- a/testtools/Jar_testComponent.mk
+++ b/testtools/Jar_testComponent.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Jar_set_packageroot,testComponent,com))
$(eval $(call gb_Jar_set_manifest,testComponent,$(SRCDIR)/testtools/com/sun/star/comp/bridge/manifest))
-$(eval $(call gb_Jar_set_componentfile,testComponent,testtools/source/bridgetest/testComponent,URE))
+$(eval $(call gb_Jar_set_componentfile,testComponent,testtools/source/bridgetest/testComponent,NONE))
$(eval $(call gb_Jar_add_packagedirs,testComponent,\
$(call gb_CustomTarget_get_workdir,testtools/bridgetest_javamaker)/test \
commit 9870a5f73dcfa6c2c15bc1fc6ba70fa3539f33ac
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 4 18:03:46 2014 +0100
scp2: move URE jars to AutoInstall
Change-Id: I68c5f5ac015e8c5d8efd60921f38eb31c6f8088d
diff --git a/Repository.mk b/Repository.mk
index 2e820e7..576e5a4 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -636,15 +636,19 @@ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
passive_native \
))
-$(eval $(call gb_Helper_register_jars,URE, \
+ifneq ($(ENABLE_JAVA),)
+$(eval $(call gb_Helper_register_jars_for_install,URE,ure, \
java_uno \
juh \
jurt \
ridl \
- testComponent \
unoloader \
))
+$(eval $(call gb_Helper_register_jars,URE, \
+ testComponent \
+))
+
$(eval $(call gb_Helper_register_jars,OOO, \
ConnectivityTools \
ScriptFramework \
@@ -694,6 +698,7 @@ $(eval $(call gb_Helper_register_jars,NONE,\
test \
test-tools \
))
+endif
# External executables
$(eval $(call gb_ExternalExecutable_register_executables,\
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 6ec7d32..7871455 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE))
+$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE))
$(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE))
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 1ec649d..a1580fd 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -222,6 +222,14 @@
Styles = (PACKED,DONT_OVERWRITE); \
End
+#define URE_JAR_FILE(id,name) \
+ File id \
+ TXT_FILE_BODY; \
+ Name = name; \
+ Dir = GID_DIR_URE_JAVA; \
+ Styles = (PACKED); \
+ End
+
#define JARFILENAME(name) STRING(CONCAT2(name,.jar))
#define SPECIAL_COMPONENT_LIB_FILE(id,name) \
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 3cf19c2..8bd22f9 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -510,55 +510,6 @@ End
#endif
-// Public JARs:
-
-#if defined ENABLE_JAVA
-File gid_File_Java_UnoloaderJar
- TXT_FILE_BODY;
- Dir = GID_DIR_URE_JAVA;
- Name = "unoloader.jar";
- Styles = (PACKED);
-End
-#endif
-
-#if defined ENABLE_JAVA
-File gid_File_Java_JuhJar
- TXT_FILE_BODY;
- Dir = GID_DIR_URE_JAVA;
- Name = "juh.jar";
- Styles = (PACKED);
-End
-#endif
-
-#if defined ENABLE_JAVA
-File gid_File_Java_JurtJar
- TXT_FILE_BODY;
- Dir = GID_DIR_URE_JAVA;
- Name = "jurt.jar";
- Styles = (PACKED);
-End
-#endif
-
-#if defined ENABLE_JAVA
-File gid_File_Java_RidlJar
- TXT_FILE_BODY;
- Dir = GID_DIR_URE_JAVA;
- Name = "ridl.jar";
- Styles = (PACKED);
-End
-#endif
-
-// Private JARs:
-
-#if defined ENABLE_JAVA
-File gid_File_Java_JavaUnoJar
- TXT_FILE_BODY;
- Dir = GID_DIR_URE_JAVA;
- Name = "java_uno.jar";
- Styles = (PACKED);
-End
-#endif
-
// Public Miscellaneous Files:
File gid_File_Misc_TypesRdb
@@ -647,11 +598,6 @@ Module gid_Module_Root_Ure_Hidden
gid_File_Lib_Msvcp80_Ure,
gid_File_Lib_Msvcm80_Ure,
gid_File_Msvcm80crt_Manifest_Ure,
- gid_File_Java_UnoloaderJar,
- gid_File_Java_JuhJar,
- gid_File_Java_JurtJar,
- gid_File_Java_RidlJar,
- gid_File_Java_JavaUnoJar,
gid_File_Misc_TypesRdb,
gid_File_Misc_ServicesRdb,
gid_File_Misc_JavavendorsXml);
commit 429255d1636e364b8054cc8fc4c417f10f783a54
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 4 18:01:24 2014 +0100
gbuild: add gb_Helper_register_jars_for_install
Change-Id: I560a8eded4747a9332f5dac29009eafd3d6e68b7
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index ca4b99d..6ec7d32 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,"ISCHECKFORPRODUCTUPDATES=1"))
+$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,,"ISCHECKFORPRODUCTUPDATES=1"))
$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE))
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index a754485..de3b67f 100644
--- a/solenv/gbuild/AutoInstall.mk
+++ b/solenv/gbuild/AutoInstall.mk
@@ -24,11 +24,14 @@ $(call gb_AutoInstall_get_target,%) : $(SRCDIR)/Repository.mk $(GBUILDDIR)/AutoI
echo "/* autogenerated installs for group $* */" > $@
$(call gb_AutoInstall__make_define,\
$(foreach lib,$(gb_Library_MODULE_$*),auto_$*_lib_$(lib)) \
- $(foreach exe,$(gb_Executable_MODULE_$*),auto_$*_exe_$(exe)))
+ $(foreach exe,$(gb_Executable_MODULE_$*),auto_$*_exe_$(exe)) \
+ $(foreach jar,$(gb_Jar_MODULE_$*),auto_$*_jar_$(jar)))
$(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)' >> $@;)
$(call gb_AutoInstall_get_clean_target,%) :
@@ -43,7 +46,7 @@ $(call gb_Helper_make_userfriendly_targets,all,AutoInstall)
endef
-# gb_AutoInstall_add_module module lib_template optional:exe_template
+# gb_AutoInstall_add_module module lib_template exe_template jar_template componentcondition
define gb_AutoInstall_add_module
$(call gb_AutoInstall_get_target,all) : $(call gb_AutoInstall_get_target,$(1))
$(call gb_AutoInstall_get_clean_target,all) : $(call gb_AutoInstall_get_clean_target,$(1))
@@ -53,7 +56,8 @@ $(call gb_AutoInstall_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
$(call gb_AutoInstall_get_target,$(1)) :| $(dir $(call gb_AutoInstall_get_target,$(1))).dir
$(call gb_AutoInstall_get_target,$(1)) : SCP2LIBTEMPLATE := $(2)
$(call gb_AutoInstall_get_target,$(1)) : SCP2EXETEMPLATE := $(3)
-$(call gb_AutoInstall_get_target,$(1)) : SCP2COMPONENTCONDITION := $(4)
+$(call gb_AutoInstall_get_target,$(1)) : SCP2JARTEMPLATE := $(4)
+$(call gb_AutoInstall_get_target,$(1)) : SCP2COMPONENTCONDITION := $(5)
endef
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index a22f2f8..16a991a 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -178,6 +178,14 @@ gb_Jar_$(1) += $(2)
endef
+# $(call gb_Helper_register_jars_for_install,layer,installmodule,jars)
+define gb_Helper_register_jars_for_install
+$(call gb_Helper_register_jars,$(1),$(3))
+
+gb_Jar_MODULE_$(2) += $(3)
+
+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 03a0f24..6ae47ee 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}; \
More information about the Libreoffice-commits
mailing list