CWS-TOOLING: integrate CWS sb93

3 files changed, 13 insertions, 20 deletions

diff --git a/ure/source/README b/ure/source/README
index f8dfbbc39da8..6528c58a537a 100644
--- a/ure/source/README
+++ b/ure/source/README
@@ -8,7 +8,7 @@
 #
 # $RCSfile: README,v $
 #
-# $Revision: 1.17 $
+# $Revision: 1.17.2.2 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -53,8 +53,6 @@ Linux x86, Solaris x86, and Solaris SPARC:
 /opt/openoffice.org/ure/lib/libuno_salhelperC52.so.3  [Solaris only]
 /opt/openoffice.org/ure/lib/libstlport_gcc.so  [Linux x86 only]
 /opt/openoffice.org/ure/lib/libstlport_sunpro.so  [Solaris only]
-/opt/openoffice.org/ure/lib/libuno_purpenvhelpergcc3.so.3  [Linux x86 only]
-/opt/openoffice.org/ure/lib/libuno_purpenvhelperC52.so.3  [Solaris only]
 /opt/openoffice.org/ure/share/java/unoloader.jar
 /opt/openoffice.org/ure/share/java/juh.jar
 /opt/openoffice.org/ure/share/java/jurt.jar
@@ -106,8 +104,6 @@ Linux x86, Solaris x86, and Solaris SPARC:
 /opt/openoffice.org/ure/lib/uuresolver.uno.so  [private]
 /opt/openoffice.org/ure/share/java/java_uno.jar  [private]
 /opt/openoffice.org/ure/share/misc/javavendors.xml  [private]
-/opt/openoffice.org/ure/lib/libunsafe_uno_uno.so  [private]
-/opt/openoffice.org/ure/lib/libaffine_uno_uno.so  [private]
 
 Windows:
 
@@ -124,7 +120,6 @@ Program Files\URE\bin\purpenvhelper3MSC.dll
 Program Files\URE\bin\sal3.dll
 Program Files\URE\bin\salhelper3MSC.dll
 Program Files\URE\bin\stlport_vc7145.dll
-Program Files\URE\bin\purpenvhelper3MSC.dll
 Program Files\URE\java\unoloader.jar
 Program Files\URE\java\juh.jar
 Program Files\URE\java\jurt.jar
@@ -132,7 +127,6 @@ Program Files\URE\java\ridl.jar
 Program Files\URE\misc\types.rdb
 Program Files\URE\misc\services.rdb
 Program Files\URE\bin\libxml2.dll  [external]
-Program Files\URE\bin\msvcr71.dll  [external]
 Program Files\URE\bin\uno.ini  [private]
 Program Files\URE\bin\reg3.dll  [private]
 Program Files\URE\bin\rmcxt3.dll  [private]
@@ -169,13 +163,10 @@ Program Files\URE\bin\textinstream.uno.dll  [private]
 Program Files\URE\bin\textoutstream.uno.dll  [private]
 Program Files\URE\bin\stocservices.uno.dll  [private]
 Program Files\URE\bin\uuresolver.uno.dll  [private]
-Program Files\URE\bin\msvcp71.dll  [private]
 Program Files\URE\bin\unicows.dll  [private]
 Program Files\URE\bin\uwinapi.dll  [private]
 Program Files\URE\java\java_uno.jar  [private]
 Program Files\URE\misc\javavendors.xml  [private]
-Program Files\URE\bin\unsafe_uno_uno.dll  [private]
-Program Files\URE\bin\affine_uno_uno.dll  [private]
 
 %windir%\assembly\cli_basetypes.dll [GAC]
 %windir%\assembly\cli_ure.dll [GAC]
diff --git a/ure/source/startup.sh b/ure/source/startup.sh
index ecac68693e66..a4ec42ded460 100644
--- a/ure/source/startup.sh
+++ b/ure/source/startup.sh
@@ -9,7 +9,7 @@
 #
 # $RCSfile: startup.sh,v $
 #
-# $Revision: 1.4 $
+# $Revision: 1.4.10.1 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -40,10 +40,12 @@ done
 
 # Extend the LD_LIBRARY_PATH for Java:
 epath=`dirname "$0"`
-jpath=`"${epath}/javaldx" $my_envargs`
-if [ -n "${jpath}" ]; then
-    LD_LIBRARY_PATH=${jpath}${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
-    export LD_LIBRARY_PATH
+if [ -x "${epath}/javaldx" ] ; then
+    jpath=`"${epath}/javaldx" $my_envargs`
+    if [ -n "${jpath}" ]; then
+        LD_LIBRARY_PATH=${jpath}${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
+        export LD_LIBRARY_PATH
+    fi
 fi
 
 exec "$0.bin" "$@"
diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln
index 8c004adb1efe..62c95797a8ca 100644
--- a/ure/source/uretest/Makefile.pln
+++ b/ure/source/uretest/Makefile.pln
@@ -8,7 +8,7 @@
 #
 # $RCSfile: Makefile.pln,v $
 #
-# $Revision: 1.7 $
+# $Revision: 1.7.10.1 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -139,14 +139,14 @@ out.pln/cppserver.o: cppserver.cc out.pln/cpputypes.cppumaker.flag \
 
 
 out.pln/cpputypes.cppumaker.flag: | out.pln
-	LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/linux/bin/cppumaker \
+	LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/cppumaker \
             -O./out.pln/include/cpputypes \
             '-Tcom.sun.star.lang.DisposedException;com.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.registry.XRegistryKey;com.sun.star.uno.DeploymentException;com.sun.star.uno.Exception;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak' \
             -B/UCR $(URE_HOME)/share/misc/types.rdb
 	touch $@
 
 out.pln/types.cppumaker.flag: out.pln/types.rdb | out.pln
-	LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/linux/bin/cppumaker \
+	LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/cppumaker \
             -O./out.pln/include/types -B/UCR $< \
             -X$(URE_HOME)/share/misc/types.rdb
 	touch $@
@@ -270,7 +270,7 @@ out.pln/types.mf: types.mf.template | out.pln
 
 out.pln/types.javamaker.flag: out.pln/types.rdb | out.pln out.pln/class
 	rm -rf out.pln/class/types
-	LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/linux/bin/javamaker \
+	LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/javamaker \
             -O./out.pln/class/types -B/UCR $< -X$(URE_HOME)/share/misc/types.rdb
 	touch $@
 
@@ -279,7 +279,7 @@ out.pln/types.rdb: out.pln/types.urd | out.pln
 	$(URE_HOME)/bin/regmerge $@ /UCR $<
 
 out.pln/types.urd: types.idl | out.pln
-	LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/linux/bin/idlc -O$(@D) \
+	LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/idlc -O$(@D) \
             -I$(SDK_HOME)/idl -cid -we $<