INTEGRATION: CWS jsc20 (1.9.84); FILE MERGED

2008/01/04 10:15:42 jsc 1.9.84.1: #i80013# add support to handle debug version of stlport lib

1 files changed, 28 insertions, 11 deletions

diff --git a/odk/setsdkenv_unix.csh.in b/odk/setsdkenv_unix.csh.in
index 998dfe8288dd..32ed59ec9569 100644
--- a/odk/setsdkenv_unix.csh.in
+++ b/odk/setsdkenv_unix.csh.in
@@ -3,9 +3,7 @@
 # This script sets all enviroment variables, which are necessary for building 
 # the examples of the Office Development Kit.
 # The Script was developed for the operating systems Solaris and Linux.
-set setscript=`history 1 | sed "s/.*source //"`
-set sdkdir=`dirname ${bla}`
-unset setscript
+set sdkdir=@OO_SDK_HOME@
 
 # The SDK name
 setenv OO_SDK_NAME @OO_SDK_NAME@
@@ -15,7 +13,7 @@ setenv OO_SDK_NAME @OO_SDK_NAME@
 setenv OO_SDK_HOME @OO_SDK_HOME@
 
 # Office installation directory.
-# Example: setenv OFFICE_HOME /opt/staroffice
+# Example: set OFFICE_HOME=/opt/staroffice
 set OFFICE_HOME=@OFFICE_HOME@
 
 # URE installation directory.
@@ -90,6 +88,7 @@ switch (`${sdkdir}/config.guess | cut -d"-" -f3,4`)
     set pltfrm=sunpro
     set soext=so
     set exampleout=SOLARISexample.out
+    set stldebug=_debug
 
     # set LD_LIBRARY_PATH
     if ( $?LD_LIBARY_PATH == 0) then
@@ -108,9 +107,10 @@ switch (`${sdkdir}/config.guess | cut -d"-" -f3,4`)
     set directoryname=linux
     set comid=gcc3
     set pltfrm=gcc
-    set soext=dylib
+    set soext=so
     set exampleout=LINUXexample.out
     set platform=Linux
+    set stldebug=_stldebug
 
     # set LD_LIBRARY_PATH
     if ( $?LD_LIBARY_PATH == 0) then
@@ -129,9 +129,10 @@ switch (`${sdkdir}/config.guess | cut -d"-" -f3,4`)
     set directoryname=macosx
     set comid=gcc3
     set pltfrm=gcc
-    set soext=so
+    set soext=dylib
     set exampleout=MACOSXexample.out
     set platform=MacOSX
+    set stldebug=_stldebug
 
     # set DYLD_LIBRARY_PATH
     if ( $?DYLD_LIBRARY_PATH == 0) then
@@ -153,6 +154,7 @@ switch (`${sdkdir}/config.guess | cut -d"-" -f3,4`)
     set soext=so
     set exampleout=FREEBSDexample.out
     set platform=FreeBSD
+    set stldebug=_stldebug
 
     # set LD_LIBRARY_PATH
     if ( $?LD_LIBARY_PATH == 0) then
@@ -188,7 +190,7 @@ endif
 
 # Set CLASSPATH
 if ( ${?OFFICE_PROGRAM_PATH} ) then
-    if ( $[?CLASSPATH} == 0 ) then
+    if ( ${?CLASSPATH} == 0 ) then
         setenv CLASSPATH "${OFFICE_PROGRAM_PATH}/classes/unoil.jar"
     else
         setenv CLASSPATH "${OFFICE_PROGRAM_PATH}/classes/unoil.jar:${CLASSPATH}"
@@ -211,12 +213,23 @@ if ( $?OO_SDK_JAVA_HOME == 0) then
 #    setenv UNO_JAVA_JFW_VENDOR_SETTINGS `sp2bv $OFFICE_HOME/share/config/javavendors.xml`
 endif
 
+if ( -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${stldebug}.${soext}" ) then
+    setenv STLDEBUG ${stldebug}
+else
+    setenv STLDEBUG ""
+endif
+
+
 # For URE, prepare symbolic links for libraries:
 rm -f "${OO_SDK_HOME}/${directoryname}/lib/libuno_cppu.so" \
     "${OO_SDK_HOME}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" \
     "${OO_SDK_HOME}/${directoryname}/lib/libuno_sal.${soext}" \
-    "${OO_SDK_HOME}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" \
-    "${OO_SDK_HOME}/${directoryname}/lib/libstlport_${pltfrm}.${soext}"
+    "${OO_SDK_HOME}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
+
+if ( -e "${OO_SDK_HOME}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ) then
+    rm -rf "${OO_SDK_HOME}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
+endif
+
 if ( "${OO_SDK_URE_HOME}" != "" ) then
     mkdir -p "${OO_SDK_HOME}/${directoryname}/lib"
     ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \
@@ -227,8 +240,12 @@ if ( "${OO_SDK_URE_HOME}" != "" ) then
         "${OO_SDK_HOME}/${directoryname}/lib/libuno_sal.${soext}"
     ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
         "${OO_SDK_HOME}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
-    ln -s "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}.${soext}" \
-        "${OO_SDK_HOME}/${directoryname}/lib/libstlport_${pltfrm}.${soext}"
+
+    if ( -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ) then
+	ln -s "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" \
+	    "${OO_SDK_HOME}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
+    endif
+
 endif
 
 echo