diff options
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/directory_ooo.scp | 6 | ||||
| -rw-r--r-- | scp2/source/ooo/profile_ooo.scp | 7 | ||||
| -rw-r--r-- | scp2/source/ooo/profileitem_ooo.scp | 10 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/simplepackage.pm | 19 |
5 files changed, 14 insertions, 32 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index f505a886cba8..b1f39c23c31b 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -43,6 +43,7 @@ Module gid_Module_Root_Brand gid_Brand_Dir_Share_C05_Faq, gid_Brand_Dir_Share_Config, gid_Brand_Dir_Share_Extension, + gid_Brand_Dir_Share_Extensions, gid_Brand_Dir_Share_Uno_Packages, gid_Brand_Dir_Share_Uno_Packages_Cache, gid_Brand_Dir_Share_Registry, @@ -85,7 +86,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, @@ -219,6 +220,7 @@ End Directory gid_Brand_Dir_Share_Extensions ParentID = gid_Brand_Dir_Share; DosName = "extensions"; + Styles = (CREATE); End Directory gid_Brand_Dir_Share_Extensions_Install diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index 87fa78ff13a9..cc805f9e8288 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -179,12 +179,6 @@ Directory gid_Dir_User_Xslt DosName = "xslt"; End -Directory gid_Dir_User_Bundled - ParentID = gid_Dir_User; - DosName = "bundled"; - Styles = (CREATE); -End - Directory gid_Dir_User_Autotext ParentID = gid_Dir_User; DosName = "autotext"; diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp index 53cea799dc6f..a2491045caf9 100644 --- a/scp2/source/ooo/profile_ooo.scp +++ b/scp2/source/ooo/profile_ooo.scp @@ -45,13 +45,6 @@ Profile gid_Profile_Version_Ini_Basis Styles = (); End -Profile gid_Profile_Bundled_Ini_Basis - ModuleID = gid_Module_Root; - Name = PROFILENAME(bundled); - Dir = gid_Dir_User_Bundled; - Styles = (); -End - Profile gid_Profile_Fundamentalbasis_Ini ModuleID = gid_Module_Root; Name = PROFILENAME(fundamentalbasis); diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp index d7f069e4793a..724316ba6f5e 100644 --- a/scp2/source/ooo/profileitem_ooo.scp +++ b/scp2/source/ooo/profileitem_ooo.scp @@ -461,13 +461,3 @@ ProfileItem gid_Basis_Profileitem_Version_Ooopackageversion Key = "OOOPackageVersion"; Value = "${OOOPACKAGEVERSION}"; End - -// Basis layer: gid_Profile_Version_Ini_Basis - -ProfileItem gid_Basis_Profileitem_Bundled_Buildid - ProfileID = gid_Profile_Bundled_Ini_Basis; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Key = "buildid"; - Value = "<buildid>"; -End 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/ ) { |