diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-10 15:52:22 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-10 16:03:28 +0200 |
| commit | 6dcb3d4ef46312729bb6f16c473b433474863f68 (patch) | |
| tree | 58f2f577d9883e32b886bbe4086f83d0bb16fc81 /desktop/scripts | |
| parent | f2f3703740f65b76e891ecc3591d7e60d5b7caef (diff) | |
Related fdo#51252: No more prereg, no more unopkg sync
Now that 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying
share/prereg/bundled to avoid startup crashes" removed the use of share/prereg,
there is no longer need to generate it in the first place (by calling "unopkg
sync" at build or installation time), and so no need for the "unopkg sync" sub-
command, either. This also allows to simplify some of the jvmfwk code that was
only there so that "unopkg sync" (which can require a JVM) can work in "hostile"
environments (during build and installation).
Change-Id: I52657384f4561bf27948ba4f0f88f4498e90987f
Diffstat (limited to 'desktop/scripts')
| -rwxr-xr-x | desktop/scripts/unopkg.sh | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index 9856d191b68f..4bb36bbfd887 100755 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -64,27 +64,18 @@ esac #collect all bootstrap variables specified on the command line #so that they can be passed as arguments to javaldx later on -#Recognize the "sync" option. sync must be applied without any other -#options except bootstrap variables or the verbose option for arg in $@ do case "$arg" in -env:*) BOOTSTRAPVARS=$BOOTSTRAPVARS" ""$arg";; - sync) OPTSYNC=true;; -v) VERBOSE=true;; --verbose) VERBOSE=true;; - *) OPTOTHER=$arg;; esac done -if [ "$OPTSYNC" = "true" ] && [ -z "$OPTOTHER" ] -then - JVMFWKPARAMS='-env:UNO_JAVA_JFW_INSTALL_DATA=$BRAND_BASE_DIR/share/config/javasettingsunopkginstall.xml -env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' -fi - # extend the ld_library_path for java: javaldx checks the sofficerc for us if [ -x "$sd_prog/../ure-link/bin/javaldx" ] ; then - my_path=`"$sd_prog/../ure-link/bin/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \ + my_path=`"$sd_prog/../ure-link/bin/javaldx" $BOOTSTRAPVARS \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` if [ -n "$my_path" ] ; then sd_platform=`uname -s` @@ -110,6 +101,6 @@ unset XENVIRONMENT # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS # execute binary -exec "$sd_prog/unopkg.bin" "$@" $JVMFWKPARAMS \ +exec "$sd_prog/unopkg.bin" "$@" \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc" |