[Libreoffice-commits] .: 6 commits - .gitignore Makefile.in RepositoryFixes.mk solenv/gbuild
Tor Lillqvist
tml at kemper.freedesktop.org
Sat Jun 11 15:22:23 PDT 2011
.gitignore | 2 +
Makefile.in | 62 ++++++++++++++++++++++++++++++---------
RepositoryFixes.mk | 2 -
solenv/gbuild/TargetLocations.mk | 1
solenv/gbuild/gbuild.mk | 2 -
solenv/gbuild/platform/unxgcc.mk | 12 +++----
6 files changed, 60 insertions(+), 21 deletions(-)
New commits:
commit 6b66e2cfdcca1d6758c51527d0bc5bd4f8ac72f2
Author: Tor Lillqvist <tml at iki.fi>
Date: Sun Jun 12 01:21:44 2011 +0300
Explicitly list modules in cross-build-toolset
diff --git a/Makefile.in b/Makefile.in
index 1a89014..a1a2c7f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,20 +19,56 @@ endif
ifeq (@CROSS_COMPILING@,YES)
cross-build-toolset:
+# Build necessary modules for the *build* platform, i.e. those needed
+# by tools run at build time. Sure, in many of these modules only a
+# part of the produced binaries are actually used then in the build.
+# Once everything is handled by gbuild, this can hopefully be streamlined.
. ./Env.Build.sh && \
- (cd autodoc && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@ && deliver.pl) && \
- (cd idlc && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@ && deliver.pl) && \
- (cd icu && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@) && \
- (cd udkapi && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@ && deliver.pl) && \
- (cd i18npool && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@ && deliver.pl) && \
- (cd unodevtools && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ -- -P at BUILD_MAX_JOBS@ && deliver.pl) && \
- (cd offapi && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ -- -P at BUILD_MAX_JOBS@ && deliver.pl) && \
- (cd oovbaapi && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ -- -P at BUILD_MAX_JOBS@ && deliver.pl) && \
- (cd codemaker && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ -- -P at BUILD_MAX_JOBS@ && deliver.pl) && \
- (cd ridljar && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ -- -P at BUILD_MAX_JOBS@ && deliver.pl) && \
- (cd glib && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ -- -P at BUILD_MAX_JOBS@ && deliver.pl) && \
- (cd gettext && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ -- -P at BUILD_MAX_JOBS@ && deliver.pl) && \
- (cd dictionaries && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ -- -P at BUILD_MAX_JOBS@)
+ for D in \
+ solenv \
+ soltools \
+ boost \
+ external \
+ cppunit \
+ xml2cmp \
+ sal \
+ cosv \
+ udm \
+ autodoc \
+ store \
+ salhelper \
+ registry \
+ idlc \
+ icu \
+ udkapi \
+ expat \
+ libxml2 \
+ xml2cmp \
+ libxslt \
+ offapi \
+ oovbaapi \
+ codemaker \
+ offuh \
+ cppu \
+ cppuhelper \
+ rdbmaker \
+ cpputools \
+ xmlreader \
+ i18nutil \
+ ridljar \
+ jurt \
+ jvmaccess \
+ bridges \
+ ucbhelper \
+ comphelper \
+ jvmfwk \
+ regexp \
+ i18npool \
+ unodevtools \
+ gettext \
+ dictionaries; do \
+ (cd $$D && build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ -- -P at BUILD_MAX_JOBS@ && deliver.pl); \
+ done
endif
install:
commit d895fabeb5e7e75217650c75004fd808e6e33113
Author: Tor Lillqvist <tml at iki.fi>
Date: Sun Jun 12 00:02:52 2011 +0300
Add post_download.log and Env.Build.sh
diff --git a/.gitignore b/.gitignore
index 4c18d59..575eb3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,9 +58,11 @@
/set_soenv.stamp
/warn
/build.log
+/post_download.log
/install
/downloaded
/*.Set.sh
+/Env.Build.sh
/ID
/tags
/docs
commit 33485cfcde6f7d548470589ba0e2c7769236ea10
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat Jun 11 23:57:28 2011 +0300
Use OUTDIR_FOR_BUILD in LD_LIBRARY_PATH
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index dde1bc8..7d79167 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -174,7 +174,7 @@ gb_COMPILERNOOPTFLAGS := -O0
gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
-gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
# convert parametters filesystem root to native notation
# does some real work only on windows, make sure not to
@@ -382,7 +382,7 @@ endef
# CppunitTest class
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
gb_CppunitTest_SYSPRE := libtest_
gb_CppunitTest_EXT := .so
gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
@@ -405,16 +405,16 @@ endef
# SdiTarget class
-gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_SdiTarget_SVIDLPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
# SrsPartMergeTarget
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
# SrsPartTarget class
gb_SrsPartTarget_RSCTARGET := $(OUTDIR)/bin/rsc
-gb_SrsPartTarget_RSCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCTARGET)
+gb_SrsPartTarget_RSCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_SrsPartTarget_RSCTARGET)
define gb_SrsPartTarget__command_dep
$(call gb_Helper_abbreviate_dirs,\
@@ -429,7 +429,7 @@ endef
# ComponentTarget
-gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_XSLTPROCPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
commit c258e918ccbe85992d75f5c74ec819ec1a49ecb8
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat Jun 11 23:56:50 2011 +0300
Use gb_Executable_get_target_for_build for xsltproc
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index b94215d..03c8f37 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -301,7 +301,7 @@ ifeq ($(SYSTEM_LIBXSLT),YES)
gb_XSLTPROCTARGET :=
gb_XSLTPROC := xsltproc
else
-gb_XSLTPROCTARGET := $(call gb_Executable_get_target,xsltproc)
+gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
gb_XSLTPROC := $(gb_XSLTPROCPRECOMMAND) $(gb_XSLTPROCTARGET)
endif
commit 6107dcdacd531df37ec294521341e82ecca044b4
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat Jun 11 23:56:14 2011 +0300
Add gb_Executable_get_target_for_build for cross-compilation
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 40ccb30..155ff8b 100755
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -29,6 +29,7 @@
gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component
gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
+gb_Executable_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1)$(gb_Executable_EXT)
gb_PackagePart_get_destinations = \
$(OUTDIR)/xml \
$(OUTDIR)/pck \
commit 5dd70df431b874feea8f2526eccb02f6412856b4
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat Jun 11 23:55:06 2011 +0300
Add Android
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 74aecdf..cba118a 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -30,7 +30,7 @@
# Make has no support for 'or' clauses in conditionals,
# we use a filter expression instead.
-ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
+ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD ANDROID, $(OS)))
gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
More information about the Libreoffice-commits
mailing list