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

17 files changed, 21 insertions, 20 deletions

diff --git a/solenv/bin/callcatcher.Makefile b/solenv/bin/callcatcher.Makefile
index fc11e54c998b..58bfe6fb3b83 100644
--- a/solenv/bin/callcatcher.Makefile
+++ b/solenv/bin/callcatcher.Makefile
@@ -20,7 +20,7 @@ export AR:=callarchive $(AR)
 endif
 export dbglevel:=2
 
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(SRCDIR)/solenv/gbuild/gbuild.mk
 
 findunusedcode:
 	$(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index 73688563c462..3787bec50d79 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-GDBDIR="${SOLARENV}/gdb"
+GDBDIR="${SRCDIR}/solenv/gdb"
 INSTALLDIR="${TESTINSTALLDIR}"
 DYLIB=so
 if [ "$(uname)" = Darwin ]; then
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 81e52f9f89ae..48aaadac2ba5 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -19,7 +19,7 @@
 use strict;
 use warnings;
 
-use lib ("$ENV{SOLARENV}/bin/modules");
+use lib ("$ENV{SRCDIR}/solenv/bin/modules");
 
 use installer qw(main);
 
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 9d1c200e89b1..ef7f2f6777e9 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -159,7 +159,7 @@ sub getparameter
     }
 
     # Usage of simple installer (not for Windows):
-    # $PERL -w $SOLARENV/bin/make_installer.pl \
+    # $PERL -w $SRCDIR/solenv/bin/make_installer.pl \
     # -f openoffice.lst -l en-US -p OpenOffice \
     # -buildid $BUILD -rpm \
     # -destdir /tmp/nurk -simple $INSTALL_PATH
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 138195c42be1..c14b771f2a9f 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -97,7 +97,7 @@ print "Running LibreOffice installer\n";
 system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
         "perl " .
         (scalar keys(%DB::sub) ? "-d " : "") .
-        "-w $ENV{SOLARENV}/bin/make_installer.pl " .
+        "-w $ENV{SRCDIR}/solenv/bin/make_installer.pl " .
         "-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p LibreOffice " .
         "-u $tmp_dir " .
         "-buildid $BUILD $destdir $strip $msi " .
@@ -106,7 +106,7 @@ system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
 if ($ENV{BUILD_TYPE} =~ m/ODK/) {
     print "Running SDK installer\n";
     system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
-            "perl -w $ENV{SOLARENV}/bin/make_installer.pl " .
+            "perl -w $ENV{SRCDIR}/solenv/bin/make_installer.pl " .
             "-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l en-US -p LibreOffice_SDK " .
             "-u $tmp_dir " .
             "-buildid $BUILD $destdir $strip $msi " .
diff --git a/solenv/bin/par2script.pl b/solenv/bin/par2script.pl
index aac638d524be..000da995b4a8 100644
--- a/solenv/bin/par2script.pl
+++ b/solenv/bin/par2script.pl
@@ -16,7 +16,7 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-use lib ("$ENV{SOLARENV}/bin/modules");
+use lib ("$ENV{SRCDIR}/solenv/bin/modules");
 
 use Cwd;
 use par2script::check;
diff --git a/solenv/bin/pre2par.pl b/solenv/bin/pre2par.pl
index 8c7a32ea7043..42c319dd2c08 100644
--- a/solenv/bin/pre2par.pl
+++ b/solenv/bin/pre2par.pl
@@ -16,7 +16,7 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-use lib ("$ENV{SOLARENV}/bin/modules");
+use lib ("$ENV{SRCDIR}/solenv/bin/modules");
 
 use Cwd;
 use pre2par::directory;
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) &&)) \