testtools/prj/build.lst | 2 +-
testtools/source/bridgetest/pyuno/makefile.mk | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit b5f38fd7f51c317d767996535c3e34e0301c10ec
Author: Hanno Meyer-Thurow <h.mth at web.de>
Date: Sun Mar 13 16:15:41 2011 +0100
Merge Gentoo patches from old build and downstream repositories.
1. Do not add compiler default include and library path: potentially build
against different version of system library than requested by the user.
2. Add a configure option to disable Python2 (PyUNO) bindings. Python3 is
available for more than two years. Noone cares, therefore rest in peace.
Python2 is going to be ditched at some point. Simply do not fail then.
Windows builds need to be updated for BUILD_TYPE: "PYUNO". Or how is it
handled nowadays?
3. Fix sandbox violation in officecfg module: rm /bin/<language>.zip
4. Add a configure option to search only in one place for JVMs, which is quite
interesting for Linux Distributions. Enforce the user to place JVMs in one
base directory.
5. Fix build for libxml-2.7.8 with ICU support.
* config_office-XINC-XLIB-defaults.diff: (1)
* disable-python.diff: (2)
* gentoo-sandbox.diff: (3)
* jvm-search-path.diff: (4)
* libxmlsec_fix_extern_c.diff: (5)
diff --git a/testtools/prj/build.lst b/testtools/prj/build.lst
index 24dce41..c1609c6 100644
--- a/testtools/prj/build.lst
+++ b/testtools/prj/build.lst
@@ -1,4 +1,4 @@
-tt testtools : cpputools io remotebridges stoc javaunohelper pyuno cli_ure offapi NULL
+tt testtools : cpputools io remotebridges stoc javaunohelper PYUNO:pyuno cli_ure offapi NULL
tt testtools\inc nmake - all tt_inc NULL
tt testtools\source\bridgetest nmake - all tt_bridgetest tt_bridgetest_idl tt_javaTestObjs tt_inc NULL
tt testtools\source\bridgetest\cli nmake - w,vc7 tt_cli tt_bridgetest tt_bridgetest_idl tt_inc NULL
diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk
index fb7a78f..04b529a 100644
--- a/testtools/source/bridgetest/pyuno/makefile.mk
+++ b/testtools/source/bridgetest/pyuno/makefile.mk
@@ -37,6 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
# --- Files --------------------------------------------------------
+.IF "$(DISABLE_PYTHON)" != "TRUE"
.IF "$(L10N_framework)"==""
PYEXC=$(DLLDEST)$/python$(EXECPOST)
REGEXC=$(DLLDEST)$/regcomp$(EXECPOST)
@@ -79,8 +80,11 @@ ALL : \
doc \
ALLTAR
.ENDIF # L10N_framework
+.ENDIF # DISABLE_PYTHON
.INCLUDE : target.mk
+
+.IF "$(DISABLE_PYTHON)" != "TRUE"
.IF "$(L10N_framework)"==""
$(DLLDEST)$/%.py: %.py
cp $? $@
@@ -105,4 +109,5 @@ runtest : ALL
cd $(DLLDEST) && $(TEST_ENV) && $(WRAPCMD) $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy2.rdb \
-l com.sun.star.loader.Python -c vnd.sun.star.expand:$$FOO/samplecomponent.py
.ENDIF # L10N_framework
+.ENDIF # DISABLE_PYTHON