diff options
author | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 11:29:10 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 11:29:10 +0000 |
commit | 2a835ac857b4f46e28006421757e4978da74885a (patch) | |
tree | 68d879481a6d17271123a7a39bca9a3c246ccd0f /desktop/scripts | |
parent | c78a5da7c41d2220507b2fac5d7d1f889e97b839 (diff) |
INTEGRATION: CWS c06 (1.2.300); FILE MERGED
2005/08/26 15:31:12 kso 1.2.300.1: #i53834# - pass bootstrap vars to javaldx.
Diffstat (limited to 'desktop/scripts')
-rw-r--r-- | desktop/scripts/unopkg.sh | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index 25219d6e460d..88bf3a7d6a6e 100644 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -5,9 +5,9 @@ # # $RCSfile: unopkg.sh,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: rt $ $Date: 2005-09-08 17:03:21 $ +# last change: $Author: rt $ $Date: 2005-11-11 12:29:10 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -95,9 +95,18 @@ case $sd_platform in ;; esac +#collect all bootstrap variables specified on the command line +#so that they can be passed as arguments to javaldx later on +for arg in $@ +do + case "$arg" in + -env:*) BOOTSTRAPVARS=$BOOTSTRAPVARS" ""$arg";; + esac +done + # extend the ld_library_path for java: javaldx checks the sofficerc for us if [ -x "$sd_prog/javaldx" ] ; then - java_ld_library_path=`"$sd_prog/javaldx"` + java_ld_library_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS` if [ "$java_ld_library_path" != "" ] ; then case $sd_platform in AIX) |