From e591a08dc3d37e13703c855a7f4056faa4e34406 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Thu, 12 Feb 2009 09:18:09 +0000
Subject: CWS-TOOLING: integrate CWS sb103 2009-01-15 15:28:08 +0100 sb 
 r266375 : #i97629# set UNO_PATH in python start program and use it in
 bootstrap function in officehelper.py (and do not erroneously encode a
 vnd.sun.star.pathname URE_BOOTSTRAP value in
 tools::extendApplicationEnvironment) 2009-01-15 10:40:17 +0100 sb  r266338 :
 #i97424# explicit shut down of ImplImageTree singleton in DeInitVCL still
 required 2009-01-14 12:07:15 +0100 sb  r266276 : CWS-TOOLING: rebase CWS
 sb103 to trunk@265758 (milestone: DEV300:m38) 2009-01-14 08:53:02 +0100 sb 
 r266266 : #i96284# remove implementation of unused (but expensive) link
 feature; plus some general cleanup 2009-01-08 14:42:59 +0100 sb  r266010 :
 #i96683# enable dlclose for GCC 3 (based on a patch by cmc) 2009-01-06
 14:18:23 +0100 sb  r265920 : #i97424# spurious unreferenced local variables
 2008-12-19 15:33:39 +0100 sb  r265727 : #i57359# no need for a special glibc
 2.2.4 based libgcc_s.so.1 for URE any more as the general one used for OOo is
 guaranteed to be based on at least glibc 2.2.4, anyway 2008-12-19 13:54:37
 +0100 sb  r265724 : #i97424# clean up and speed up vcl ImplImageTree
 2008-12-18 14:28:10 +0100 sb  r265690 : #i97132# spread usage of the
 rtl::Static pattern (patch by cmc) 2008-12-15 14:33:00 +0100 sb  r265499 :
 #i90492# generate UTF-8 encoded output (patch by tora) 2008-12-15 11:45:05
 +0100 sb  r265469 : #i95593# -Djava.library.path to find
 libtest_javauno_any.so 2008-12-15 11:23:14 +0100 sb  r265468 : #i93769# it
 appears that Java nowadays expects file URIs in UTF-8, so
 ExternalUriReferenceTranslator.toExternal must not be called 2008-12-10
 12:02:50 +0100 sb  r265164 : #i93219# use (corrected) signal handling instead
 of forking again (to avoid unintended generation of core files)

---
 bridges/test/java_uno/any/makefile.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'bridges')

diff --git a/bridges/test/java_uno/any/makefile.mk b/bridges/test/java_uno/any/makefile.mk
index e2df011e4631..d02c5fc4d93c 100644
--- a/bridges/test/java_uno/any/makefile.mk
+++ b/bridges/test/java_uno/any/makefile.mk
@@ -115,8 +115,9 @@ $(OUT)$/bin$/TestRemote$(SCRIPTEXT) : $(JAVACLASSFILES)
 
 $(OUT)$/bin$/TestJni$(SCRIPTEXT) : $(JAVACLASSFILES)
     -rm -f $@
-    echo java -classpath .$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
-        test.java_uno.anytest.TestJni >> $@
+    echo java -classpath \
+        .$(PATH_SEPERATOR)..$/class$(PATH_SEPERATOR)$(EXEC_CLASSPATH) \
+        -Djava.library.path=..$/lib test.java_uno.anytest.TestJni >> $@
     $(GIVE_EXEC_RIGHTS) $@
 
 $(BIN)$/test_java_uno_anytest.rdb : types.idl
-- 
cgit