CWS-TOOLING: integrate CWS jl164

This commit is contained in:
obo 2011-03-16 10:11:17 +01:00
commit ac7a93d1b2

20
solenv/bin/modules/installer/simplepackage.pm Normal file → Executable file
View file

@ -127,25 +127,7 @@ sub register_extensions
if ( ! -f $unopkgfile ) { installer::exiter::exit_program("ERROR: $unopkgfile not found!", "register_extensions"); }
my $localtemppath = installer::systemactions::create_directories("uno", $languagestringref);
my $slash = "";
if ( $installer::globals::iswindowsbuild )
{
if ( $^O =~ /cygwin/i )
{
$localtemppath = $installer::globals::cyg_temppath;
$preregdir = qx{cygpath -m "$preregdir"};
chomp($preregdir);
}
$localtemppath =~ s/\\/\//g;
$slash = "/"; # Third slash for Windows. Other OS pathes already start with "/"
}
$preregdir =~ s/\/\s*$//g;
my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $slash . $preregdir . "\"" . " -env:UserInstallation=file://" . $slash . $localtemppath . " -env:UNO_JAVA_JFW_ENV_JREHOME=true 2\>\&1 |";
my $systemcall = $unopkgfile . " sync --verbose" . " -env:UNO_JAVA_JFW_ENV_JREHOME=true 2\>\&1 |";
print "... $systemcall ...\n";