diff options
| author | David Tardon <dtardon@redhat.com> | 2013-11-26 19:38:01 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-11-26 19:43:15 +0100 |
| commit | fe7a5819cd63a0f67f42dc986cfe8858bdf05ef5 (patch) | |
| tree | 64a6f505d9d7c7483fd015f32f8f4f46eaed456e /instsetoo_native | |
| parent | 856a85706301ba7a899e850f75cb4978c1d1f25f (diff) | |
generate setuprc for instdir
Change-Id: I70418c4911aab0c24b5b198566fa69fdad0f1da2
(cherry picked from commit 3cac074a55a5872182fb9b3b7120093f4d2dcf82)
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 8 | ||||
| -rw-r--r-- | instsetoo_native/Package_setup.mk | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 5d3c55e83607..81d48b636035 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -16,6 +16,7 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\ $(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call gb_Helper_get_rcfile,pythonloader.uno)) \ $(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \ $(call gb_Helper_get_rcfile,redirect))) \ + $(call gb_Helper_get_rcfile,setup) \ $(call gb_Helper_get_rcfile,soffice) \ $(call gb_Helper_get_rcfile,uno) \ $(call gb_Helper_get_rcfile,version) \ @@ -111,6 +112,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,setup) : + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + ( \ + echo '[Bootstrap]' \ + && echo 'buildid=$(LIBO_VERSION_MAJOR)$(LIBO_VERSION_MINOR)$(LIBO_VERSION_MICRO)(Build:$(LIBO_VERSION_PATCH))' \ + ) > $@ + $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,soffice) : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) ( \ diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk index fd057725e57d..19e36816f59d 100644 --- a/instsetoo_native/Package_setup.mk +++ b/instsetoo_native/Package_setup.mk @@ -16,6 +16,7 @@ $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\ $(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call gb_Helper_get_rcfile,pythonloader.uno)) \ $(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \ $(call gb_Helper_get_rcfile,redirect))) \ + $(call gb_Helper_get_rcfile,setup) \ $(call gb_Helper_get_rcfile,soffice) \ $(call gb_Helper_get_rcfile,uno) \ $(call gb_Helper_get_rcfile,version) \ |