diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:59:10 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:59:10 +0000 |
| commit | 66ca484175e65827e6f1bfe38a8082a63ebf6599 (patch) | |
| tree | e6d57d7ecc2aac9fa6860e71b2102b5ba96e1b1b /desktop/scripts/unopkg.sh | |
| parent | 84fab02b328b9ae902cde3b81a542e6acbc9cffb (diff) | |
INTEGRATION: CWS sb71 (1.5.286); FILE MERGED
2007/08/20 08:58:31 sb 1.5.286.4: #i75466# Set URE_BIN_DIR in rc file on all platforms (instead of in startup scripts on Linux/Solaris etc. and in rc files on others).
2007/04/27 14:20:52 sb 1.5.286.3: #i75466# Replaced URE_UNORC and URE_JVMFWK3RC with URE_BOOTSTRAP.
2007/04/18 14:09:40 sb 1.5.286.2: #i75466# Take into account that URE_BIN_DIR is a URL that starts with a file:// prefix.
2007/04/16 13:32:36 sb 1.5.286.1: #i75466# Introduced URE_BIN_DIR, URE_UNORC, URE_JVMFWK3RC.
Diffstat (limited to 'desktop/scripts/unopkg.sh')
| -rw-r--r-- | desktop/scripts/unopkg.sh | 49 |
1 files changed, 28 insertions, 21 deletions
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index a894c187d34b..b4bbb0e2454d 100644 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -5,9 +5,9 @@ # # $RCSfile: unopkg.sh,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # -# last change: $Author: hr $ $Date: 2006-01-24 16:46:34 $ +# last change: $Author: vg $ $Date: 2007-10-15 12:59:10 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -104,28 +104,35 @@ do esac done +# set URE_BOOTSTRAP (if not yet set): +: ${URE_BOOTSTRAP="file://$sd_prog/fundamentalrc"} +export URE_BOOTSTRAP + # 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` - 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 - fi +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 fi # misc. environment variables |