strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove SOLARENV variable

Browse source 
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
This commit is contained in:
Michael Stahl 2013-11-01 12:19:09 +01:00
parent 64a8828886
commit bc5069ac40
31 changed files with 44 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.gbuild
View file

@ -16,7 +16,7 @@ endif
include $(BUILDDIR)/config_$(gb_Side).mk
include $(SOLARENV)/gbuild/gbuild.mk
include $(SRCDIR)/solenv/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/RepositoryModule_$(gb_Side).mk))

6
Makefile.in
View file

@ -180,7 +180,7 @@ distclean : clean compilerplugins-clean
$(BUILDDIR)/ios/lo.xcconfig \
$(BUILDDIR)/lo.xcent \
$(BUILDDIR)/sysui/desktop/macosx/Info.plist
find $(SOLARENV)/gdb -name "*.pyc" -exec rm {} \;
find $(SRCDIR)/solenv/gdb -name "*.pyc" -exec rm {} \;
#
# custom command
@ -331,7 +331,7 @@ tags:
@create-tags
docs:
@mkdocs.sh $(SRCDIR)/docs $(SOLARENV)/inc/doxygen.cfg
@mkdocs.sh $(SRCDIR)/docs $(SRCDIR)/solenv/inc/doxygen.cfg
findunusedcode:
@which callcatcher > /dev/null 2>&1 || \
@ -345,7 +345,7 @@ findunusedcode:
@echo unexport ARCH_FLAGS >> $(SRCDIR)/callcatcher/config_host.mk
@echo unexport CFLAGS >> $(SRCDIR)/callcatcher/config_host.mk
@echo unexport CXXFLAGS >> $(SRCDIR)/callcatcher/config_host.mk
$(GNUMAKE) -f $(SOLARENV)/bin/callcatcher.Makefile findunusedcode
$(GNUMAKE) -f $(SRCDIR)/solenv/bin/callcatcher.Makefile findunusedcode
@grep ::.*\( unusedcode.all \
| grep -v ^Atom \
| grep -v ^atom:: \

2
compilerplugins/Makefile
View file

@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
ifeq ($(SOLARENV),)
ifeq ($(BUILD_TYPE),)
ifeq ($(gb_Side),)
gb_Side:=host
endif

1
config_host.mk.in
View file

@ -469,7 +469,6 @@ export SCPDEFS=@SCPDEFS@
export SDKDIRNAME=@SDKDIRNAME@
export SDKDIRNAME_FOR_BUILD=@SDKDIRNAME_FOR_BUILD@
export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@
export SOLARENV=@SRC_ROOT@/solenv
export SOLARINC=@SOLARINC@
export SOLARLIB=@SOLARLIB@
export SPLIT_APP_MODULES=@SPLIT_APP_MODULES@

9
configure.ac
View file

@ -12,6 +12,11 @@ dnl in order to create a configure script.
AC_INIT([LibreOffice],[4.2.0.0.alpha0+],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
if test -n "$BUILD_TYPE"; then
AC_MSG_ERROR([You have sourced config_host.mk in this shell. This may lead to trouble, please run in a fresh (login) shell.])
fi
save_CC=$CC
save_CXX=$CXX
@ -73,10 +78,6 @@ add_warning()
echo "$COLORWARN $@" >> warn
}
if test -n "$SOLARENV"; then
AC_MSG_ERROR([You have sourced config_host.mk in this shell. This may lead to trouble, please run in a fresh (login) shell.])
fi
echo "********************************************************************"
echo "*"
echo "* Running ${PACKAGE_NAME} build configuration."

2
external/firebird/ExternalProject_firebird.mk vendored
View file

@ -51,7 +51,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
$(gb_Helper_set_ld_path)) \
$(MAKE) firebird_embedded \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
$(gb_Package_SOURCEDIR_firebird)/gen/firebird/lib/libfbembed.dylib.2.5.2) \
)
# vim: set noet sw=4 ts=4:

2
external/icu/ExternalProject_icu.mk vendored
View file

@ -87,7 +87,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
--with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source)\
&& $(MAKE) \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
$(gb_Package_SOURCEDIR_icu)/source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION) \
$(gb_Package_SOURCEDIR_icu)/source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION) \
$(gb_Package_SOURCEDIR_icu)/source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION)) \

2
instsetoo_native/CustomTarget_install.mk
View file

@ -27,7 +27,7 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/install,\
))
$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: \
$(SOLARENV)/bin/make_installer.pl \
$(SRCDIR)/solenv/bin/make_installer.pl \
$(foreach ulf,$(instsetoo_ULFLIST),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) \
$(if $(filter-out WNT,$(OS)),\
$(addprefix $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/,\

2
nss/ExternalProject_nss.mk
View file

@ -68,7 +68,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
$(MAKE) -j1 AR=$(AR) RANLIB=$(RANLIB) NMEDIT=$(NM)edit nss_build_all \
&& rm -f $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/*.a \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libfreebl3.dylib \
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnspr4.dylib \
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnss3.dylib \

7
postprocess/CustomTarget_images.mk
View file

@ -36,7 +36,7 @@ $(packimages_DIR)/%.zip : \
$(call gb_Postprocess_get_target,AllUIConfigs)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
$(call gb_Helper_abbreviate_dirs, \
$(PERL) $(SOLARENV)/bin/packimages.pl \
$(PERL) $(SRCDIR)/solenv/bin/packimages.pl \
-g $(SRCDIR)/icon-themes/galaxy \
-m $(SRCDIR)/icon-themes/galaxy \
$(if $(DEFAULT_THEME),\
@ -62,7 +62,7 @@ $(packimages_DIR)/commandimagelist.ilst :
find $(SRCDIR)/icon-themes/galaxy/cmd -name "*.png" -o -name "*.svg" | \
sed "s#$(SRCDIR)/icon-themes/galaxy#%MODULE%#" | \
LC_ALL=C sort > $@.$(INPATH) && \
$(PERL) $(SOLARENV)/bin/diffmv.pl $@.$(INPATH) $@ \
$(PERL) $(SRCDIR)/solenv/bin/diffmv.pl $@.$(INPATH) $@ \
$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
$(packimages_DIR)/sorted.lst : \
@ -70,6 +70,7 @@ $(packimages_DIR)/sorted.lst : \
$(call gb_Postprocess_get_target,AllUIConfigs)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
$(call gb_Helper_abbreviate_dirs, \
$(PERL) $(SOLARENV)/bin/image-sort.pl $< $(INSTROOT)/$(gb_UIConfig_INSTDIR) $@)
$(PERL) $(SRCDIR)/solenv/bin/image-sort.pl \
$< $(INSTROOT)/$(gb_UIConfig_INSTDIR) $@)
# vim: set noet sw=4 ts=4:

4
postprocess/CustomTarget_registry.mk
View file

@ -569,7 +569,7 @@ $(call gb_XcdTarget_get_target,main.xcd) : \
$(call gb_Helper_abbreviate_dirs, \
mkdir -p $(dir $@) && \
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
$(SOLARENV)/bin/packregistry.xslt $< \
$(SRCDIR)/solenv/bin/packregistry.xslt $< \
| sed $(postprocess_main_SED) > $@ \
)
@ -579,7 +579,7 @@ $(call gb_XcdTarget_get_target,%.xcd) : \
$(call gb_Helper_abbreviate_dirs, \
mkdir -p $(dir $@) && \
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
-o $@ $(SOLARENV)/bin/packregistry.xslt $< \
-o $@ $(SRCDIR)/solenv/bin/packregistry.xslt $< \
)
$(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list :

2
redland/ExternalProject_rasqal.mk
View file

@ -60,7 +60,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
$(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
&& $(MAKE) \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
$(gb_Package_SOURCEDIR_rasqal)/src/.libs/librasqal-lo.$(RASQAL_MAJOR).dylib) \
)
endif

2
redland/ExternalProject_redland.mk
View file

@ -65,7 +65,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
&& $(MAKE) \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
$(gb_Package_SOURCEDIR_redland)/src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib) \
)
endif

2
solenv/bin/callcatcher.Makefile
View file

@ -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

2
solenv/bin/install-gdb-printers
View file

@ -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

2
solenv/bin/make_installer.pl
View file

@ -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);

2
solenv/bin/modules/installer/parameter.pm
View file

@ -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

4
solenv/bin/ooinstall
View file

@ -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 " .

2
solenv/bin/par2script.pl
View file

@ -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;

2
solenv/bin/pre2par.pl
View file

@ -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;

2
solenv/gbuild/CliAssembly.mk
View file

@ -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

2
solenv/gbuild/ComponentTarget.mk
View file

@ -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

2
solenv/gbuild/CppunitTest.mk
View file

@ -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)

2
solenv/gbuild/Gallery.mk
View file

@ -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

2
solenv/gbuild/InstallModuleTarget.mk
View file

@ -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

2
solenv/gbuild/InstallScript.mk
View file

@ -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)))

3
solenv/gbuild/Rdb.mk
View file

@ -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

2
solenv/gbuild/extensions/pre_SharedLangList.mk
View file

@ -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)

4
solenv/gbuild/partial_build.mk
View file

@ -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)))

4
solenv/gbuild/platform/macosx.mk
View file

@ -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) &&)) \

2
sysui/CustomTarget_share.mk
View file

@ -27,7 +27,7 @@ endif
share_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/share)
share_SRCDIR := $(SRCDIR)/sysui/desktop
share_TRANSLATE := $(SOLARENV)/bin/desktop-translate.pl
share_TRANSLATE := $(SRCDIR)/solenv/bin/desktop-translate.pl
LAUNCHERLIST_APPS := writer calc draw impress math base startcenter
LAUNCHERLIST := $(LAUNCHERLIST_APPS) qstart xsltfilter