diff options
| author | sb <sb@openoffice.org> | 2010-04-14 17:07:44 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-04-14 17:07:44 +0200 |
| commit | 5aaefa22ae131a80c8beaaa5294c2bb3cd65d4ca (patch) | |
| tree | 267e1f62f0761f40a4d7b3196344157aa4103502 /solenv | |
| parent | sb118: pass UNO_JAVA_JFW_ENV_JREHOME/CLASSPATH when calling unopkg during build (diff) | |
| download | core-5aaefa22ae131a80c8beaaa5294c2bb3cd65d4ca.tar.gz core-5aaefa22ae131a80c8beaaa5294c2bb3cd65d4ca.zip | |
sb118: backed out passing UNO_JAVA_JFW_ENV_JREHOME/CLASSPATH again; for one, those settings (partially pointing into solver) do not work to unopkg add an .oxt containing a .jar into the installation being created; for another, a fix for i77196 will probably obsolete a need to call unopkg during installation anyway; I assume I added this so that bogus ~/.ure settings do not prevent unopkg (and javaldx) from working here
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/simplepackage.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index ee1217f926f0..39530ee96843 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -135,7 +135,7 @@ sub register_extensions $localtemppath =~ s/\\/\//g; $localtemppath = "/".$localtemppath; } - my $systemcall = $unopkgfile . " add --shared --verbose " . $oneextension . " -env:UserInstallation=file://" . $localtemppath . " -env:UNO_JAVA_JFW_ENV_JREHOME=true -env:UNO_JAVA_JFW_ENV_CLASSPATH=true 2\>\&1 |"; + my $systemcall = $unopkgfile . " add --shared --verbose " . $oneextension . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |"; print "... $systemcall ...\n"; |