diff options
| author | Joachim Lingner <jl@openoffice.org> | 2010-07-15 16:48:34 +0200 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2010-07-15 16:48:34 +0200 |
| commit | 0db2d911659eed658bdc163731be27ac29e8767a (patch) | |
| tree | bb8decbb26a67834b0a3505b0b7f9d4d57ae293c | |
| parent | 26cf6bd0bec3945ab900de92f961150cbf371ed3 (diff) | |
jl154 #162868# remove basis/presets/bundled/bundled.ini, and create always share/extensions folder
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/simplepackage.pm | 19 |
2 files changed, 12 insertions, 9 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 52c89ef14464..6f0384a11e12 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -85,7 +85,7 @@ Module gid_Module_Root_Brand gid_Brand_File_Lib_Npsoplugin, gid_Brand_File_Lib_Subscrib_C05, gid_Brand_File_Share_Registry_Brand_Xcd, - gid_Brand_File_Share_Registry_O5oo_Xcd + gid_Brand_File_Share_Registry_O5oo_Xcd, gid_Brand_File_Script_Unopkg, gid_Brand_File_Share_Xdg_Base, gid_Brand_File_Share_Xdg_Calc, diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 3ad13edd61ff..9eb8522ebfd6 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -82,13 +82,13 @@ sub get_extensions_dir sub register_extensions { - my ($officedir, $languagestringref, $bundleddir) = @_; + my ($officedir, $languagestringref, $presetsdir) = @_; my $infoline = ""; - if ( $bundleddir eq "" ) + if ( $presetsdir eq "" ) { - $infoline = "ERROR: Failed to determine directory \"bundled\" in \"presets\" folder for extension registration! Please check your installation set.\n"; + $infoline = "ERROR: Failed to determine directory \"presets\" for extension registration! Please check your installation set.\n"; push( @installer::globals::logfileinfo, $infoline); installer::exiter::exit_program($infoline, "register_extensions"); } @@ -128,13 +128,16 @@ sub register_extensions if ( $^O =~ /cygwin/i ) { $localtemppath = $installer::globals::cyg_temppath; - $bundleddir = qx{cygpath -m "$bundleddir"}; - chomp($bundleddir); + $presetsdir = qx{cygpath -m "$presetsdir"}; + chomp($presetsdir); } $localtemppath =~ s/\\/\//g; $slash = "/"; # Third slash for Windows. Other OS pathes already start with "/" } + $presetsdir =~ s/\/\s*$//g; + my $bundleddir = $presetsdir . "/bundled"; + my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $slash . $bundleddir . "\"" . " -env:UserInstallation=file://" . $slash . $localtemppath . " 2\>\&1 |"; print "... $systemcall ...\n"; @@ -635,7 +638,7 @@ sub create_simple_package installer::logger::print_message( "... creating directories ...\n" ); installer::logger::include_header_into_logfile("Creating directories:"); - my $bundleddir = ""; + my $presetsdir = ""; for ( my $i = 0; $i <= $#{$dirsref}; $i++ ) { @@ -644,7 +647,7 @@ sub create_simple_package if ( $onedir->{'HostName'} ) { my $destdir = $subfolderdir . $installer::globals::separator . $onedir->{'HostName'}; - if ( $destdir =~ /\Wbundled\s*$/ ) { $bundleddir = $destdir; } + if ( $destdir =~ /\Wpresets\s*$/ ) { $presetsdir = $destdir; } if ( ! -d $destdir ) { @@ -781,7 +784,7 @@ sub create_simple_package installer::logger::print_message( "... registering extensions ...\n" ); installer::logger::include_header_into_logfile("Registering extensions:"); - register_extensions($subfolderdir, $languagestringref, $bundleddir); + register_extensions($subfolderdir, $languagestringref, $presetsdir); if ( $installer::globals::compiler =~ /^unxmacx/ ) { |