Skip to content

C
core
Kaydet (Commit) bc5069ac authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

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
üst 64a88288
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 42 deletions
Makefile.gbuild
Dosyayı görüntüle @ bc5069ac
...@@ -16,7 +16,7 @@ endif ...@@ -16,7 +16,7 @@ endif
include $(BUILDDIR)/config_$(gb_Side).mk 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)) $(eval $(call gb_Module_make_global_targets,$(SRCDIR)/RepositoryModule_$(gb_Side).mk))
......
Makefile.in
Dosyayı görüntüle @ bc5069ac
...@@ -180,7 +180,7 @@ distclean : clean compilerplugins-clean ...@@ -180,7 +180,7 @@ distclean : clean compilerplugins-clean
$(BUILDDIR)/ios/lo.xcconfig \ $(BUILDDIR)/ios/lo.xcconfig \
$(BUILDDIR)/lo.xcent \ $(BUILDDIR)/lo.xcent \
$(BUILDDIR)/sysui/desktop/macosx/Info.plist $(BUILDDIR)/sysui/desktop/macosx/Info.plist
find $(SOLARENV)/gdb -name "*.pyc" -exec rm {} \; find $(SRCDIR)/solenv/gdb -name "*.pyc" -exec rm {} \;
# #
# custom command # custom command
...@@ -331,7 +331,7 @@ tags: ...@@ -331,7 +331,7 @@ tags:
@create-tags @create-tags
docs: docs:
@mkdocs.sh $(SRCDIR)/docs $(SOLARENV)/inc/doxygen.cfg @mkdocs.sh $(SRCDIR)/docs $(SRCDIR)/solenv/inc/doxygen.cfg
findunusedcode: findunusedcode:
@which callcatcher > /dev/null 2>&1 || \ @which callcatcher > /dev/null 2>&1 || \
...@@ -345,7 +345,7 @@ findunusedcode: ...@@ -345,7 +345,7 @@ findunusedcode:
@echo unexport ARCH_FLAGS >> $(SRCDIR)/callcatcher/config_host.mk @echo unexport ARCH_FLAGS >> $(SRCDIR)/callcatcher/config_host.mk
@echo unexport CFLAGS >> $(SRCDIR)/callcatcher/config_host.mk @echo unexport CFLAGS >> $(SRCDIR)/callcatcher/config_host.mk
@echo unexport CXXFLAGS >> $(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 ::.*\( unusedcode.all \
| grep -v ^Atom \ | grep -v ^Atom \
| grep -v ^atom:: \ | grep -v ^atom:: \
......
compilerplugins/Makefile
Dosyayı görüntüle @ bc5069ac
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
ifeq ($(SOLARENV),) ifeq ($(BUILD_TYPE),)
ifeq ($(gb_Side),) ifeq ($(gb_Side),)
gb_Side:=host gb_Side:=host
endif endif
......
config_host.mk.in
Dosyayı görüntüle @ bc5069ac
...@@ -469,7 +469,6 @@ export SCPDEFS=@SCPDEFS@ ...@@ -469,7 +469,6 @@ export SCPDEFS=@SCPDEFS@
export SDKDIRNAME=@SDKDIRNAME@ export SDKDIRNAME=@SDKDIRNAME@
export SDKDIRNAME_FOR_BUILD=@SDKDIRNAME_FOR_BUILD@ export SDKDIRNAME_FOR_BUILD=@SDKDIRNAME_FOR_BUILD@
export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@ export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@
export SOLARENV=@SRC_ROOT@/solenv
export SOLARINC=@SOLARINC@ export SOLARINC=@SOLARINC@
export SOLARLIB=@SOLARLIB@ export SOLARLIB=@SOLARLIB@
export SPLIT_APP_MODULES=@SPLIT_APP_MODULES@ export SPLIT_APP_MODULES=@SPLIT_APP_MODULES@
......
configure.ac
Dosyayı görüntüle @ bc5069ac
...@@ -12,6 +12,11 @@ dnl in order to create a configure script. ...@@ -12,6 +12,11 @@ dnl in order to create a configure script.
AC_INIT([LibreOffice],[4.2.0.0.alpha0+],[],[],[http://documentfoundation.org/]) AC_INIT([LibreOffice],[4.2.0.0.alpha0+],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59]) 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_CC=$CC
save_CXX=$CXX save_CXX=$CXX
...@@ -73,10 +78,6 @@ add_warning() ...@@ -73,10 +78,6 @@ add_warning()
echo "$COLORWARN $@" >> warn 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 "*" echo "*"
echo "* Running ${PACKAGE_NAME} build configuration." echo "* Running ${PACKAGE_NAME} build configuration."
......
external/firebird/ExternalProject_firebird.mk
Dosyayı görüntüle @ bc5069ac
...@@ -51,7 +51,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build): ...@@ -51,7 +51,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
$(gb_Helper_set_ld_path)) \ $(gb_Helper_set_ld_path)) \
$(MAKE) firebird_embedded \ $(MAKE) firebird_embedded \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \ $(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) \ $(gb_Package_SOURCEDIR_firebird)/gen/firebird/lib/libfbembed.dylib.2.5.2) \
) )
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
external/icu/ExternalProject_icu.mk
Dosyayı görüntüle @ bc5069ac
...@@ -87,7 +87,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) : ...@@ -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)\ --with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source)\
&& $(MAKE) \ && $(MAKE) \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \ $(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/libicudata$(gb_Library_DLLEXT).$(icu_VERSION) \
$(gb_Package_SOURCEDIR_icu)/source/lib/libicuuc$(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)) \ $(gb_Package_SOURCEDIR_icu)/source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION)) \
......
instsetoo_native/CustomTarget_install.mk
Dosyayı görüntüle @ bc5069ac
...@@ -27,7 +27,7 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/install,\ ...@@ -27,7 +27,7 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/install,\
)) ))
$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: \ $(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) \ $(foreach ulf,$(instsetoo_ULFLIST),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) \
$(if $(filter-out WNT,$(OS)),\ $(if $(filter-out WNT,$(OS)),\
$(addprefix $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/,\ $(addprefix $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/,\
......
nss/ExternalProject_nss.mk
Dosyayı görüntüle @ bc5069ac
...@@ -68,7 +68,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject ...@@ -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 \ $(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 \ && rm -f $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/*.a \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \ $(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/libfreebl3.dylib \
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnspr4.dylib \ $(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnspr4.dylib \
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnss3.dylib \ $(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnss3.dylib \
......
postprocess/CustomTarget_images.mk
Dosyayı görüntüle @ bc5069ac
...@@ -36,7 +36,7 @@ $(packimages_DIR)/%.zip : \ ...@@ -36,7 +36,7 @@ $(packimages_DIR)/%.zip : \
$(call gb_Postprocess_get_target,AllUIConfigs) $(call gb_Postprocess_get_target,AllUIConfigs)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
$(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_abbreviate_dirs, \
$(PERL) $(SOLARENV)/bin/packimages.pl \ $(PERL) $(SRCDIR)/solenv/bin/packimages.pl \
-g $(SRCDIR)/icon-themes/galaxy \ -g $(SRCDIR)/icon-themes/galaxy \
-m $(SRCDIR)/icon-themes/galaxy \ -m $(SRCDIR)/icon-themes/galaxy \
$(if $(DEFAULT_THEME),\ $(if $(DEFAULT_THEME),\
...@@ -62,7 +62,7 @@ $(packimages_DIR)/commandimagelist.ilst : ...@@ -62,7 +62,7 @@ $(packimages_DIR)/commandimagelist.ilst :
find $(SRCDIR)/icon-themes/galaxy/cmd -name "*.png" -o -name "*.svg" | \ find $(SRCDIR)/icon-themes/galaxy/cmd -name "*.png" -o -name "*.svg" | \
sed "s#$(SRCDIR)/icon-themes/galaxy#%MODULE%#" | \ sed "s#$(SRCDIR)/icon-themes/galaxy#%MODULE%#" | \
LC_ALL=C sort > $@.$(INPATH) && \ 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)) $(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
$(packimages_DIR)/sorted.lst : \ $(packimages_DIR)/sorted.lst : \
...@@ -70,6 +70,7 @@ $(packimages_DIR)/sorted.lst : \ ...@@ -70,6 +70,7 @@ $(packimages_DIR)/sorted.lst : \
$(call gb_Postprocess_get_target,AllUIConfigs) $(call gb_Postprocess_get_target,AllUIConfigs)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
$(call gb_Helper_abbreviate_dirs, \ $(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: # vim: set noet sw=4 ts=4:
postprocess/CustomTarget_registry.mk
Dosyayı görüntüle @ bc5069ac
...@@ -569,7 +569,7 @@ $(call gb_XcdTarget_get_target,main.xcd) : \ ...@@ -569,7 +569,7 @@ $(call gb_XcdTarget_get_target,main.xcd) : \
$(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_abbreviate_dirs, \
mkdir -p $(dir $@) && \ mkdir -p $(dir $@) && \
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
$(SOLARENV)/bin/packregistry.xslt $< \ $(SRCDIR)/solenv/bin/packregistry.xslt $< \
| sed $(postprocess_main_SED) > $@ \ | sed $(postprocess_main_SED) > $@ \
) )
...@@ -579,7 +579,7 @@ $(call gb_XcdTarget_get_target,%.xcd) : \ ...@@ -579,7 +579,7 @@ $(call gb_XcdTarget_get_target,%.xcd) : \
$(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_abbreviate_dirs, \
mkdir -p $(dir $@) && \ mkdir -p $(dir $@) && \
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \ $(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 : $(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list :
......
redland/ExternalProject_rasqal.mk
Dosyayı görüntüle @ bc5069ac
...@@ -60,7 +60,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build): ...@@ -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) \ $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
&& $(MAKE) \ && $(MAKE) \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \ $(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) \ $(gb_Package_SOURCEDIR_rasqal)/src/.libs/librasqal-lo.$(RASQAL_MAJOR).dylib) \
) )
endif endif
......
redland/ExternalProject_redland.mk
Dosyayı görüntüle @ bc5069ac
...@@ -65,7 +65,7 @@ $(call gb_ExternalProject_get_state_target,redland,build): ...@@ -65,7 +65,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
&& $(MAKE) \ && $(MAKE) \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \ $(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) \ $(gb_Package_SOURCEDIR_redland)/src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib) \
) )
endif endif
......
solenv/bin/callcatcher.Makefile
Dosyayı görüntüle @ bc5069ac
...@@ -20,7 +20,7 @@ export AR:=callarchive $(AR) ...@@ -20,7 +20,7 @@ export AR:=callarchive $(AR)
endif endif
export dbglevel:=2 export dbglevel:=2
include $(SOLARENV)/gbuild/gbuild.mk include $(SRCDIR)/solenv/gbuild/gbuild.mk
findunusedcode: findunusedcode:
$(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild $(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild
......
solenv/bin/install-gdb-printers
Dosyayı görüntüle @ bc5069ac
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
# #
GDBDIR="${SOLARENV}/gdb" GDBDIR="${SRCDIR}/solenv/gdb"
INSTALLDIR="${TESTINSTALLDIR}" INSTALLDIR="${TESTINSTALLDIR}"
DYLIB=so DYLIB=so
if [ "$(uname)" = Darwin ]; then if [ "$(uname)" = Darwin ]; then
......
solenv/bin/make_installer.pl
Dosyayı görüntüle @ bc5069ac
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
use strict; use strict;
use warnings; use warnings;
use lib ("$ENV{SOLARENV}/bin/modules"); use lib ("$ENV{SRCDIR}/solenv/bin/modules");
use installer qw(main); use installer qw(main);
......
solenv/bin/modules/installer/parameter.pm
Dosyayı görüntüle @ bc5069ac
...@@ -159,7 +159,7 @@ sub getparameter ...@@ -159,7 +159,7 @@ sub getparameter
} }
# Usage of simple installer (not for Windows): # 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 \ # -f openoffice.lst -l en-US -p OpenOffice \
# -buildid $BUILD -rpm \ # -buildid $BUILD -rpm \
# -destdir /tmp/nurk -simple $INSTALL_PATH # -destdir /tmp/nurk -simple $INSTALL_PATH
......
solenv/bin/ooinstall
Dosyayı görüntüle @ bc5069ac
...@@ -97,7 +97,7 @@ print "Running LibreOffice installer\n"; ...@@ -97,7 +97,7 @@ print "Running LibreOffice installer\n";
system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " . system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
"perl " . "perl " .
(scalar keys(%DB::sub) ? "-d " : "") . (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 " . "-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p LibreOffice " .
"-u $tmp_dir " . "-u $tmp_dir " .
"-buildid $BUILD $destdir $strip $msi " . "-buildid $BUILD $destdir $strip $msi " .
...@@ -106,7 +106,7 @@ system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " . ...@@ -106,7 +106,7 @@ system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
if ($ENV{BUILD_TYPE} =~ m/ODK/) { if ($ENV{BUILD_TYPE} =~ m/ODK/) {
print "Running SDK installer\n"; print "Running SDK installer\n";
system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " . 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 " . "-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l en-US -p LibreOffice_SDK " .
"-u $tmp_dir " . "-u $tmp_dir " .
"-buildid $BUILD $destdir $strip $msi " . "-buildid $BUILD $destdir $strip $msi " .
......
solenv/bin/par2script.pl
Dosyayı görüntüle @ bc5069ac
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 . # 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 Cwd;
use par2script::check; use par2script::check;
......
solenv/bin/pre2par.pl
Dosyayı görüntüle @ bc5069ac
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 . # 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 Cwd;
use pre2par::directory; use pre2par::directory;
......
solenv/gbuild/CliAssembly.mk
Dosyayı görüntüle @ bc5069ac
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
# CliConfigTarget class # 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_COMMAND := $(PERL) -w $(gb_CliConfigTarget_TARGET)
gb_CliConfigTarget_VERSIONFILE_DEFAULT := $(SRCDIR)/cli_ure/version/version.txt gb_CliConfigTarget_VERSIONFILE_DEFAULT := $(SRCDIR)/cli_ure/version/version.txt
......
solenv/gbuild/ComponentTarget.mk
Dosyayı görüntüle @ bc5069ac
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 . # 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 gb_ComponentTarget_get_source = $(SRCDIR)/$(1).component
# In the DISABLE_DYNLOADING case we don't need any COMPONENTPREFIX, we # In the DISABLE_DYNLOADING case we don't need any COMPONENTPREFIX, we
......
solenv/gbuild/CppunitTest.mk
Dosyayı görüntüle @ bc5069ac
...@@ -27,7 +27,7 @@ printf '\nError: a unit test failed, please do one of:\n\nexport DEBUGCPPUNIT=TR ...@@ -27,7 +27,7 @@ printf '\nError: a unit test failed, please do one of:\n\nexport DEBUGCPPUNIT=TR
endef endef
ifeq ($(strip $(DEBUGCPPUNIT)),TRUE) 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)),) else ifneq ($(strip $(CPPUNITTRACE)),)
gb_CppunitTest_GDBTRACE := $(CPPUNITTRACE) gb_CppunitTest_GDBTRACE := $(CPPUNITTRACE)
gb_CppunitTest__interactive := $(true) gb_CppunitTest__interactive := $(true)
......
solenv/gbuild/Gallery.mk
Dosyayı görüntüle @ bc5069ac
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
# Handles creation of image galleries. # 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 gb_Gallery_INSTDIR := $(LIBO_SHARE_FOLDER)/gallery
# BRAND_BASE_DIR is for resource files # BRAND_BASE_DIR is for resource files
......
solenv/gbuild/InstallModuleTarget.mk
Dosyayı görüntüle @ bc5069ac
...@@ -129,7 +129,7 @@ endef ...@@ -129,7 +129,7 @@ endef
# ScpTarget class # ScpTarget class
gb_ScpTarget_TARGET := $(SOLARENV)/bin/pre2par.pl gb_ScpTarget_TARGET := $(SRCDIR)/solenv/bin/pre2par.pl
gb_ScpTarget_COMMAND := $(PERL) $(gb_ScpTarget_TARGET) gb_ScpTarget_COMMAND := $(PERL) $(gb_ScpTarget_TARGET)
define gb_ScpTarget__command define gb_ScpTarget__command
......
solenv/gbuild/InstallScript.mk
Dosyayı görüntüle @ bc5069ac
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
# InstallScript class # 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_COMMAND := $(PERL) $(gb_InstallScript_TARGET)
gb_InstallScript__make_arglist = $(subst $(WHITESPACE),$(COMMA),$(strip $(1))) gb_InstallScript__make_arglist = $(subst $(WHITESPACE),$(COMMA),$(strip $(1)))
......
solenv/gbuild/Rdb.mk
Dosyayı görüntüle @ bc5069ac
...@@ -17,7 +17,8 @@ $(call gb_Helper_abbreviate_dirs,\ ...@@ -17,7 +17,8 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach component,$(COMPONENTS),echo "<filename>$(call gb_ComponentTarget_get_target,$(component))</filename>" &&) \ $(foreach component,$(COMPONENTS),echo "<filename>$(call gb_ComponentTarget_get_target,$(component))</filename>" &&) \
echo '</list>' \ echo '</list>' \
) > $(1).input && \ ) > $(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) rm $(1).input)
endef endef
......
solenv/gbuild/extensions/pre_SharedLangList.mk
Dosyayı görüntüle @ bc5069ac
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
# #
# share language list with dmake build system # share language list with dmake build system
include $(SOLARENV)/inc/langlist.mk include $(SRCDIR)/solenv/inc/langlist.mk
ifneq ($(WITH_LANG),ALL) ifneq ($(WITH_LANG),ALL)
gb_WITH_LANG=$(WITH_LANG) gb_WITH_LANG=$(WITH_LANG)
......
solenv/gbuild/partial_build.mk
Dosyayı görüntüle @ bc5069ac
...@@ -25,12 +25,12 @@ ifeq (,$(BUILDDIR)) ...@@ -25,12 +25,12 @@ ifeq (,$(BUILDDIR))
BUILDDIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))../.. BUILDDIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))../..
endif endif
ifeq ($(SOLARENV),) ifeq ($(BUILD_TYPE),)
include $(BUILDDIR)/config_$(gb_Side).mk include $(BUILDDIR)/config_$(gb_Side).mk
endif endif
gb_PARTIAL_BUILD := T 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))) $(eval $(call gb_Module_make_global_targets,$(wildcard $(module_directory)/Module*.mk)))
......
solenv/gbuild/platform/macosx.mk
Dosyayı görüntüle @ bc5069ac
...@@ -151,9 +151,9 @@ $(call gb_Helper_abbreviate_dirs,\ ...@@ -151,9 +151,9 @@ $(call gb_Helper_abbreviate_dirs,\
-o $(1) && \ -o $(1) && \
$(if $(SOVERSIONSCRIPT),ln -sf $(1) $(ILIBTARGET),:) && \ $(if $(SOVERSIONSCRIPT),ln -sf $(1) $(ILIBTARGET),:) && \
$(if $(filter Executable,$(TARGETTYPE)), \ $(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)),\ $(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 $(MACOSX_CODESIGNING_IDENTITY), \
$(if $(filter Executable,$(TARGETTYPE)), \ $(if $(filter Executable,$(TARGETTYPE)), \
(codesign --identifier=$(MACOSX_BUNDLE_IDENTIFIER).$(notdir $(1)) --sign $(MACOSX_CODESIGNING_IDENTITY) --force $(1) || true) &&)) \ (codesign --identifier=$(MACOSX_BUNDLE_IDENTIFIER).$(notdir $(1)) --sign $(MACOSX_CODESIGNING_IDENTITY) --force $(1) || true) &&)) \
......
sysui/CustomTarget_share.mk
Dosyayı görüntüle @ bc5069ac
...@@ -27,7 +27,7 @@ endif ...@@ -27,7 +27,7 @@ endif
share_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/share) share_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/share)
share_SRCDIR := $(SRCDIR)/sysui/desktop 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_APPS := writer calc draw impress math base startcenter
LAUNCHERLIST := $(LAUNCHERLIST_APPS) qstart xsltfilter LAUNCHERLIST := $(LAUNCHERLIST_APPS) qstart xsltfilter
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment