diff options
| author | Armin Le Grand <alg@apache.org> | 2013-07-27 11:40:32 +0000 |
|---|---|---|
| committer | Armin Le Grand <alg@apache.org> | 2013-07-27 11:40:32 +0000 |
| commit | 8a6f84ce896f41a7a1f97b06d1e053c51cbba95e (patch) | |
| tree | 0865afbfa9eb147e0a5be9759f932954cfb59e32 /desktop/scripts | |
| parent | 59ee09f905e86724a2ba5cdccab9210d16686820 (diff) | |
resync to trunk (close to AOO400)
Diffstat (limited to 'desktop/scripts')
| -rw-r--r-- | desktop/scripts/soffice.sh | 11 | ||||
| -rw-r--r-- | desktop/scripts/unoinfo.sh | 10 | ||||
| -rw-r--r-- | desktop/scripts/unopkg.sh | 2 |
3 files changed, 11 insertions, 12 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index c8d1bfae01f0..c562b545b184 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -81,21 +81,20 @@ for sd_arg in "$@"; do ;; esac done -"$sd_prog/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \ +"$sd_prog/pagein" -L"$sd_prog" \ ${sd_pagein_args} # extend the ld_library_path for java: javaldx checks the sofficerc for us -if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then +if [ -x "$sd_prog/javaldx" ] ; then # this is a temporary hack until we can live with the default search paths case "`uname -s`" in FreeBSD) - sd_prog1="$sd_prog/../basis-link/program" - sd_prog2="$sd_prog/../basis-link/ure-link/lib" - LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}} + sd_prog1="$sd_prog" + LD_LIBRARY_PATH=$sd_prog1:${LD_LIBRARY_PATH}} export LD_LIBRARY_PATH ;; esac - my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \ + my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` if [ -n "$my_path" ] ; then LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} diff --git a/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh index 82fbe57ba22c..bb10207a7e9b 100644 --- a/desktop/scripts/unoinfo.sh +++ b/desktop/scripts/unoinfo.sh @@ -34,14 +34,14 @@ sd_prog=`pwd` case $1 in c++) - printf '%s' "$sd_prog/../basis-link/ure-link/lib" + printf '%s' "$sd_prog" ;; java) printf '0%s\0%s\0%s\0%s\0%s' \ - "$sd_prog/../basis-link/ure-link/share/java/ridl.jar" \ - "$sd_prog/../basis-link/ure-link/share/java/jurt.jar" \ - "$sd_prog/../basis-link/ure-link/share/java/juh.jar" \ - "$sd_prog/../basis-link/program/classes/unoil.jar" "$sd_prog" + "$sd_prog/classes/ridl.jar" \ + "$sd_prog/classes/jurt.jar" \ + "$sd_prog/classes/java/juh.jar" \ + "$sd_prog/classes/unoil.jar" "$sd_prog" ;; *) exit 1 diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index 71421e40de05..c0b5eac1a0d0 100644 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -58,7 +58,7 @@ fi # extend the ld_library_path for java: javaldx checks the sofficerc for us if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then - my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \ + my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` if [ -n "$my_path" ] ; then LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} |