Author: af
Date: Tue Nov 12 12:17:16 2013
New Revision: 1541031
URL: http://svn.apache.org/r1541031
Log:
123634: Removed unused support for merge modules from make_installer.pl and
modules.
Removed:
openoffice/trunk/main/scp2/source/ooo/mergemodules_ooo.scp
openoffice/trunk/main/solenv/bin/modules/installer/windows/mergemodule.pm
Modified:
openoffice/trunk/main/solenv/bin/make_installer.pl
openoffice/trunk/main/solenv/bin/modules/installer/globals.pm
openoffice/trunk/main/solenv/bin/modules/installer/windows/file.pm
openoffice/trunk/main/solenv/bin/modules/installer/windows/msiglobal.pm
openoffice/trunk/main/solenv/bin/modules/installer/windows/update.pm
openoffice/trunk/main/solenv/bin/modules/par2script/globals.pm
openoffice/trunk/main/solenv/bin/modules/pre2par/globals.pm
Modified: openoffice/trunk/main/solenv/bin/make_installer.pl
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/make_installer.pl?rev=1541031&r1=1541030&r2=1541031&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/make_installer.pl (original)
+++ openoffice/trunk/main/solenv/bin/make_installer.pl Tue Nov 12 12:17:16 2013
@@ -74,7 +74,6 @@ use installer::windows::idtglobal;
use installer::windows::inifile;
use installer::windows::java;
use installer::windows::media;
-use installer::windows::mergemodule;
use installer::windows::msiglobal;
use installer::windows::msp;
use installer::windows::patch;
@@ -524,7 +523,6 @@ my $folderinproductarrayref;
my $folderitemsinproductarrayref;
my $registryitemsinproductarrayref;
my $windowscustomactionsarrayref;
-my $mergemodulesarrayref;
if ( $installer::globals::iswindowsbuild ) # Windows specific items:
Folder, FolderItem, RegistryItem, WindowsCustomAction
{
@@ -556,11 +554,6 @@ if ( $installer::globals::iswindowsbuild
$windowscustomactionsarrayref =
installer::setupscript::get_all_items_from_script($setupscriptref,
"WindowsCustomAction");
if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir .
"windowscustomactions1.log", $windowscustomactionsarrayref); }
-
- $installer::logger::Info->print( "... analyzing Windows merge modules
... \n" );
-
- $mergemodulesarrayref =
installer::setupscript::get_all_items_from_script($setupscriptref,
"MergeModule");
- if ( $installer::globals::globallogging ) {
installer::files::save_array_of_hashes($loggingdir . "mergemodules1.log",
$mergemodulesarrayref); }
}
my $modulesinproductarrayref;
@@ -737,7 +730,6 @@ for ( my $n = 0; $n <= $#installer::glob
if ( $installer::globals::updatedatabase )
{
($uniquefilename, $revuniquefilename,
$revshortfilename, $allupdatesequences, $allupdatecomponents,
$allupdatefileorder, $allupdatecomponentorder, $shortdirname, $componentid,
$componentidkeypath, $alloldproperties, $allupdatelastsequences,
$allupdatediskids) =
installer::windows::update::create_database_hashes($refdatabase);
- if ( $mergemodulesarrayref > -1 ) {
installer::windows::update::readmergedatabase($mergemodulesarrayref,
$languagestringref, $includepatharrayref); }
}
}
}
@@ -2181,11 +2173,6 @@ for ( my $n = 0; $n <= $#installer::glob
installer::windows::msiglobal::write_summary_into_msi_database($msifilename,
$onelanguage, $languagefile, $allvariableshashref);
- # if there are Merge Modules, they have to be
integrated now
- $filesinproductlanguageresolvedarrayref =
installer::windows::mergemodule::merge_mergemodules_into_msi_database($mergemodulesarrayref,
$filesinproductlanguageresolvedarrayref, $msifilename, $languagestringref,
$onelanguage, $languagefile, $allvariableshashref, $includepatharrayref,
$allupdatesequences, $allupdatelastsequences, $allupdatediskids);
- if (( $installer::globals::globallogging ) &&
($installer::globals::globalloggingform21)) {
installer::files::save_array_of_hashes($loggingdir . "productfiles21_" .
$onelanguage . ".log", $filesinproductlanguageresolvedarrayref); }
- $installer::globals::globalloggingform21 = 0;
-
# copy msi database into installation directory
my $msidestfilename = $installdir .
$installer::globals::separator . $msidatabasename;
@@ -2226,10 +2213,6 @@ for ( my $n = 0; $n <= $#installer::glob
installer::windows::msiglobal::copy_windows_installer_files_into_installset($installdir,
$includepatharrayref, $allvariableshashref);
- # ... copying MergeModules into installation set
-
- if ( ! $installer::globals::fix_number_of_cab_files ) {
installer::windows::msiglobal::copy_merge_modules_into_installset($installdir);
}
-
# ... copying the child projects
if ($installer::globals::addchildprojects)
Modified: openoffice/trunk/main/solenv/bin/modules/installer/globals.pm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/globals.pm?rev=1541031&r1=1541030&r2=1541031&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/globals.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/globals.pm Tue Nov 12
12:17:16 2013
@@ -232,18 +232,14 @@ BEGIN
$updatedatabasepath = "";
$pfffileexists = 0;
$pffcabfilename = "ooobasis3.0_pff.cab";
- $mergemodulenumber = 0;
- %allmergemodulefilesequences = ();
%newupdatefiles = ();
%allusedupdatesequences = ();
- %mergemodulefiles = ();
$mergefiles_added_into_collector = 0;
$creating_windows_installer_patch = 0;
$strip = 1;
$globallogging = 0;
- $globalloggingform21 = 1;
$logfilename = "logfile.log"; # the default logfile name for global
errors
# @logfileinfo = ();
# @errorlogfileinfo = ();
@@ -292,7 +288,6 @@ BEGIN
$pwfile = "";
$pfxfile = "";
- %mergemodules = ();
%merge_media_line = ();
%merge_allfeature_hash = ();
%merge_alldirectory_hash = ();
@@ -448,7 +443,6 @@ BEGIN
$postprocess_specialepm = 0;
$postprocess_standardepm = 0;
- $mergemodules_analyzed = 0;
$starttime = "";
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/file.pm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/file.pm?rev=1541031&r1=1541030&r2=1541031&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/file.pm
(original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/file.pm Tue Nov
12 12:17:16 2013
@@ -707,7 +707,6 @@ sub check_file_sequences
my $infoline = "";
my @missing_sequences = ();
- my @really_missing_sequences = ();
for ( my $i = 1; $i <= $installer::globals::updatelastsequence; $i++ )
{
@@ -716,29 +715,12 @@ sub check_file_sequences
if ( $#missing_sequences > -1 )
{
- # Missing sequences can also be caused by files included in
merge modules. This files are added later into the file table.
- # Therefore now it is time to check the content of the merge
modules.
-
+ my $errorstring = "";
for ( my $j = 0; $j <= $#missing_sequences; $j++ )
{
my $filename =
$allupdatefileorderhashref->{$missing_sequences[$j]};
-
- # Is this a file from a merge module? Then this is no
error.
- if ( !
exists($installer::globals::mergemodulefiles{$filename}) )
- {
- push(@really_missing_sequences,
$missing_sequences[$j]);
- }
- }
- }
-
- if ( $#really_missing_sequences > -1 )
- {
- my $errorstring = "";
- for ( my $j = 0; $j <= $#really_missing_sequences; $j++ )
- {
- my $filename =
$allupdatefileorderhashref->{$really_missing_sequences[$j]};
- my $comp =
$allupdatecomponentorderhashref->{$really_missing_sequences[$j]};
- $errorstring = "$errorstring$filename (Sequence:
$really_missing_sequences[$j], Component: \"$comp\")\n";
+ my $comp =
$allupdatecomponentorderhashref->{$missing_sequences[$j]};
+ $errorstring = "$errorstring$filename (Sequence:
$missing_sequences[$j], Component: \"$comp\")\n";
}
$infoline = "ERROR: Files are removed compared with update
database.\nThe following files are missing:\n$errorstring";
Modified:
openoffice/trunk/main/solenv/bin/modules/installer/windows/msiglobal.pm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/msiglobal.pm?rev=1541031&r1=1541030&r2=1541031&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/msiglobal.pm
(original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/msiglobal.pm Tue
Nov 12 12:17:16 2013
@@ -173,15 +173,8 @@ sub generate_cab_file_list
my $counter = 1;
my $currentcabfile = "";
- while ( ( exists($sequenceorder->{$counter}) ) || (
exists($installer::globals::allmergemodulefilesequences{$counter}) ) ) # Taking
care of files from merge modules
+ while ( exists($sequenceorder->{$counter}) )
{
-# if (
exists($installer::globals::allmergemodulefilesequences{$counter}) )
-# {
-# # Skipping this sequence, it is not included in
$filesref, because it is assigned to a file from a merge module.\n";
-# $counter++;
-# next;
-# }
-
my $onefile = ${$filesref}[$sequenceorder->{$counter}];
$counter++;
@@ -1249,28 +1242,6 @@ sub copy_windows_installer_files_into_in
}
#################################################################
-# Copying MergeModules for the Windows installer into the
-# installation set. The list of MergeModules is located
-# in %installer::globals::copy_msm_files
-#################################################################
-
-sub copy_merge_modules_into_installset
-{
- my ($installdir) = @_;
-
- installer::logger::include_header_into_logfile("Copying Merge files
into installation set");
-
- my $cabfile;
- foreach $cabfile ( keys %installer::globals::copy_msm_files )
- {
- my $sourcefile = $installer::globals::copy_msm_files{$cabfile};
- my $destfile = $installdir . $installer::globals::separator .
$cabfile;
-
- installer::systemactions::copy_one_file($sourcefile, $destfile);
- }
-}
-
-#################################################################
# Copying the child projects into the
# installation set
#################################################################
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/update.pm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/update.pm?rev=1541031&r1=1541030&r2=1541031&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/update.pm
(original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/update.pm Tue
Nov 12 12:17:16 2013
@@ -407,61 +407,6 @@ sub readdatabase
return $database;
}
-#################################################################################
-# Files can be included in merge modules. This is also important for update.
-#################################################################################
-
-sub readmergedatabase
-{
- my ( $mergemodules, $languagestringref, $includepatharrayref ) = @_;
-
- $installer::logger::Lang->add_timestamp("Performance Info:
readmergedatabase start");
-
- my $mergemoduledir =
installer::systemactions::create_directories("mergedatabase",
$languagestringref);
-
- my %allmergefiles = ();
-
- $installer::globals::mergemodulenumber = $#{$mergemodules} + 1;
-
- foreach my $mergemodule ( @{$mergemodules} )
- {
- my $filename = $mergemodule->{'Name'};
- my $mergefile =
installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename,
$includepatharrayref, 1);
-
- if ( $$mergefile eq "" ) {
installer::exiter::exit_program("ERROR: msm file not found: $filename !",
"readmergedatabase"); }
- my $completesource = $$mergefile;
-
- my $mergegid = $mergemodule->{'gid'};
- my $workdir = $mergemoduledir . $installer::globals::separator
. $mergegid;
- if ( ! -d $workdir ) {
installer::systemactions::create_directory($workdir); }
-
- my $completedest = $workdir . $installer::globals::separator .
$filename;
- installer::systemactions::copy_one_file($completesource,
$completedest);
- if ( ! -f $completedest ) {
installer::exiter::exit_program("ERROR: msm file not found: $completedest !",
"readmergedatabase"); }
-
- # extract all tables from database
- extract_all_tables_from_msidatabase($completedest, $workdir);
-
- # read all tables
- my $onemergefile = read_all_tables_from_msidatabase($workdir);
-
- $allmergefiles{$mergegid} = $onemergefile;
- }
-
- foreach my $mergefilegid ( keys %allmergefiles )
- {
- my $onemergefile = $allmergefiles{$mergefilegid};
- my $filetable = $onemergefile->{'File'};
-
- foreach my $linenumber ( keys %{$filetable} )
- {
- # Collecting all files from merge modules in global hash
-
$installer::globals::mergemodulefiles{$filetable->{$linenumber}->{'File'}} = 1;
- }
- }
-
- $installer::logger::Lang->add_timestamp("Performance Info:
readmergedatabase end");
-}
#################################################################################
# Creating several useful hashes from old database
Modified: openoffice/trunk/main/solenv/bin/modules/par2script/globals.pm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/par2script/globals.pm?rev=1541031&r1=1541030&r2=1541031&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/par2script/globals.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/par2script/globals.pm Tue Nov 12
12:17:16 2013
@@ -39,8 +39,7 @@ BEGIN
@allitems = ("Installation", "ScpAction", "Directory", "File",
"Shortcut", "Unixlink", "Module", "Profile",
"ProfileItem",
- "Folder", "FolderItem", "RegistryItem",
"WindowsCustomAction",
- "MergeModule");
+ "Folder", "FolderItem", "RegistryItem",
"WindowsCustomAction");
@items_assigned_at_modules = ("File", "Directory", "Unixlink");
@items_with_directories = ("File", "Profile", "Shortcut", "Unixlink");
Modified: openoffice/trunk/main/solenv/bin/modules/pre2par/globals.pm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/pre2par/globals.pm?rev=1541031&r1=1541030&r2=1541031&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/pre2par/globals.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/pre2par/globals.pm Tue Nov 12
12:17:16 2013
@@ -38,8 +38,7 @@ BEGIN
@allitems = ("Installation", "ScpAction", "HelpText", "Directory",
"DataCarrier", "StarRegistry", "File",
"Shortcut", "Custom", "Unixlink", "Procedure",
"Module", "Profile", "ProfileItem",
- "Folder", "FolderItem", "RegistryItem",
"StarRegistryItem", "WindowsCustomAction",
- "MergeModule");
+ "Folder", "FolderItem", "RegistryItem",
"StarRegistryItem", "WindowsCustomAction");
$logging = 0;
$logfilename = "logfile.log"; # the default logfile name for global
errors
