diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-12-24 19:25:58 -0600 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-12-24 21:42:08 -0600 |
commit | fd9366c85cdb627886901b7c09ef267b294d5d98 (patch) | |
tree | ff731698e13c1704c03aaab40957cf40a34db969 /solenv | |
parent | cdd98fc187aae086de5e4ca5fe4d693568963431 (diff) |
prep work to eliminated Env.*.sh, introduce config_{host,build}.mk
This introduce config_host.mk and config_build.mk
generated from config_host.mk.in
The intent is for that file to be both sourcable in a shell and includable
in a gnu Makefile.
Eventually all the environment set-up will be in config_host.mk.in
and so there won't be a need to source anything in shell before make.
Diffstat (limited to 'solenv')
-rwxr-xr-x | solenv/bin/create-ids | 2 | ||||
-rwxr-xr-x | solenv/bin/create-tags | 2 | ||||
-rwxr-xr-x | solenv/bin/lo_proxy_start | 4 | ||||
-rw-r--r-- | solenv/gbuild/extensions/post_AuxTargets.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/extensions/post_BuildplTargets.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/extensions/post_SpeedUpTargets.mk | 14 | ||||
-rw-r--r-- | solenv/gbuild/source_and_rerun.mk | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/solenv/bin/create-ids b/solenv/bin/create-ids index 5b43d20168b8..8744a387e5cb 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 -. ./Env.Host.sh +./config_host.mk && . ./Env.Host.sh # --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 c93bcd9bf52c..4d0f2bd9b10a 100755 --- a/solenv/bin/create-tags +++ b/solenv/bin/create-tags @@ -1,6 +1,6 @@ #!/usr/bin/env sh -. ./Env.Host.sh +./config_host.mk && . ./Env.Host.sh omnicppoptions="--c++-kinds=+p --fields=+iaS --extra=+q" ctags -h "+.hdl.hrc" --langmap=c:+.hdl.hrc.src $omnicppoptions \ diff --git a/solenv/bin/lo_proxy_start b/solenv/bin/lo_proxy_start index 67dcabf5c18a..8aabf2838acd 100755 --- a/solenv/bin/lo_proxy_start +++ b/solenv/bin/lo_proxy_start @@ -12,8 +12,8 @@ if [ -z "$SRC_ROOT" ] ; then SRC_ROOT=$($bin_dir/lo_find_src_root) || exit 1 fi if [ -z "$SOLARINC" ] ; then - if [ -e "$SRC_ROOT/config.mk" ] ; then - . "$SRC_ROOT/config.mk" + if [ -e "$SRC_ROOT/config_host.mk" ] ; then + . "$SRC_ROOT/config_host.mk" fi if [ -e "$SRC_ROOT/Env.Host.sh" ] ; then . "$SRC_ROOT/Env.Host.sh" diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk index 72414b7d771b..354a91bd6b52 100644 --- a/solenv/gbuild/extensions/post_AuxTargets.mk +++ b/solenv/gbuild/extensions/post_AuxTargets.mk @@ -78,7 +78,7 @@ clean-build: distclean: clean if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake clean; fi - cd $(SRCDIR) && rm -rf Env.Host.sh autogen.lastrun autom4te.cache \ + cd $(SRCDIR) && rm -rf config_host.mk config_build.mk Env.Host.sh Env.Build.sh autogen.lastrun autom4te.cache \ bin/repo-list build_env config.log config.status \ desktop/scripts/soffice.sh ooo.lst post_download post_download.log \ set_soenv set_soenv.last set_soenv.stamp src.downloaded warn diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk index b2e650df8cc0..4b60eb263771 100644 --- a/solenv/gbuild/extensions/post_BuildplTargets.mk +++ b/solenv/gbuild/extensions/post_BuildplTargets.mk @@ -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)/Env.Build.sh && $(call gb_BuildplTarget_command,$@,--all) + source $(SRCDIR)/config_build.mk && source $(SRCDIR)/Env.Build.sh && $(call gb_BuildplTarget_command,$@,--all) # experimental callcatcher target # http://www.skynet.ie/~caolan/Packages/callcatcher.html diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk b/solenv/gbuild/extensions/post_SpeedUpTargets.mk index 0abbe5ecc83c..f6df03bd37fc 100644 --- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk +++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk @@ -1,24 +1,24 @@ # -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -# +# # 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+"), diff --git a/solenv/gbuild/source_and_rerun.mk b/solenv/gbuild/source_and_rerun.mk index a2aaea0687a6..4d8101a0c3b5 100644 --- a/solenv/gbuild/source_and_rerun.mk +++ b/solenv/gbuild/source_and_rerun.mk @@ -21,7 +21,7 @@ endif source-env-and-recurse: @$(gb_SourceEnvAndRecurse_reconfigure) && \ - if test -f $(SRCDIR)/config.mk ; then . $(SRCDIR)/config.mk; fi && \ + 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) && \ |