coup de grace for Env.Host.sh and associated files

7 files changed, 18 insertions, 23 deletions

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 21fb276ef1e5..240923d56624 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1510,7 +1510,6 @@ sub cancel_build {
     }
     print STDERR "-----------------------------------------------------------------------\n";
     print STDERR "\n";
-    print STDERR "" . $ENV{'OOO_SHELL'} . "\n";
     print STDERR "cd " . $ENV{'SRC_ROOT'} . "\n";
     print STDERR "source ./build_env\n";
     print STDERR "cd $module\n";
diff --git a/solenv/bin/create-ids b/solenv/bin/create-ids
index 2c7f976fd018..4561fb87de59 100755
--- a/solenv/bin/create-ids
+++ b/solenv/bin/create-ids
@@ -2,7 +2,7 @@
 
 # create ID file for the whole LibO tree. run it in toplevel dir
 
-. ./config_host.mk && . ./Env.Host.sh
+. ./config_host.mk
 
 # --with-outpath includes projects/$INPATH/inc (also solver/$INPATH/inc)
 if [ "$1" = "--with-outpath" ]; then
diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags
index e7cc71221e02..a2f640ccc785 100755
--- a/solenv/bin/create-tags
+++ b/solenv/bin/create-tags
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-. ./config_host.mk && . ./Env.Host.sh
+. ./config_host.mk
 
 omnicppoptions="--c++-kinds=+p --fields=+iaS --extra=+q"
 ctags -h "+.hdl.hrc" --langmap=c:+.hdl.hrc.src $omnicppoptions \
diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
index 354a91bd6b52..da5304999363 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -61,8 +61,8 @@ fetch:
 	@true
 
 # fixme: can we prevent these exports in the first place?
-$(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in
-	$(if $(filter reconfigure,$(gb_SourceEnvAndRecurse_STAGE)),$(SRCDIR)/autogen.sh,@echo "cannot reconfigure from within solarenv" && rm -f $(SRCDIR)/Env.Host.sh && exit 2)
+$(SRCDIR)/config_host.mk: autogen.lastrun configure.in ooo.lst.in config_host.mk.in
+	$(if $(filter reconfigure,$(gb_SourceEnvAndRecurse_STAGE)),$(SRCDIR)/autogen.sh,@echo "cannot reconfigure from within solarenv" && rm -f $(SRCDIR)/config.host.mk && exit 2)
 
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
@@ -110,7 +110,7 @@ docs:
 distro-pack-install:
 	@true
 
-$(SRCDIR)/Env.Host.sh:
+$(SRCDIR)/config_host.mk:
 	@true
 
 clean-host:
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 2af8930e7116..5c6b3270dc23 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -1,24 +1,24 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#  
+#
 #   Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#  
+#
 #   The contents of this file are subject to the Mozilla Public License Version
 #   1.1 (the "License"); you may not use this file except in compliance with
 #   the License or as specified alternatively below. You may obtain a copy of
 #   the License at http://www.mozilla.org/MPL/
-#  
+#
 #   Software distributed under the License is distributed on an "AS IS" basis,
 #   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
 #   for the specific language governing rights and limitations under the
 #   License.
-#  
+#
 #   Major Contributor(s):
 #   [ Copyright (C) 2011 Bjoern Michaelsen <bjoern.michaelsen@canonical.com> (initial developer) ]
-#  
+#
 #   All Rights Reserved.
-#  
+#
 #   For minor contributions see the git repository.
-#  
+#
 #   Alternatively, the contents of this file may be used under the terms of
 #   either the GNU General Public License Version 3 or later (the "GPLv3+"), or
 #   the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
@@ -117,7 +117,7 @@ build: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(I
 	$(call gb_BuildplTarget_command,instsetoo_native,--all)
 
 cross_toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
-	source $(SRCDIR)/config_build.mk && source $(SRCDIR)/Env.Build.sh && $(call gb_BuildplTarget_command,$@,--all)
+	source $(SRCDIR)/config_build.mk && $(call gb_BuildplTarget_command,$@,--all)
 
 # experimental callcatcher target
 # http://www.skynet.ie/~caolan/Packages/callcatcher.html
@@ -125,16 +125,13 @@ findunusedcode:
 	@which callcatcher > /dev/null 2>&1 || \
 	    (echo "callcatcher not installed" && false)
 	@sed -e s,$(INPATH),callcatcher,g $(SRCDIR)/config_host.mk > $(SRCDIR)/config_host_callcatcher.mk
-	@sed -e s,config_host,config_host_callcatcher,g $(SRCDIR)/Env.Host.sh > $(SRCDIR)/Env.callcatcher.sh
 	@mkdir -p $(SRCDIR)/solenv/callcatcher/bin && \
 	    ln -sf $(SRCDIR)/solenv/$(INPATH)/bin/dmake \
 		$(SRCDIR)/solenv/callcatcher/bin/dmake && \
 	    source $(SRCDIR)/config_host_callcatcher.mk && \
-	    source $(SRCDIR)/Env.callcatcher.sh && \
 	    source $(SRCDIR)/solenv/bin/callcatchEnv.Set.sh && \
 	    $(call gb_BuildplTarget_command,instsetoo_native,--all)
 	@source $(SRCDIR)/config_host_callcatcher.mk && \
-            source $(SRCDIR)/Env.callcatcher.sh && \
 	    callanalyse \
 		$$WORKDIR/LinkTarget/*/* \
 		*/$$OUTPATH/bin/* \
diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index f6df03bd37fc..cdc5c2bec492 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -1,4 +1,4 @@
-#   -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #   Version: MPL 1.1 / GPLv3+ / LGPLv3+
 #
@@ -29,14 +29,14 @@
 # speed up if no target need to parse all modules
 gb_SpeedUpTargets_WRAPPEDBUILD:=
 ifneq ($(strip $(MAKECMDGOALS)),)
-ifeq ($(filter-out id tags docs distro-pack-install fetch help debugrun $(SRCDIR)/Env.Host.sh,$(MAKECMDGOALS)),)
+ifeq ($(filter-out id tags docs distro-pack-install fetch help debugrun $(SRCDIR)/config_host.mk,$(MAKECMDGOALS)),)
 gb_SpeedUpTargets_WRAPPEDBUILD:=T
 endif
 endif
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
 ifneq ($(strip $(MAKECMDGOALS)),)
-ifeq ($(filter-out clean distclean id tags docs distro-pack-install fetch help debugrun $(SRCDIR)/Env.Host.sh,$(MAKECMDGOALS)),)
+ifeq ($(filter-out clean distclean id tags docs distro-pack-install fetch help debugrun $(SRCDIR)/config_host.mk,$(MAKECMDGOALS)),)
 gb_SpeedUpTargets_WRAPPEDBUILD:=T
 endif
 endif
diff --git a/solenv/gbuild/source_and_rerun.mk b/solenv/gbuild/source_and_rerun.mk
index 4d8101a0c3b5..dc6d9ca40818 100644
--- a/solenv/gbuild/source_and_rerun.mk
+++ b/solenv/gbuild/source_and_rerun.mk
@@ -14,7 +14,7 @@ gb_SourceEnvAndRecurse_buildpl=true
 else
 
 SRCDIR:=$(realpath $(gb_MAKEFILEDIR))
-gb_SourceEnvAndRecurse_reconfigure=$(call gb_SourceEnvAndRecurse_recurse,$(SRCDIR)/Env.Host.sh,reconfigure)
+gb_SourceEnvAndRecurse_reconfigure=$(call gb_SourceEnvAndRecurse_recurse,$(SRCDIR)/config_host.mk,reconfigure)
 gb_SourceEnvAndRecurse_buildpl=$(call gb_SourceEnvAndRecurse_recurse,$(MAKECMDGOALS),buildpl)
 
 endif
@@ -22,14 +22,13 @@ endif
 source-env-and-recurse:
 	@$(gb_SourceEnvAndRecurse_reconfigure) && \
 	if test -f $(SRCDIR)/config_host.mk ; then . $(SRCDIR)/config_host.mk; fi && \
-	if test -f $(SRCDIR)/Env.Host.sh; then . $(SRCDIR)/Env.Host.sh; fi && \
 	if test -z "$${SOLARENV}"; then echo "no configuration found and could not create one" && exit 1; fi && \
 	$(gb_SourceEnvAndRecurse_buildpl) && \
 	$(call gb_SourceEnvAndRecurse_recurse,$(MAKECMDGOALS),gbuild) \
 
 
 ifneq ($(strip $(MAKECMDGOALS)),)
-ifneq ($(MAKECMDGOALS),$(SRCDIR)/Env.Host.sh)
+ifneq ($(MAKECMDGOALS),$(SRCDIR)/config_host.mk)
 $(eval $(MAKECMDGOALS) : source-env-and-recurse)
 endif
 endif