diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-11-01 12:19:09 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-11-02 22:07:53 +0100 |
commit | bc5069ac40a19fc0f421403c9f8ae7e645b34cbb (patch) | |
tree | 630f91fad103ece03f8d9e15f6e074dbe8c70a09 /solenv/gbuild | |
parent | 64a882888665dcbe15acc5793e7c9cf5f1bdc575 (diff) |
remove SOLARENV variable
It is constant and can just be replaced by $(SRCDIR)/solenv.
Use BUILD_TYPE where it was used to check if config_*.mk is sourced.
Change-Id: Ib9d480c57194b6340093aa47776f8768df69b7d1
Diffstat (limited to 'solenv/gbuild')
-rw-r--r-- | solenv/gbuild/CliAssembly.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/ComponentTarget.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/CppunitTest.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/Gallery.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/InstallModuleTarget.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/InstallScript.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/Rdb.mk | 3 | ||||
-rw-r--r-- | solenv/gbuild/extensions/pre_SharedLangList.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/partial_build.mk | 4 | ||||
-rw-r--r-- | solenv/gbuild/platform/macosx.mk | 4 |
10 files changed, 13 insertions, 12 deletions
diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk index 7c6e3b7b2c45..5683ae7b2c2d 100644 --- a/solenv/gbuild/CliAssembly.mk +++ b/solenv/gbuild/CliAssembly.mk @@ -9,7 +9,7 @@ # CliConfigTarget class -gb_CliConfigTarget_TARGET := $(SOLARENV)/bin/clipatchconfig.pl +gb_CliConfigTarget_TARGET := $(SRCDIR)/solenv/bin/clipatchconfig.pl gb_CliConfigTarget_COMMAND := $(PERL) -w $(gb_CliConfigTarget_TARGET) gb_CliConfigTarget_VERSIONFILE_DEFAULT := $(SRCDIR)/cli_ure/version/version.txt diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk index 0957f9f5527d..56fa9e627993 100644 --- a/solenv/gbuild/ComponentTarget.mk +++ b/solenv/gbuild/ComponentTarget.mk @@ -17,7 +17,7 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -gb_ComponentTarget_XSLTCOMMANDFILE := $(SOLARENV)/bin/createcomponent.xslt +gb_ComponentTarget_XSLTCOMMANDFILE := $(SRCDIR)/solenv/bin/createcomponent.xslt gb_ComponentTarget_get_source = $(SRCDIR)/$(1).component # In the DISABLE_DYNLOADING case we don't need any COMPONENTPREFIX, we diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 21b828f95f0e..f05bae726da2 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -27,7 +27,7 @@ printf '\nError: a unit test failed, please do one of:\n\nexport DEBUGCPPUNIT=TR endef ifeq ($(strip $(DEBUGCPPUNIT)),TRUE) -gb_CppunitTest_GDBTRACE := gdb -nx -ex "add-auto-load-safe-path $(INSTDIR)" --command=$(SOLARENV)/bin/gdbtrycatchtrace-stdout -return-child-result --args +gb_CppunitTest_GDBTRACE := gdb -nx -ex "add-auto-load-safe-path $(INSTDIR)" --command=$(SRCDIR)/solenv/bin/gdbtrycatchtrace-stdout -return-child-result --args else ifneq ($(strip $(CPPUNITTRACE)),) gb_CppunitTest_GDBTRACE := $(CPPUNITTRACE) gb_CppunitTest__interactive := $(true) diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk index b61bb02297e9..63090fa9c8a6 100644 --- a/solenv/gbuild/Gallery.mk +++ b/solenv/gbuild/Gallery.mk @@ -11,7 +11,7 @@ # Handles creation of image galleries. -gb_Gallery_TRANSLATE := $(SOLARENV)/bin/desktop-translate.pl +gb_Gallery_TRANSLATE := $(SRCDIR)/solenv/bin/desktop-translate.pl gb_Gallery_INSTDIR := $(LIBO_SHARE_FOLDER)/gallery # BRAND_BASE_DIR is for resource files diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index 9cfc0c4ae438..54848b0bf0d8 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -129,7 +129,7 @@ endef # ScpTarget class -gb_ScpTarget_TARGET := $(SOLARENV)/bin/pre2par.pl +gb_ScpTarget_TARGET := $(SRCDIR)/solenv/bin/pre2par.pl gb_ScpTarget_COMMAND := $(PERL) $(gb_ScpTarget_TARGET) define gb_ScpTarget__command diff --git a/solenv/gbuild/InstallScript.mk b/solenv/gbuild/InstallScript.mk index 41e94f5c7615..593bd3e0861b 100644 --- a/solenv/gbuild/InstallScript.mk +++ b/solenv/gbuild/InstallScript.mk @@ -9,7 +9,7 @@ # InstallScript class -gb_InstallScript_TARGET := $(SOLARENV)/bin/par2script.pl +gb_InstallScript_TARGET := $(SRCDIR)/solenv/bin/par2script.pl gb_InstallScript_COMMAND := $(PERL) $(gb_InstallScript_TARGET) gb_InstallScript__make_arglist = $(subst $(WHITESPACE),$(COMMA),$(strip $(1))) diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk index 9ec2d0f92c3c..d65aec6b76f1 100644 --- a/solenv/gbuild/Rdb.mk +++ b/solenv/gbuild/Rdb.mk @@ -17,7 +17,8 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach component,$(COMPONENTS),echo "<filename>$(call gb_ComponentTarget_get_target,$(component))</filename>" &&) \ echo '</list>' \ ) > $(1).input && \ - $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $(1) $(SOLARENV)/bin/packcomponents.xslt $(1).input && \ + $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $(1) \ + $(SRCDIR)/solenv/bin/packcomponents.xslt $(1).input && \ rm $(1).input) endef diff --git a/solenv/gbuild/extensions/pre_SharedLangList.mk b/solenv/gbuild/extensions/pre_SharedLangList.mk index e42c697df784..16ab3fc1c600 100644 --- a/solenv/gbuild/extensions/pre_SharedLangList.mk +++ b/solenv/gbuild/extensions/pre_SharedLangList.mk @@ -17,7 +17,7 @@ # # share language list with dmake build system -include $(SOLARENV)/inc/langlist.mk +include $(SRCDIR)/solenv/inc/langlist.mk ifneq ($(WITH_LANG),ALL) gb_WITH_LANG=$(WITH_LANG) diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk index 87e37ccd9ef2..68e807b97615 100644 --- a/solenv/gbuild/partial_build.mk +++ b/solenv/gbuild/partial_build.mk @@ -25,12 +25,12 @@ ifeq (,$(BUILDDIR)) BUILDDIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))../.. endif -ifeq ($(SOLARENV),) +ifeq ($(BUILD_TYPE),) include $(BUILDDIR)/config_$(gb_Side).mk endif gb_PARTIAL_BUILD := T -include $(SOLARENV)/gbuild/gbuild.mk +include $(SRCDIR)/solenv/gbuild/gbuild.mk $(eval $(call gb_Module_make_global_targets,$(wildcard $(module_directory)/Module*.mk))) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index a57530b53c7a..c46cba10511f 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -151,9 +151,9 @@ $(call gb_Helper_abbreviate_dirs,\ -o $(1) && \ $(if $(SOVERSIONSCRIPT),ln -sf $(1) $(ILIBTARGET),:) && \ $(if $(filter Executable,$(TARGETTYPE)), \ - $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl app $(LAYER) $(1) &&) \ + $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl app $(LAYER) $(1) &&) \ $(if $(filter Library Bundle CppunitTest,$(TARGETTYPE)),\ - $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl shl $(LAYER) $(1) &&) \ + $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl $(LAYER) $(1) &&) \ $(if $(MACOSX_CODESIGNING_IDENTITY), \ $(if $(filter Executable,$(TARGETTYPE)), \ (codesign --identifier=$(MACOSX_BUNDLE_IDENTIFIER).$(notdir $(1)) --sign $(MACOSX_CODESIGNING_IDENTITY) --force $(1) || true) &&)) \ |