[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - 2 commits - instsetoo_native/CustomTarget_setup.mk instsetoo_native/Package_setup.mk solenv/gbuild
Michael Meeks
michael.meeks at collabora.com
Fri Nov 27 01:32:43 PST 2015
instsetoo_native/CustomTarget_setup.mk | 9 +++++++++
instsetoo_native/Package_setup.mk | 1 +
solenv/gbuild/Gallery.mk | 5 ++++-
3 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 131edc9c4ecc2d7d40c4dbb12f25b39f819d723d
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Thu Nov 26 18:22:52 2015 +0000
Attempt to improve gallery generation dependencies.
Change-Id: Iab196e87e0eb4b063d77fe4af10c58b8355665c4
Reviewed-on: https://gerrit.libreoffice.org/20210
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
Tested-by: Michael Meeks <michael.meeks at collabora.com>
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 2ce708d..c286339 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -68,7 +68,10 @@ $(dir $(call gb_Gallery_get_target,$(1)))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
$(call gb_Gallery_get_target,%) : \
- $(call gb_Executable_get_runtime_dependencies,gengal)
+ $(call gb_Executable_get_runtime_dependencies,gengal) \
+ $(INSTDIR)/program/$(call gb_Helper_get_rcfile,gengal) \
+ $(call gb_ComponentTarget_get_target,ucb/source/core/ucb1) \
+ $(call gb_ComponentTarget_get_target,ucb/source/ucp/file/ucpfile1)
$(call gb_Gallery__command,$@,$*)
$(call gb_Gallery__get_final_target,%) :
commit 5fd04d65485d209983519c53fd3791f39fe445a1
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Thu Nov 26 13:46:14 2015 +0000
gengal: create an ini / rc file - to bootstrap services properly.
Change-Id: Ib2042d6419dafcd62aaec95efb844cb09833c266
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index e4cdd53..3edf1b8 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,instsetoo_native/setup))
$(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\
$(call gb_Helper_get_rcfile,bootstrap) \
$(call gb_Helper_get_rcfile,fundamental) \
+ $(call gb_Helper_get_rcfile,gengal) \
$(call gb_Helper_get_rcfile,louno) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \
$(call gb_Helper_get_rcfile,redirect))) \
@@ -23,6 +24,7 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,bootstrap) \
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,fundamental) \
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,gengal) \
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,louno) \
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,redirect) \
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,setup) \
@@ -120,6 +122,13 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call gb_Helper_get_rcfile,fundamental)' \
) > $@
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,gengal) :
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+ ( \
+ echo '[Bootstrap]' \
+ && echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call gb_Helper_get_rcfile,fundamental)' \
+ ) > $@
+
$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,uno) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \
diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk
index 5b1e427..2c67544 100644
--- a/instsetoo_native/Package_setup.mk
+++ b/instsetoo_native/Package_setup.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_Package_Package,instsetoo_native_setup,$(call gb_CustomTarget_g
$(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\
$(call gb_Helper_get_rcfile,bootstrap) \
$(call gb_Helper_get_rcfile,fundamental) \
+ $(call gb_Helper_get_rcfile,gengal) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \
$(call gb_Helper_get_rcfile,redirect))) \
$(call gb_Helper_get_rcfile,setup) \
More information about the Libreoffice-commits
mailing list