[Libreoffice-commits] .: 8 commits - configure.in Makefile.in scp2/prj solenv/gbuild tail_build/prj
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Jun 16 16:10:50 PDT 2011
Makefile.in | 4 +++-
configure.in | 15 +++++++++++++++
scp2/prj/build.lst | 2 +-
solenv/gbuild/SdiTarget.mk | 2 +-
solenv/gbuild/platform/ios.mk | 9 ++++-----
tail_build/prj/build.lst | 2 +-
6 files changed, 25 insertions(+), 9 deletions(-)
New commits:
commit 14ff0d0d48e06eba9ddc7cf4425bcabd95142d5f
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jun 17 01:23:31 2011 +0300
Add idl to cross-build-toolset, we need svidl
diff --git a/Makefile.in b/Makefile.in
index 2c44a4b..adce852 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -72,6 +72,7 @@ cross-build-toolset:
o3tl \
basegfx \
GBUILD:tools \
+ idl \
rsc \
setup_native \
icc; do \
commit 55e17e78b5ad543ec6285588549ca7b40801ee4b
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 16 20:28:24 2011 +0300
Always use OUTDIR_FOR_BUILD in DYLD_LIBRARY_PATH
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index 8552de3..6b799f1 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -377,11 +377,11 @@ endef
# SdiTarget class
-gb_SdiTarget_SVIDLPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_SdiTarget_SVIDLPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
# SrsPartMergeTarget
-gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_SrsPartMergeTarget_TRANSEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
# SrsPartTarget class
@@ -401,7 +401,7 @@ endef
# ComponentTarget
-gb_XSLTPROCPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_XSLTPROCPRECOMMAND := DYLD_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 ec7cf8330c2877c9cbe8a6f5e0b51923ab172209
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 16 20:27:23 2011 +0300
Use gb_Executable_get_target_for_build for svidl
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index 81f0072..1b5bb7d 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -31,7 +31,7 @@
# SdiTarget class
-gb_SdiTarget_SVIDLTARGET := $(call gb_Executable_get_target,svidl)
+gb_SdiTarget_SVIDLTARGET := $(call gb_Executable_get_target_for_build,svidl)
gb_SdiTarget_SVIDLCOMMAND := $(gb_SdiTarget_SVIDLPRECOMMAND) $(gb_SdiTarget_SVIDLTARGET)
$(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi | $(gb_SdiTarget_SVIDLTARGET)
commit d0985f961d9792c906b012aafa180c425f219673
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 16 19:59:33 2011 +0300
Don't run any cppunittests for iOS
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index d1ee20e..8552de3 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -354,14 +354,13 @@ endef
# CppunitTest class
-gb_CppunitTest_CPPTESTPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+gb_CppunitTest_CPPTESTPRECOMMAND := :
gb_CppunitTest_SYSPRE := libtest_
gb_CppunitTest_EXT := .dylib
gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
define gb_CppunitTest_CppunitTest_platform
-$(call gb_LinkTarget_get_target,$(2)) :
$(call gb_LinkTarget_get_target,$(2)) : LAYER := NONE
endef
commit f067bae73b36f9e3ea2c9003c29b87a7f7777c35
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 16 02:38:03 2011 +0300
Add icc to cross-build-toolset
diff --git a/Makefile.in b/Makefile.in
index ec56ac2..2c44a4b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -73,7 +73,8 @@ cross-build-toolset:
basegfx \
GBUILD:tools \
rsc \
- setup_native; do \
+ setup_native \
+ icc; do \
case $$D in \
GBUILD:*) \
(cd $${D#*:} && make -r -j at BUILD_MAX_JOBS@) \
commit b1ad12fe506a44afe2eb0286d3c0bf26cee08709
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 16 00:40:17 2011 +0300
Mark rdbmaker as DESKTOP
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 65eda02..fbca641 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt MDDS:mdds MESA:Mesa REDLAND:redland TRANSLATIONS:translations animations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper filter offapi offuh oovbaapi oox package qadevOOo rdbmaker sal sax sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools ure uui vbahelper vcl writerperfect xmlscript NULL
+tb tail_build : BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt MDDS:mdds MESA:Mesa REDLAND:redland TRANSLATIONS:translations animations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper filter offapi offuh oovbaapi oox package qadevOOo DESKTOP:rdbmaker sal sax sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools ure uui vbahelper vcl writerperfect xmlscript NULL
tb tail_build\prj nmake - all tb_prj NULL
commit ee36ee07146ed46f879a5c8e9c058002bf36e6bb
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 16 00:39:34 2011 +0300
Mark setup_native and l10ntools as DESKTOP
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index 5802805..f225c3e 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -1,4 +1,4 @@
-cp scp2 : TRANSLATIONS:translations i18npool setup_native l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
+cp scp2 : TRANSLATIONS:translations i18npool DESKTOP:setup_native DESKTOP:l10ntools PYTHON:python ICU:icu REDLAND:redland LIBXSLT:libxslt NULL
cp scp2 usr1 - all cp_mkout NULL
cp scp2\macros nmake - all cp_langmacros NULL
cp scp2\source\templates nmake - all cp_langtemplates NULL
commit 2e51b2257b688a1a153c374859d876ff4af8540d
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 16 00:24:10 2011 +0300
Add BUILD_TYPE keywords NATIVE and DESKTOP
NATIVE indicates that the BUILD and HOST platforms are the same,
i.e. a "normal" not cross-compiling build.
DESKTOP indicates a "normal" desktop/server OS, like Linux, Windows,
BSD or Mac OS X. (Non-desktop ones would be "mobile" ones like iOS and
Android.)
(All traditional, and so far only actually working, builds of OOo/LO
is both NATIVE and DESKTOP. The non-NATIVE and non-DESKTOP cases
belong in the experimental cross-compilation work.)
All non-DESKTOP cases are also non-NATIVE, at least so far. In other
words, when building for a mobile OS we always cross-compile. Note
that the reverse is not true: We eventually would want to
cross-compile to Windows, rarer Linux architectures, and PowerPC Mac
OS X.
DESKTOP is used in build.lst files to indicate modules that it makes
no sense to build for mobile platforms. Nobody is going to run
LibreOffice SDK tools on a tablet.
NATIVE is used in build.lst files to indicate modules that produce
just build-time executables (which can't be run on the BUILD system
when cross-compiling), and which are not part of the SDK either.
(Sadly the use of BUILD_TYPE keywords in the build.lst files is a bit
tedious: you have to mark a module in the build.lst files of all its
"parents", modules that depend on it, not in that of the module
itself.)
It does make sense to build SDK tools in the other cross-compilation
cases. There is no reason why we wouldn't want to cross-compile also
the executables that go into the SDK when cross-compiling to Windows,
for instance.
diff --git a/configure.in b/configure.in
index ad04142..5177e4e 100755
--- a/configure.in
+++ b/configure.in
@@ -1292,6 +1292,7 @@ if test "$cross_compiling" = "yes"; then
CROSS_COMPILING=YES
else
CROSS_COMPILING=
+ BUILD_TYPE="$BUILD_TYPE NATIVE"
fi
AC_SUBST(CROSS_COMPILING)
@@ -1530,6 +1531,20 @@ AC_SUBST(OSVERSION)
AC_SUBST(PTHREAD_CFLAGS)
AC_SUBST(PTHREAD_LIBS)
+dnl It is useful to have a BUILD_TYPE keyword to distinguish "normal"
+dnl desktop OSes from "mobile" ones.
+
+dnl We assume that a non-DESKTOP build type is also a non-NATIVE one.
+dnl In other words, that when building for an OS that is not a
+dnl "desktop" one but a "mobile" one, we are always cross-compiling.
+
+dnl Note the direction of the implication; there is no assumption that
+dnl cross-compiling would imply a non-desktop OS.
+
+if test $_os != iOS -a $_os != Android; then
+ BUILD_TYPE="$BUILD_TYPE DESKTOP"
+fi
+
if test $build_os = "cygwin"; then
dnl ===================================================================
dnl If $CC is set to a MinGW compiler, set WITH_MINGW
More information about the Libreoffice-commits
mailing list