From e8883cd38996181390f19d1f3885e3bef5210d59 Mon Sep 17 00:00:00 2001 From: sb Date: Tue, 29 Jun 2010 16:39:39 +0200 Subject: [PATCH 01/19] jl154: #i112789# call SourceConfig->new() so that it always works --- solenv/bin/subsequenttests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 solenv/bin/subsequenttests diff --git a/solenv/bin/subsequenttests b/solenv/bin/subsequenttests old mode 100755 new mode 100644 index 34e6b8034c70..3caa84293f3e --- a/solenv/bin/subsequenttests +++ b/solenv/bin/subsequenttests @@ -47,7 +47,7 @@ while (@ARGV) { } my @testpaths = (); -my $sc = SourceConfig->new(); +my $sc = SourceConfig->new($ENV{'SOLARSRC'}); my $module; foreach $module ($sc->get_active_modules()) { my $buildlst = $sc->get_module_build_list($module); From 46d6b860e537ba02a9d1374ab28096d4e7c70eb3 Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Mon, 12 Jul 2010 11:04:05 +0200 Subject: [PATCH 02/19] jl154 #162868# unopkg is back in packaging and installation --- solenv/bin/modules/installer/simplepackage.pm | 134 +++++++----------- 1 file changed, 55 insertions(+), 79 deletions(-) diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index fdf9fc6fa4c3..09d4f9781e3f 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -82,10 +82,9 @@ sub get_extensions_dir sub register_extensions { - my ($officedir, $languagestringref) = @_; + my ($officedir, $languagestringref, $presetsdir) = @_; my $programdir = $officedir . $installer::globals::separator; - # if ( $installer::globals::sundirhostname ne "" ) { $programdir = $programdir . $installer::globals::sundirhostname . $installer::globals::separator; } if ( $installer::globals::officedirhostname ne "" ) { $programdir = $programdir . $installer::globals::officedirhostname . $installer::globals::separator; } $programdir = $programdir . "program"; @@ -94,9 +93,6 @@ sub register_extensions my $infoline = ""; - # my $unopkgfile = $officedir . $installer::globals::separator . "program" . - # $installer::globals::separator . $installer::globals::unopkgfile; - my $unopkgfile = $installer::globals::unopkgfile; my $unopkgexists = 1; @@ -107,87 +103,64 @@ sub register_extensions push( @installer::globals::logfileinfo, $infoline); } - # my $extensiondir = $officedir . $installer::globals::separator . "share" . - # $installer::globals::separator . "extension" . - # $installer::globals::separator . "install"; - - my $extensiondir = ".." . $installer::globals::separator . "share" . $installer::globals::separator . "extension" . $installer::globals::separator . "install"; - - my $allextensions = installer::systemactions::find_file_with_file_extension("oxt", $extensiondir); - - if (( $#{$allextensions} > -1 ) && ( $unopkgexists )) + if ( $unopkgexists ) { my $currentdir = cwd(); print "... current dir: $currentdir ...\n"; $infoline = "Current dir: $currentdir\n"; push( @installer::globals::logfileinfo, $infoline); - for ( my $i = 0; $i <= $#{$allextensions}; $i++ ) + if ( ! -f $unopkgfile ) { installer::exiter::exit_program("ERROR: $unopkgfile not found!", "register_extensions"); } + + my $localtemppath = installer::systemactions::create_directories("uno", $languagestringref); + + if ( $installer::globals::iswindowsbuild ) { - my $oneextension = $extensiondir . $installer::globals::separator . ${$allextensions}[$i]; - - # my $systemcall = $unopkgfile . " add --shared --suppress-license " . "\"" . $oneextension . "\""; - - if ( ! -f $unopkgfile ) { installer::exiter::exit_program("ERROR: $unopkgfile not found!", "register_extensions"); } - if ( ! -f $oneextension ) { installer::exiter::exit_program("ERROR: $oneextension not found!", "register_extensions"); } - - my $localtemppath = installer::systemactions::create_directories("uno", $languagestringref); - - if ( $installer::globals::iswindowsbuild ) + if ( $^O =~ /cygwin/i ) { - if ( $^O =~ /cygwin/i ) - { - $localtemppath = $installer::globals::cyg_temppath; - } - else - { - $windowsslash = "\/"; - } - $localtemppath =~ s/\\/\//g; - $localtemppath = "/".$localtemppath; - } - my $systemcall = $unopkgfile . " add --shared --suppress-license --verbose " . $oneextension . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |"; - - print "... $systemcall ...\n"; - - $infoline = "Systemcall: $systemcall\n"; - push( @installer::globals::logfileinfo, $infoline); - - my @unopkgoutput = (); - - open (UNOPKG, $systemcall); - while () - { - my $lastline = $_; - push(@unopkgoutput, $lastline); - } - close (UNOPKG); - - my $returnvalue = $?; # $? contains the return value of the systemcall - - if ($returnvalue) - { - # Writing content of @unopkgoutput only in the error case into the log file. Sometimes it - # contains strings like "Error" even in the case of success. This causes a packaging error - # when the log file is analyzed at the end, even if there is no real error. - for ( my $j = 0; $j <= $#unopkgoutput; $j++ ) { push( @installer::globals::logfileinfo, "$unopkgoutput[$j]"); } - - $infoline = "ERROR: Could not execute \"$systemcall\"!\nExitcode: '$returnvalue'\n"; - push( @installer::globals::logfileinfo, $infoline); - installer::exiter::exit_program("ERROR: $systemcall failed!", "register_extensions"); + $localtemppath = $installer::globals::cyg_temppath; } else { - $infoline = "Success: Executed \"$systemcall\" successfully!\n"; - push( @installer::globals::logfileinfo, $infoline); + $windowsslash = "\/"; } + $localtemppath =~ s/\\/\//g; + $localtemppath = "/".$localtemppath; } - } - else - { - if ( ! ( $#{$allextensions} > -1 )) + + my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=file://" . $presetsdir . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |"; + + print "... $systemcall ...\n"; + + $infoline = "Systemcall: $systemcall\n"; + push( @installer::globals::logfileinfo, $infoline); + + my @unopkgoutput = (); + + open (UNOPKG, $systemcall); + while () { - $infoline = "No extensions located in directory $extensiondir.\n"; + my $lastline = $_; + push(@unopkgoutput, $lastline); + } + close (UNOPKG); + + my $returnvalue = $?; # $? contains the return value of the systemcall + + if ($returnvalue) + { + # Writing content of @unopkgoutput only in the error case into the log file. Sometimes it + # contains strings like "Error" even in the case of success. This causes a packaging error + # when the log file is analyzed at the end, even if there is no real error. + for ( my $j = 0; $j <= $#unopkgoutput; $j++ ) { push( @installer::globals::logfileinfo, "$unopkgoutput[$j]"); } + + $infoline = "ERROR: Could not execute \"$systemcall\"!\nExitcode: '$returnvalue'\n"; + push( @installer::globals::logfileinfo, $infoline); + installer::exiter::exit_program("ERROR: $systemcall failed!", "register_extensions"); + } + else + { + $infoline = "Success: Executed \"$systemcall\" successfully!\n"; push( @installer::globals::logfileinfo, $infoline); } } @@ -655,6 +628,8 @@ sub create_simple_package installer::logger::print_message( "... creating directories ...\n" ); installer::logger::include_header_into_logfile("Creating directories:"); + my $presetsdir = ""; + for ( my $i = 0; $i <= $#{$dirsref}; $i++ ) { my $onedir = ${$dirsref}[$i]; @@ -662,6 +637,8 @@ sub create_simple_package if ( $onedir->{'HostName'} ) { my $destdir = $subfolderdir . $installer::globals::separator . $onedir->{'HostName'}; + if ( $destdir =~ /\Wpresets\s*$/ ) { $presetsdir = $destdir; } + if ( ! -d $destdir ) { if ( $^O =~ /cygwin/i ) # Cygwin performance check @@ -787,19 +764,18 @@ sub create_simple_package system($localcall); } - # Registering the extensions - - # installer::logger::print_message( "... registering extensions ...\n" ); - # installer::logger::include_header_into_logfile("Registering extensions:"); - # register_extensions($subfolderdir, $languagestringref); - installer::logger::print_message( "... removing superfluous directories ...\n" ); installer::logger::include_header_into_logfile("Removing superfluous directories:"); my $extensionfolder = get_extensions_dir($subfolderdir); - installer::systemactions::remove_empty_dirs_in_folder($extensionfolder); + # Registering the extensions + + installer::logger::print_message( "... registering extensions ...\n" ); + installer::logger::include_header_into_logfile("Registering extensions:"); + register_extensions($subfolderdir, $languagestringref, $presetsdir); + if ( $installer::globals::compiler =~ /^unxmacx/ ) { installer::worker::put_scpactions_into_installset("$installdir/$packagename"); From 034fc5820ef2e9394fc07bcd0e262af699c6cbb4 Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Mon, 12 Jul 2010 13:26:09 +0200 Subject: [PATCH 03/19] jl154 #162868# unopkg is back in packaging and installation --- scp2/source/ooo/directory_ooo.scp | 6 ++++++ scp2/source/ooo/profile_ooo.scp | 7 +++++++ scp2/source/ooo/profileitem_ooo.scp | 9 +++++++++ solenv/bin/modules/installer/simplepackage.pm | 10 +++++----- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index cc805f9e8288..87fa78ff13a9 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -179,6 +179,12 @@ 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 a2491045caf9..53cea799dc6f 100644 --- a/scp2/source/ooo/profile_ooo.scp +++ b/scp2/source/ooo/profile_ooo.scp @@ -45,6 +45,13 @@ 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 9818d5b26749..d7f069e4793a 100644 --- a/scp2/source/ooo/profileitem_ooo.scp +++ b/scp2/source/ooo/profileitem_ooo.scp @@ -462,3 +462,12 @@ ProfileItem gid_Basis_Profileitem_Version_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 = ""; +End diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 09d4f9781e3f..4db664fbce62 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -82,7 +82,7 @@ sub get_extensions_dir sub register_extensions { - my ($officedir, $languagestringref, $presetsdir) = @_; + my ($officedir, $languagestringref, $bundleddir) = @_; my $programdir = $officedir . $installer::globals::separator; if ( $installer::globals::officedirhostname ne "" ) { $programdir = $programdir . $installer::globals::officedirhostname . $installer::globals::separator; } @@ -128,7 +128,7 @@ sub register_extensions $localtemppath = "/".$localtemppath; } - my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=file://" . $presetsdir . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |"; + my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $bundleddir . "\"" . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |"; print "... $systemcall ...\n"; @@ -628,7 +628,7 @@ sub create_simple_package installer::logger::print_message( "... creating directories ...\n" ); installer::logger::include_header_into_logfile("Creating directories:"); - my $presetsdir = ""; + my $bundleddir = ""; for ( my $i = 0; $i <= $#{$dirsref}; $i++ ) { @@ -637,7 +637,7 @@ sub create_simple_package if ( $onedir->{'HostName'} ) { my $destdir = $subfolderdir . $installer::globals::separator . $onedir->{'HostName'}; - if ( $destdir =~ /\Wpresets\s*$/ ) { $presetsdir = $destdir; } + if ( $destdir =~ /\Wbundled\s*$/ ) { $bundleddir = $destdir; } if ( ! -d $destdir ) { @@ -774,7 +774,7 @@ sub create_simple_package installer::logger::print_message( "... registering extensions ...\n" ); installer::logger::include_header_into_logfile("Registering extensions:"); - register_extensions($subfolderdir, $languagestringref, $presetsdir); + register_extensions($subfolderdir, $languagestringref, $bundleddir); if ( $installer::globals::compiler =~ /^unxmacx/ ) { From 6efd2ceb1d4eb10d139dbc5128ab5042283fe56d Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Mon, 12 Jul 2010 15:22:50 +0200 Subject: [PATCH 04/19] jl154 #162868# unopkg is back in packaging and installation --- solenv/bin/modules/installer/simplepackage.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 4db664fbce62..f8ef517577ff 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -119,6 +119,8 @@ sub register_extensions if ( $^O =~ /cygwin/i ) { $localtemppath = $installer::globals::cyg_temppath; + $bundleddir = qx{cygpath -m "$bundleddir"}; + chomp($bundleddir); } else { From ce95b85ffe0fa3faa0e6402195877c5cd623877b Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Mon, 12 Jul 2010 16:20:39 +0200 Subject: [PATCH 05/19] jl154 #162868# unopkg is back in packaging and installation --- solenv/bin/modules/installer/simplepackage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index f8ef517577ff..dae7c95b8834 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -130,7 +130,7 @@ sub register_extensions $localtemppath = "/".$localtemppath; } - my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $bundleddir . "\"" . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |"; + my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file:///" . $bundleddir . "\"" . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |"; print "... $systemcall ...\n"; From 7e0f1587c19c29fe6aa0b83a08e6515e65d050e7 Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Mon, 12 Jul 2010 18:02:39 +0200 Subject: [PATCH 06/19] jl154 #162868# unopkg is back in packaging and installation --- solenv/bin/modules/installer/simplepackage.pm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index dae7c95b8834..423d0b74eb4c 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -114,6 +114,8 @@ sub register_extensions my $localtemppath = installer::systemactions::create_directories("uno", $languagestringref); + my $slash = ""; + if ( $installer::globals::iswindowsbuild ) { if ( $^O =~ /cygwin/i ) @@ -122,15 +124,11 @@ sub register_extensions $bundleddir = qx{cygpath -m "$bundleddir"}; chomp($bundleddir); } - else - { - $windowsslash = "\/"; - } $localtemppath =~ s/\\/\//g; - $localtemppath = "/".$localtemppath; + $slash = "/"; # Third slash for Windows. Other OS pathes already start with "/" } - my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file:///" . $bundleddir . "\"" . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |"; + my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $slash . $bundleddir . "\"" . " -env:UserInstallation=file://" . $slash . $localtemppath . " 2\>\&1 |"; print "... $systemcall ...\n"; From 3ae43d50ee799f77f992ae14394e45c95de042aa Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Mon, 12 Jul 2010 18:24:42 +0200 Subject: [PATCH 07/19] jl154 #162868# unopkg is back in packaging and installation --- scp2/source/ooo/windowscustomaction_ooo.scp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index 568b3996a8b7..f3f9306bf42f 100755 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -199,6 +199,16 @@ WindowsCustomAction gid_Customaction_Shellextensionsdll7 Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "InstallValidate"); End +WindowsCustomAction gid_Customaction_Register_Extensions + Name = "RegisterExtensions"; + Typ = "65"; + Source = "shlxtmsi.dll"; + Target = "RegisterExtensions"; + Inbinarytable = 1; + Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end"); + Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "end"); +End + WindowsCustomAction gid_Customaction_Set_Admininstall Name = "SetAdminInstallProperty"; Typ = "65"; @@ -287,6 +297,16 @@ WindowsCustomAction gid_Customaction_Patch_InstallExchangeFiles Assignment2 = ("AdminExecuteSequence", "", "behind_InstallFinalize"); End +WindowsCustomAction gid_Customaction_Langpack_Register_Extensions + Name = "RegisterExtensions"; + Typ = "65"; + Source = "lngpckinsthlp.dll"; + Target = "RegisterExtensions"; + Inbinarytable = 1; + Assignment1 = ("InstallExecuteSequence", "", "end"); + Assignment2 = ("AdminExecuteSequence", "", "end"); +End + WindowsCustomAction gid_Customaction_Patch_SetFeatureState Name = "SetFeatureState"; Typ = "65"; From bde51d314523b7b9f4934c21a9d4f4612a57b36e Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Tue, 13 Jul 2010 18:57:19 +0200 Subject: [PATCH 08/19] jl154 #162868# unopkg is back in packaging and installation --- solenv/bin/modules/installer/epmfile.pm | 48 +++++-------------- solenv/bin/modules/installer/simplepackage.pm | 11 ++++- 2 files changed, 21 insertions(+), 38 deletions(-) diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index 136eca913dd9..3fd7316c63db 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -762,32 +762,12 @@ sub replace_many_variables_in_shellscripts foreach $key (keys %{$variableshashref}) { my $value = $variableshashref->{$key}; - if ( ! $value =~ /.oxt/ ) { $value = lc($value); } # lowercase ! - if ( $installer::globals::issolarisbuild) { $value =~ s/\.org/org/g; } # openofficeorg instead of openoffice.org + # $value = lc($value); # lowercase ! + # if ( $installer::globals::issolarisbuild) { $value =~ s/\.org/org/g; } # openofficeorg instead of openoffice.org replace_variable_in_shellscripts($scriptref, $value, $key); } } -####################################### -# Setting oxt file name variable -####################################### - -sub set_oxt_filename -{ - my ($filesinpackage, $allvariables) = @_; - - for ( my $i = 0; $i <= $#{$filesinpackage}; $i++ ) - { - my $onefile = ${$filesinpackage}[$i]; - if ( $onefile->{'Name'} =~ /.oxt\s*$/ ) - { - $allvariables->{'OXTFILENAME'} = $onefile->{'Name'}; - # $allvariables->{'FULLOXTFILENAME'} = $onefile->{'destination'}; - last; # only one oxt file for each rpm! - } - } -} - ####################################### # Adding shell scripts to epm file ####################################### @@ -796,9 +776,6 @@ sub adding_shellscripts_to_epm_file { my ($epmfileref, $shellscriptsfilename, $localrootpath, $allvariableshashref, $filesinpackage) = @_; - # Setting variable for ${OXTFILENAME} into $allvariableshashref, if this is a RPM with an extension - set_oxt_filename($filesinpackage, $allvariableshashref); - # $installer::globals::shellscriptsfilename push( @{$epmfileref}, "\n\n" ); @@ -1803,26 +1780,27 @@ sub is_extension_package # share/extension/install ###################################################################### -sub get_extension_name +sub contains_extension_dir { my ($prototypefile) = @_; - my $extensionName = ""; + my $contains_extension_dir = 0; + + # d none opt/openoffice.org3/share/extensions/ for ( my $i = 0; $i <= $#{$prototypefile}; $i++ ) { my $line = ${$prototypefile}[$i]; - if ( $line =~ /^\s*f\s+none\s+share\/extension\/install\/(\w+?\.oxt)\s*\=/ ) + if ( $line =~ /^\s*d\s+none\s.*\/share\/extensions\// ) { - $extensionName = $1; + $contains_extension_dir = 1; last; } } - return $extensionName; + return $contains_extension_dir; } - ############################################################ # A Solaris patch contains 7 specific scripts ############################################################ @@ -1839,9 +1817,9 @@ sub add_scripts_into_prototypefile $path = $path . $installer::globals::separator; my @newlines = (); - my $extensionname = get_extension_name($prototypefile); + my $is_extension_package = contains_extension_dir($prototypefile); - if ( $extensionname ne "" ) + if ( $is_extension_package ) { for ( my $i = 0; $i <= $#installer::globals::solarispatchscriptsforextensions; $i++ ) { @@ -1865,9 +1843,7 @@ sub add_scripts_into_prototypefile my $scriptfile = installer::files::read_file($sourcefilename); # Replacing variables - my $oldstring = "\$\{OXTFILENAME\}"; - replace_variables_in_shellscripts_for_patch($scriptfile, $destpath, $oldstring, $extensionname); - $oldstring = "PRODUCTDIRECTORYNAME"; + my $oldstring = "PRODUCTDIRECTORYNAME"; replace_variables_in_shellscripts_for_patch($scriptfile, $destpath, $oldstring, $staticpath); # Saving file diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 423d0b74eb4c..3ad13edd61ff 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -84,6 +84,15 @@ sub register_extensions { my ($officedir, $languagestringref, $bundleddir) = @_; + my $infoline = ""; + + if ( $bundleddir eq "" ) + { + $infoline = "ERROR: Failed to determine directory \"bundled\" in \"presets\" folder for extension registration! Please check your installation set.\n"; + push( @installer::globals::logfileinfo, $infoline); + installer::exiter::exit_program($infoline, "register_extensions"); + } + my $programdir = $officedir . $installer::globals::separator; if ( $installer::globals::officedirhostname ne "" ) { $programdir = $programdir . $installer::globals::officedirhostname . $installer::globals::separator; } $programdir = $programdir . "program"; @@ -91,8 +100,6 @@ sub register_extensions my $from = cwd(); chdir($programdir); - my $infoline = ""; - my $unopkgfile = $installer::globals::unopkgfile; my $unopkgexists = 1; From a8d677dd6fe5b382821f97a1fd80ce61431febbf Mon Sep 17 00:00:00 2001 From: Joachim Lingner Date: Wed, 14 Jul 2010 09:23:58 +0200 Subject: [PATCH 09/19] jl154 #162868# windows custom action for running unopkg sync --- scp2/source/ooo/windowscustomaction_ooo.scp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index f3f9306bf42f..6ae56be39e5f 100755 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -209,6 +209,15 @@ WindowsCustomAction gid_Customaction_Register_Extensions Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "end"); End +WindowsCustomAction gid_Customaction_Remove_Extensions + Name = "RemoveExtensions"; + Typ = "65"; + Source = "shlxtmsi.dll"; + Target = "RemoveExtensions"; + Inbinarytable = 1; + Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\"", "end"); +End + WindowsCustomAction gid_Customaction_Set_Admininstall Name = "SetAdminInstallProperty"; Typ = "65"; From 3f887a20ce7ffc16c4b4f5be8707e9c5dd0d9eae Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Wed, 14 Jul 2010 16:41:49 +0200 Subject: [PATCH 10/19] jl154 #162868# unopkg is back in packaging and installation --- scp2/source/ooo/windowscustomaction_ooo.scp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index 6ae56be39e5f..bcb0d1e7f730 100755 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -215,7 +215,7 @@ WindowsCustomAction gid_Customaction_Remove_Extensions Source = "shlxtmsi.dll"; Target = "RemoveExtensions"; Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\"", "end"); + Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\"", "FileCost"); End WindowsCustomAction gid_Customaction_Set_Admininstall From d19c292e4ca16ef708d89747ff52e32ceccf7f1c Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Wed, 14 Jul 2010 17:37:41 +0200 Subject: [PATCH 11/19] jl154 #162868# unopkg is back in packaging and installation --- scp2/source/ooo/windowscustomaction_ooo.scp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index bcb0d1e7f730..1a6e242122a3 100755 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -215,7 +215,7 @@ WindowsCustomAction gid_Customaction_Remove_Extensions Source = "shlxtmsi.dll"; Target = "RemoveExtensions"; Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\"", "FileCost"); + Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "FileCost"); End WindowsCustomAction gid_Customaction_Set_Admininstall From 26cf6bd0bec3945ab900de92f961150cbf371ed3 Mon Sep 17 00:00:00 2001 From: Joachim Lingner Date: Thu, 15 Jul 2010 16:28:33 +0200 Subject: [PATCH 12/19] jl154 #162868# remove basis/presets/bundled/bundled.ini, and create always share/extensions folder --- scp2/source/ooo/common_brand.scp | 1 + scp2/source/ooo/directory_ooo.scp | 6 ------ scp2/source/ooo/profile_ooo.scp | 7 ------- scp2/source/ooo/profileitem_ooo.scp | 10 ---------- 4 files changed, 1 insertion(+), 23 deletions(-) diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index f505a886cba8..52c89ef14464 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -219,6 +219,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 = ""; -End From 0db2d911659eed658bdc163731be27ac29e8767a Mon Sep 17 00:00:00 2001 From: Joachim Lingner Date: Thu, 15 Jul 2010 16:48:34 +0200 Subject: [PATCH 13/19] jl154 #162868# remove basis/presets/bundled/bundled.ini, and create always share/extensions folder --- scp2/source/ooo/common_brand.scp | 2 +- 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/ ) { From 1ac38be8276f89bc84493be939a6cab1b15e6712 Mon Sep 17 00:00:00 2001 From: Joachim Lingner Date: Thu, 15 Jul 2010 17:22:01 +0200 Subject: [PATCH 14/19] jl154 #162868# remove basis/presets/bundled/bundled.ini, and create always share/extensions folder --- scp2/source/ooo/common_brand.scp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 6f0384a11e12..c44427399dae 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, @@ -97,7 +98,8 @@ Module gid_Module_Root_Brand gid_Brand_File_Share_Xdg_Printeradmin, gid_Brand_File_Share_Xdg_QStart, gid_Brand_File_Share_Xdg_StartCenter, - gid_Brand_File_Share_Xdg_Writer); + gid_Brand_File_Share_Xdg_Writer, + gid_Brand_File_Txt_Package); Unixlinks = (gid_Brand_Unixlink_BasisLink, gid_Brand_Unixlink_Program, gid_Brand_Unixlink_Unopkg, @@ -219,7 +221,6 @@ End Directory gid_Brand_Dir_Share_Extensions ParentID = gid_Brand_Dir_Share; DosName = "extensions"; - Styles = (CREATE); End Directory gid_Brand_Dir_Share_Extensions_Install @@ -645,6 +646,13 @@ File gid_Brand_File_Images_Brand_Zip Styles = (PACKED); End +File gid_Brand_File_Txt_Package + TXT_FILE_BODY; + Dir = gid_Brand_Dir_Share_Extensions; + Name = "package.txt"; + Styles = (PACKED); +End + File gid_Brand_File_Share_Registry_Brand_Xcd TXT_FILE_BODY; Styles = (PACKED, SCPZIP_REPLACE); From 1726180adb1cf08a15fdb1ce0c145267b8ba2470 Mon Sep 17 00:00:00 2001 From: Joachim Lingner Date: Fri, 16 Jul 2010 11:52:44 +0200 Subject: [PATCH 15/19] jl154 #162868# removing the package.txt from the extensions folder. Extensions folder will be created in a different way than installing a dummy file --- scp2/source/ooo/common_brand.scp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index c44427399dae..b1f39c23c31b 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -98,8 +98,7 @@ Module gid_Module_Root_Brand gid_Brand_File_Share_Xdg_Printeradmin, gid_Brand_File_Share_Xdg_QStart, gid_Brand_File_Share_Xdg_StartCenter, - gid_Brand_File_Share_Xdg_Writer, - gid_Brand_File_Txt_Package); + gid_Brand_File_Share_Xdg_Writer); Unixlinks = (gid_Brand_Unixlink_BasisLink, gid_Brand_Unixlink_Program, gid_Brand_Unixlink_Unopkg, @@ -221,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 @@ -646,13 +646,6 @@ File gid_Brand_File_Images_Brand_Zip Styles = (PACKED); End -File gid_Brand_File_Txt_Package - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Share_Extensions; - Name = "package.txt"; - Styles = (PACKED); -End - File gid_Brand_File_Share_Registry_Brand_Xcd TXT_FILE_BODY; Styles = (PACKED, SCPZIP_REPLACE); From 5471fc66cda16551c245bc99219675fffecbb5d7 Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Mon, 19 Jul 2010 14:23:27 +0200 Subject: [PATCH 16/19] jl154 #162868# guarantee existence of extensions folder --- scp2/source/ooo/common_brand.scp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index b1f39c23c31b..c44427399dae 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -98,7 +98,8 @@ Module gid_Module_Root_Brand gid_Brand_File_Share_Xdg_Printeradmin, gid_Brand_File_Share_Xdg_QStart, gid_Brand_File_Share_Xdg_StartCenter, - gid_Brand_File_Share_Xdg_Writer); + gid_Brand_File_Share_Xdg_Writer, + gid_Brand_File_Txt_Package); Unixlinks = (gid_Brand_Unixlink_BasisLink, gid_Brand_Unixlink_Program, gid_Brand_Unixlink_Unopkg, @@ -220,7 +221,6 @@ End Directory gid_Brand_Dir_Share_Extensions ParentID = gid_Brand_Dir_Share; DosName = "extensions"; - Styles = (CREATE); End Directory gid_Brand_Dir_Share_Extensions_Install @@ -646,6 +646,13 @@ File gid_Brand_File_Images_Brand_Zip Styles = (PACKED); End +File gid_Brand_File_Txt_Package + TXT_FILE_BODY; + Dir = gid_Brand_Dir_Share_Extensions; + Name = "package.txt"; + Styles = (PACKED); +End + File gid_Brand_File_Share_Registry_Brand_Xcd TXT_FILE_BODY; Styles = (PACKED, SCPZIP_REPLACE); From 756cb84194cbddd57d14d564ebecd8a229bb10a1 Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Wed, 21 Jul 2010 12:04:31 +0200 Subject: [PATCH 17/19] jl154 #162868# new share/prereg folder --- scp2/source/ooo/common_brand.scp | 7 +++++ solenv/bin/modules/installer/simplepackage.pm | 27 +++++++++---------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index c44427399dae..5ed8c9739f9c 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -44,6 +44,7 @@ Module gid_Module_Root_Brand gid_Brand_Dir_Share_Config, gid_Brand_Dir_Share_Extension, gid_Brand_Dir_Share_Extensions, + gid_Brand_Dir_Share_Prereg, gid_Brand_Dir_Share_Uno_Packages, gid_Brand_Dir_Share_Uno_Packages_Cache, gid_Brand_Dir_Share_Registry, @@ -223,6 +224,12 @@ Directory gid_Brand_Dir_Share_Extensions DosName = "extensions"; End +Directory gid_Brand_Dir_Share_Prereg + ParentID = gid_Brand_Dir_Share; + DosName = "prereg"; + Styles = (CREATE); +End + Directory gid_Brand_Dir_Share_Extensions_Install ParentID = gid_Brand_Dir_Share_Extension; DosName = "install"; diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 9eb8522ebfd6..5cbd10832eaf 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -71,9 +71,10 @@ sub get_extensions_dir my $extensiondir = $subfolderdir . $installer::globals::separator; if ( $installer::globals::officedirhostname ne "" ) { $extensiondir = $extensiondir . $installer::globals::officedirhostname . $installer::globals::separator; } - $extensiondir = $extensiondir . "share" . $installer::globals::separator . "extensions"; + my $extensionsdir = $extensiondir . "share" . $installer::globals::separator . "extensions"; + my $preregdir = $extensiondir . "share" . $installer::globals::separator . "prereg"; - return $extensiondir; + return ( $extensionsdir, $preregdir ); } #################################################### @@ -82,13 +83,13 @@ sub get_extensions_dir sub register_extensions { - my ($officedir, $languagestringref, $presetsdir) = @_; + my ($officedir, $languagestringref, $preregdir) = @_; my $infoline = ""; - if ( $presetsdir eq "" ) + if ( $preregdir eq "" ) { - $infoline = "ERROR: Failed to determine directory \"presets\" for extension registration! Please check your installation set.\n"; + $infoline = "ERROR: Failed to determine directory \"prereg\" for extension registration! Please check your installation set.\n"; push( @installer::globals::logfileinfo, $infoline); installer::exiter::exit_program($infoline, "register_extensions"); } @@ -128,17 +129,16 @@ sub register_extensions if ( $^O =~ /cygwin/i ) { $localtemppath = $installer::globals::cyg_temppath; - $presetsdir = qx{cygpath -m "$presetsdir"}; - chomp($presetsdir); + $preregdir = qx{cygpath -m "$preregdir"}; + chomp($preregdir); } $localtemppath =~ s/\\/\//g; $slash = "/"; # Third slash for Windows. Other OS pathes already start with "/" } - $presetsdir =~ s/\/\s*$//g; - my $bundleddir = $presetsdir . "/bundled"; + $preregdir =~ s/\/\s*$//g; - my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $slash . $bundleddir . "\"" . " -env:UserInstallation=file://" . $slash . $localtemppath . " 2\>\&1 |"; + my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $slash . $preregdir . "\"" . " -env:UserInstallation=file://" . $slash . $localtemppath . " 2\>\&1 |"; print "... $systemcall ...\n"; @@ -638,8 +638,6 @@ sub create_simple_package installer::logger::print_message( "... creating directories ...\n" ); installer::logger::include_header_into_logfile("Creating directories:"); - my $presetsdir = ""; - for ( my $i = 0; $i <= $#{$dirsref}; $i++ ) { my $onedir = ${$dirsref}[$i]; @@ -647,7 +645,6 @@ sub create_simple_package if ( $onedir->{'HostName'} ) { my $destdir = $subfolderdir . $installer::globals::separator . $onedir->{'HostName'}; - if ( $destdir =~ /\Wpresets\s*$/ ) { $presetsdir = $destdir; } if ( ! -d $destdir ) { @@ -777,14 +774,14 @@ sub create_simple_package installer::logger::print_message( "... removing superfluous directories ...\n" ); installer::logger::include_header_into_logfile("Removing superfluous directories:"); - my $extensionfolder = get_extensions_dir($subfolderdir); + my ( $extensionfolder, $preregdir ) = get_extensions_dir($subfolderdir); installer::systemactions::remove_empty_dirs_in_folder($extensionfolder); # Registering the extensions installer::logger::print_message( "... registering extensions ...\n" ); installer::logger::include_header_into_logfile("Registering extensions:"); - register_extensions($subfolderdir, $languagestringref, $presetsdir); + register_extensions($subfolderdir, $languagestringref, $preregdir); if ( $installer::globals::compiler =~ /^unxmacx/ ) { From 1745fd6f2bb0f1501df821725d5f4d95bde7b5e5 Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Fri, 23 Jul 2010 10:37:24 +0200 Subject: [PATCH 18/19] jl154 #162868# bundled folder in prereg folder --- solenv/bin/modules/installer/simplepackage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 5cbd10832eaf..6b168febf6f1 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -72,7 +72,7 @@ sub get_extensions_dir my $extensiondir = $subfolderdir . $installer::globals::separator; if ( $installer::globals::officedirhostname ne "" ) { $extensiondir = $extensiondir . $installer::globals::officedirhostname . $installer::globals::separator; } my $extensionsdir = $extensiondir . "share" . $installer::globals::separator . "extensions"; - my $preregdir = $extensiondir . "share" . $installer::globals::separator . "prereg"; + my $preregdir = $extensiondir . "share" . $installer::globals::separator . "prereg" . $installer::globals::separator . "bundled"; return ( $extensionsdir, $preregdir ); } From ed6c3b782dab52934568a00974a5d1045a9d3e98 Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Wed, 28 Jul 2010 17:03:11 +0200 Subject: [PATCH 19/19] jl154 #162868# no registration of extensions in products without unopkg file --- solenv/bin/modules/installer/simplepackage.pm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 6b168febf6f1..518edc683c3d 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -111,6 +111,13 @@ sub register_extensions push( @installer::globals::logfileinfo, $infoline); } + if ( ! -f $unopkgfile ) + { + $unopkgexists = 0; + $infoline = "Info: File $unopkgfile does not exist! Extensions cannot be registered.\n"; + push( @installer::globals::logfileinfo, $infoline); + } + if ( $unopkgexists ) { my $currentdir = cwd();