INTEGRATION: CWS sb83 (1.28.34); FILE MERGED

2008/03/17 09:02:10 sb 1.28.34.13: RESYNC: (1.29-1.30); FILE MERGED
2008/03/04 16:23:41 sb 1.28.34.12: missing export
2008/02/14 13:05:19 sb 1.28.34.11: #i84200# for now, move crash reporter to brand layer
2008/02/12 12:44:26 sb 1.28.34.10: #i86041# do not add Mozilla library directory to LD_LIBRARY_PATH in soffice start script
2008/02/12 08:44:08 sb 1.28.34.9: #i84200# lots of cleanup
2008/02/08 11:12:48 sb 1.28.34.8: #i84200# extract all the meat from (soffice|unkpkg).bin into (soffice|unkpkg).dll, where the .dll are in the basis layer and the .bin, on all plattforms, are in the brand layer, where they can include brand-specific icons on Windows (read by vcl; potentially visible in Windows Explorer according to hro)
2008/01/23 15:16:33 sb 1.28.34.7: #i84200# moved executables from brand layer to basis layer
2008/01/21 15:13:48 sb 1.28.34.6: #i84200# have a fake ure-link in all Unix good-old monolithic OOos, so that start-script javaldx execution can be simplified
2008/01/07 15:27:10 sb 1.28.34.5: #i84985# added URE_OVERRIDE_JAVA_JFW_SHARED|USER_DATA
2008/01/02 16:19:04 sb 1.28.34.4: #i84200# simplified search for pagein again, as basis-link is now also available in good old monolithic OOo
2008/01/02 12:27:01 sb 1.28.34.3: #i84200# typo (missing .../bin/...)
2007/12/03 13:46:29 sb 1.28.34.2: #i84200# First step of basis/brand split.
2007/11/22 09:45:46 sb 1.28.34.1: Merged in CWS sb80.

1 files changed, 16 insertions, 140 deletions

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 3f9d5f97e39b..20443a71264c 100644
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -5,9 +5,9 @@
 #
 #   $RCSfile: soffice.sh,v $
 #
-#   $Revision: 1.30 $
+#   $Revision: 1.31 $
 #
-#   last change: $Author: obo $ $Date: 2008-02-26 16:03:10 $
+#   last change: $Author: vg $ $Date: 2008-03-18 13:44:45 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -47,16 +47,12 @@ export SAL_ENABLE_FILE_LOCKING
 # working on your system.
 # SAL_NOOPENGL=true; export SAL_NOOPENGL
 
-sd_platform=`uname -s`
-
 # the following test is needed on Linux PPC with IBM j2sdk142
-if [ $sd_platform = "Linux" -a "`uname -m`" = "ppc" ] ; then
+if [ "`uname -s`" = "Linux" -a "`uname -m`" = "ppc" ] ; then
     JITC_PROCESSOR_TYPE=6
     export JITC_PROCESSOR_TYPE
 fi
 
-# set -x
-
 # resolve installation directory
 sd_cwd="`pwd`"
 if [ -h "$0" ] ; then
@@ -67,105 +63,10 @@ if [ -h "$0" ] ; then
 else
     cd "`dirname "$0"`"
 fi
-
-sd_prog="`pwd`"
-
-cd ..
-sd_binary=`basename "$0"`".bin"
-sd_inst="`pwd`"
-
-# change back directory
+sd_prog=`pwd`
 cd "$sd_cwd"
 
-# check if all required patches are installed
-if [ -x "$sd_prog/sopatchlevel.sh" ]; then
-    "$sd_prog/sopatchlevel.sh"
-    if [ $? -eq 1 ]; then
-        exit 0
-    fi
-fi
-
-# set search path for shared libraries
-add_moz_lib=
-for moz_lib_path in \
-    $MOZILLA_LIBRARY_PATH \
-    /usr/lib \
-    /usr/lib/mozilla \
-    /usr/lib/mozilla-firefox \
-    /usr/lib/mozilla-thunderbird \
-    /opt/mozilla/lib \
-    /opt/MozillaFirefox/lib \
-    /opt/MozillaThunderbird/lib; \
-do
-    if [ -f $moz_lib_path/libnss3.so ]; then
-    case "$moz_lib_path" in
-        /usr/lib|/usr/lib64) : ;;
-        *) add_moz_lib=":$moz_lib_path"
-    esac
-    break
-    fi
-done
-case $sd_platform in
-  AIX)
-    # this is a temporary hack until we can live with the default search paths
-    if [ $LIBPATH ]; then
-      SYSTEM_LIBPATH=$LIBPATH
-      export SYSTEM_LIBPATH
-      LIBPATH="$sd_prog$add_moz_lib":$LIBPATH
-    else
-      LIBPATH="$sd_prog$add_moz_lib"
-    fi
-    export LIBPATH
-    ;;
-
-  Darwin)
-    # this is a temporary hack until we can live with the default search paths
-    if [ "$DYLD_LIBRARY_PATH" ]; then
-      SYSTEM_DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH
-      export SYSTEM_DYLD_LIBRARY_PATH
-      DYLD_LIBRARY_PATH="$sd_prog$add_moz_lib":$DYLD_LIBRARY_PATH
-    else
-      DYLD_LIBRARY_PATH="$sd_prog$add_moz_lib"
-    fi
-    export DYLD_LIBRARY_PATH
-    ;;
-
-  HP-UX)
-    # this is a temporary hack until we can live with the default search paths
-    if [ $SHLIB_PATH ]; then
-      SYSTEM_SHLIB_PATH=$SHLIB_PATH
-      export SYSTEM_SHLIB_PATH
-      SHLIB_PATH="$sd_prog$add_moz_lib":/usr/openwin/lib:$SHLIB_PATH
-    else
-      SHLIB_PATH="$sd_prog$add_moz_lib":/usr/openwin/lib
-    fi
-    export SHLIB_PATH
-    ;;
-
-  IRIX*)
-    # this is a temporary hack until we can live with the default search paths
-    if [ $LD_LIBRARYN32_PATH ]; then
-       SYSTEM_LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH
-       export SYSTEM_LD_LIBRARYN32_PATH
-       LD_LIBRARYN32_PATH=:"$sd_prog$add_moz_lib":$LD_LIBRARYN32_PATH
-    else
-       LD_LIBRARYN32_PATH=:"$sd_prog$add_moz_lib"
-    fi
-    export LD_LIBRARYN32_PATH
-    ;;
-
-  *)
-    # this is a temporary hack until we can live with the default search paths
-    if [ $LD_LIBRARY_PATH ]; then
-      SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
-      export SYSTEM_LD_LIBRARY_PATH
-      LD_LIBRARY_PATH="$sd_prog$add_moz_lib":$LD_LIBRARY_PATH
-    else
-      LD_LIBRARY_PATH="$sd_prog$add_moz_lib"
-    fi
-    export LD_LIBRARY_PATH
-    ;;
-esac
+sd_binary=`basename "$0"`.bin
 
 #collect all bootstrap variables specified on the command line
 #so that they can be passed as arguments to javaldx later on
@@ -177,36 +78,15 @@ do
 done
 
 # extend the ld_library_path for java: javaldx checks the sofficerc for us
-unset java_ld_library_path
-if [ -x "$sd_prog/javaldx" ] ; then
-    java_ld_library_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS`
-elif [ -x "$sd_prog/../ure-link/javaldx" ] ; then
-    java_ld_library_path=`"$sd_prog/../ure-link/javaldx" $BOOTSTRAPVARS`
-fi
-if [ "$java_ld_library_path" != "" ] ; then
-    case $sd_platform in
-        AIX)
-            LIBPATH=${java_ld_library_path}:${LIBPATH}
-            ;;
-        Darwin)
-            DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
-            ;;
-        HP-UX)
-            SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
-            ;;
-        IRIX*)
-            LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
-            ;;
-        *)
-            LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
-            ;;
-    esac
+if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
+    my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
+        "-env:INIFILEPATH=$sd_prog/redirectrc"`
+    if [ -n "$my_path" ] ; then
+        LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
+        export LD_LIBRARY_PATH
+    fi
 fi
 
-# misc. environment variables
-OPENOFFICE_MOZILLA_FIVE_HOME="$sd_inst/program"
-export OPENOFFICE_MOZILLA_FIVE_HOME
-
 unset XENVIRONMENT
 
 # uncomment line below to disable anti aliasing of fonts
@@ -242,17 +122,13 @@ if [ -f /etc/adabasrc ]; then
 fi
 
 sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-common"
-"${sd_prog}"/pagein -L"${sd_prog}" ${sd_pagein_args}
+"$sd_prog/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \
+    ${sd_pagein_args}
 
-# set path so that other apps can be started from soffice just by name
-if [ "$PATH" ]; then
-  PATH="$sd_prog":$PATH
-else
-  PATH="$sd_prog"
-fi
+# Set PATH so that crash_report is found:
+PATH=$sd_prog${PATH+:$PATH}
 export PATH
 
-
 # execute soffice binary
 "$sd_prog/$sd_binary" "$@" &
 trap 'kill -9 $!' TERM