diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-09-16 14:37:52 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-09-16 14:37:52 +0000 |
| commit | 799460dccff206acc35ea148b54d4da72387710e (patch) | |
| tree | 7d9053870881a3d34e0f5f76fa0320c57e0de944 | |
| parent | dcccf4a7c729f11f3f1bf41d77368cec4be10e25 (diff) | |
CWS-TOOLING: integrate CWS sb113
2009-09-01 sb #i76393# second attempt at properly #ifdef-ing previous HG commit d598efdbf012
2009-08-28 sb #i102469# change back <T extends XInterface> to just <T> on queryInterface, to avoid binary incompatibility (method changing its signature from (Ljava/lang/Class;Ljava/lang/Object;)Ljava/lang/Object; to (Ljava/lang/Class;Ljava/lang/Object;)Lcom/sun/star/uno/XInterface;)
2009-08-28 sb #i76393# properly #ifdef previous HG commit d598efdbf012
2009-08-27 sb #i94421# work around compiler error (based on a patch supplied by cloph)
2009-08-26 sb merged in DEV300_m56
2009-08-26 sb #i76393# on Linux, include dynamic section offset in crash report so as to be able to map "prelinked" callstacks back to original (patch by cmc)
2009-08-26 sb #i88162# remove unnecessary whitespace lines from per-locale xcu files (patch by tora)
2009-08-17 Juergen Schmidt #i104292# set context classloader after create new custom UNO loader
2009-08-17 Juergen Schmidt #i103749# integrate patch
2009-08-14 sb #i103269# cherry-picked ssh://hg@hg.services.openoffice.org/cws/sb111 -r 5124ebd5edd1 ("#i101955# changed encoding of XML file content from erroneous ISO-8859-1 to UTF-8")
2009-08-12 sb #i102469# fixed mis-applications of UnoRuntime.queryInterface (detected via the simplified UnoRuntime.queryInterface, the HG changeset 29de35fc9554) to use AnyConverter instead; changed qadevOOo's lib.MultiMethodTest.before to allow throwing arbitrary exceptions, to cater for IllegalArgumentException thrown by AnyConverter
2009-08-12 sb #i104178# drop extra libxml2-config script from libxmlsec
2009-08-10 sb #i101754# simplified osl_getProcessInfo for LINUX (patch by cmc)
2009-08-10 sb #i95018# avoid closing -1 fds (patch supplied by cmc)
2009-08-10 sb #i103585# removed (apparently unnecessary) zlib support from libxml2; in turn, removed zlib dependencies from libxmlsec, libxslt, and redland (assuming those were transitive dependencies brought in by direct dependencies on libxml2)
2009-08-10 sb #i102469# simplified UnoRuntime.queryInterface using Java 5 generics; adapted URE-related modules accordingly
2009-08-10 sb #i101213# adapted setsolar env (solenv/config/) to set PYTHONPATH (and not set PYTHONHOME) in accordance with configure env (set_soenv.in); fixed testtools/source/bridgetest/pyuno (which now should work everywhere out of the box, thanks to the fixed setsolar PYTHONPATH)
2009-08-10 sb cherry-picked ssh://hg@hg.services.openoffice.org/cws/sb111 -r ea8de6d9396b ("#i101955# work in progress for a .hgignore file, continued")
| -rw-r--r-- | solenv/config/sdev300.ini | 6 | ||||
| -rw-r--r-- | solenv/config/ssolar.cmn | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 3dcb485a4..e675c9a20 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -189,6 +189,10 @@ finish ENABLE_GTK SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% -I%SOLARENV%$/%OUTPATH%$/inc -I%SOLARENV%$/inc %SOLAREXTRAINC% } + common_0:1 IF %SYSTEM_PYTHON% != YES + { + PYTHONPATH .$:$cp(%SOLARVER%$/%INPATH%$/lib%UPDMINOREXT%)$:$cp(%SOLARVER%$/%INPATH%$/lib%UPDMINOREXT%$/python)$:$cp(%SOLARVER%$/%INPATH%$/lib%UPDMINOREXT%$/python$/lib-dynload)$:$cp(%SOLARVER%$/%INPATH%$/lib%UPDMINOREXT%$/pyuno)$:$cp(%SOLARVER%$/%INPATH%$/bin%UPDMINOREXT%$/pyuno) + } common_0:3 IF %SOLARINCLUDES% == { SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% %PSDKINC% -I%COMPATH%$/include -I%SOLARENV%$/inc %SOLAREXTRAINC% @@ -2499,8 +2503,6 @@ unxubti8 HAVE_GCC_VISIBILITY_FEATURE TRUE LD_LIBRARY_PATH .:/usr/lib:/usr/lib/jvm/java-6-openjdk/jre/lib/i386:/usr/lib/jvm/java-6-openjdk/jre/lib/i386/xawt:/usr/lib/jvm/java-6-openjdk/jre/lib/i386/client:/usr/lib/jvm/java-6-openjdk/jre/lib/i386/native_threads:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%: MKOUT mkout.pl - PYTHONHOME %SOURCE_ROOT%/%INPATH% - PYTHONPATH .:%SOURCE_ROOT%$/%INPATH%$/lib%UPDMINOREXT%:%SOURCE_ROOT%/%INPATH%/lib%UPDMINOREXT%/python:/%SOURCE_ROOT%/%INPATH%/lib%UPDMINOREXT%/python/lib-dynload:%SOURCE_ROOT%/%INPATH%/bin%UPDMINOREXT%/pyuno SOLAREXTRAINC -I%SOLAR_STLPATH% SOLAREXTRALIB -L../lib SOLAR_JAVA TRUE diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn index f7a7e89b1..51786eb57 100644 --- a/solenv/config/ssolar.cmn +++ b/solenv/config/ssolar.cmn @@ -270,7 +270,6 @@ common NO_HIDS PAM_LINK PAM - PYTHONHOME PYTHONPATH SOLAR_PLUGIN URE_BOOTSTRAP |