Author: af
Date: Tue Nov 12 12:10:27 2013
New Revision: 1541026
URL: http://svn.apache.org/r1541026
Log:
123678: Removed installer::globals::use_packages_for_cabs
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/media.pm
openoffice/trunk/main/solenv/bin/modules/installer/windows/msiglobal.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=1541026&r1=1541025&r2=1541026&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/make_installer.pl (original)
+++ openoffice/trunk/main/solenv/bin/make_installer.pl Tue Nov 12 12:10:27 2013
@@ -2185,7 +2185,6 @@ for ( my $n = 0; $n <= $#installer::glob
$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;
- if ( $installer::globals::use_packages_for_cabs
) {
installer::windows::media::create_media_table($filesinproductlanguageresolvedarrayref,
$newidtdir, $allvariableshashref, $allupdatelastsequences, $allupdatediskids);
}
# copy msi database into installation directory
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=1541026&r1=1541025&r2=1541026&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:10:27 2013
@@ -422,7 +422,6 @@ BEGIN
$cabfilecompressionlevel = 2;
$number_of_cabfiles = 1; # only for $fix_number_of_cab_files = 1
$include_cab_in_msi = 0;
- $use_packages_for_cabs = 0;
$msidatabasename = "";
$prepare_winpatch = 0;
$previous_idt_dir = "";
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=1541026&r1=1541025&r2=1541026&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:10:27 2013
@@ -627,10 +627,6 @@ sub get_sequence_for_file
$installer::globals::newfilesexist = 1;
}
}
- elsif (( $onefile->{'assignedsequencenumber'} ) && (
$installer::globals::use_packages_for_cabs ))
- {
- $sequence = $onefile->{'assignedsequencenumber'};
- }
else
{
$sequence = $number;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/media.pm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/media.pm?rev=1541026&r1=1541025&r2=1541026&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/media.pm
(original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/media.pm Tue Nov
12 12:10:27 2013
@@ -243,68 +243,7 @@ sub create_media_table
if ( $allvariables->{'INCLUDE_CAB_IN_MSI'} ) {
$installer::globals::include_cab_in_msi = 1; }
- if ( $installer::globals::use_packages_for_cabs )
- {
- my $cabfile;
- foreach $cabfile ( sort keys %installer::globals::lastsequence )
- {
- my %media = ();
- $diskid++;
-
- $media{'DiskId'} = get_media_diskid($diskid);
- $media{'LastSequence'} = get_last_sequence($cabfile,
$alludpatelastsequences);
- $media{'DiskPrompt'} = get_media_diskprompt();
- $media{'Cabinet'} = get_cabfilename($cabfile);
- $media{'VolumeLabel'} = get_media_volumelabel();
- $media{'Source'} = get_media_source();
-
- my $oneline = $media{'DiskId'} . "\t" .
$media{'LastSequence'} . "\t" . $media{'DiskPrompt'} . "\t"
- . $media{'Cabinet'} . "\t" .
$media{'VolumeLabel'} . "\t" . $media{'Source'} . "\n";
-
- push(@mediatable, $oneline);
-
- # Comparing the disk id with the disk id from update
database. Both have to be identical. New files have to be added
- # to the new pff cabinet file. And existing cab files
must not be removed.
- if ( $installer::globals::updatedatabase )
- {
- # Comparing lines in new media table with line
from media table in udpate database.
- if (
exists($allupdatediskids->{$media{'Cabinet'}}) )
- {
- if ( $media{'DiskId'} !=
$allupdatediskids->{$media{'Cabinet'}} )
- {
-
installer::exiter::exit_program("ERROR: Different DiskIDs for cab file
\"$media{'Cabinet'}\".\nCurrent installation set: \"$media{'DiskId'}\", but
update database used \"$allupdatediskids->{$media{'Cabinet'}}\".\nWere cabinet
files removed or added?", "create_media_table");
- }
- }
- else
- {
- $installer::logger::Lang->printf(
- "Warning: Could not find cabinet file \"%s}\" in
update database. This seems to be an new cabinet file!?\n",
- $media{'Cabinet'});
- }
- }
- }
-
- # one new cabinet file for all files added after the final
release
- if (( $installer::globals::updatedatabase ) && (
$installer::globals::pfffileexists ))
- {
- my %media = ();
- $diskid++;
-
- $media{'DiskId'} = get_media_diskid($diskid) +
$installer::globals::mergemodulenumber; # Adding mergemodulenumber, because
this files are included later
- $media{'LastSequence'} =
$installer::globals::updatesequencecounter;
- $media{'DiskPrompt'} = get_media_diskprompt();
- $media{'Cabinet'} =
get_cabfilename($installer::globals::pffcabfilename);
- $media{'VolumeLabel'} = get_media_volumelabel();
- $media{'Source'} = get_media_source();
-
- my $oneline = $media{'DiskId'} . "\t" .
$media{'LastSequence'} . "\t" . $media{'DiskPrompt'} . "\t"
- . $media{'Cabinet'} . "\t" .
$media{'VolumeLabel'} . "\t" . $media{'Source'} . "\n";
-
- push(@mediatable, $oneline);
- }
-
- }
- elsif ( $installer::globals::fix_number_of_cab_files )
+ if ( $installer::globals::fix_number_of_cab_files )
{
# number of cabfiles
my $maxcabfilenumber = $installer::globals::number_of_cabfiles;
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=1541026&r1=1541025&r2=1541026&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:10:27 2013
@@ -166,100 +166,7 @@ sub generate_cab_file_list
if ( $^O =~ /cygwin/i ) {
installer::worker::generate_cygwin_pathes($filesref); }
- if ( $installer::globals::use_packages_for_cabs )
- {
- my $sequenceorder = get_sequenceorder($filesref);
-
- my $counter = 1;
- my $currentcabfile = "";
-
- while ( ( exists($sequenceorder->{$counter}) ) || (
exists($installer::globals::allmergemodulefilesequences{$counter}) ) ) # Taking
care of files from merge modules
- {
- 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;
- }
-
- # Files with increasing sequencerorder are included in
one cab file
- my $onefile = ${$filesref}[$sequenceorder->{$counter}];
- my $cabinetfile = $onefile->{'assignedcabinetfile'};
- my $sourcepath = $onefile->{'sourcepath'};
- if ( $^O =~ /cygwin/i ) { $sourcepath =
$onefile->{'cyg_sourcepath'}; }
- my $uniquename = $onefile->{'uniquename'};
-
- my $styles = "";
- my $doinclude = 1;
- if ( $onefile->{'Styles'} ) { $styles =
$onefile->{'Styles'}; };
- if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
-
- # to avoid lines with more than 256 characters, it can
be useful to use relative pathes
- if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) {
$sourcepath = make_relative_ddf_path($sourcepath); }
-
- # all files with the same cabinetfile have increasing
sequencenumbers
-
- my @ddffile = ();
-
- write_ddf_file_header(\@ddffile, $cabinetfile,
$installdir);
-
- my $ddfline = "\"" . $sourcepath . "\"" . " " .
$uniquename . "\n";
- if ( $doinclude ) { push(@ddffile, $ddfline); }
-
- $counter++; # increasing the counter
- my $nextfile = "";
- my $nextcabinetfile = "";
- if ( exists($sequenceorder->{$counter}) ) { $nextfile =
${$filesref}[$sequenceorder->{$counter}]; }
- if ( $nextfile->{'assignedcabinetfile'} ) {
$nextcabinetfile = $nextfile->{'assignedcabinetfile'}; }
-
- while ( $nextcabinetfile eq $cabinetfile )
- {
- $sourcepath = $nextfile->{'sourcepath'};
- if ( $^O =~ /cygwin/i ) { $sourcepath =
$nextfile->{'cyg_sourcepath'}; }
- # to avoid lines with more than 256 characters,
it can be useful to use relative pathes
- if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'}
) { $sourcepath = make_relative_ddf_path($sourcepath); }
- $uniquename = $nextfile->{'uniquename'};
- my $localdoinclude = 1;
- my $nextfilestyles = "";
- if ( $nextfile->{'Styles'} ) { $nextfilestyles
= $nextfile->{'Styles'}; }
- if ( $nextfilestyles =~ /\bDONT_PACK\b/ ) {
$localdoinclude = 0; }
- $ddfline = "\"" . $sourcepath . "\"" . " " .
$uniquename . "\n";
- if ( $localdoinclude ) { push(@ddffile,
$ddfline); }
-
- $counter++; # increasing the counter!
- $nextcabinetfile = "_lastfile_";
- if ( exists($sequenceorder->{$counter}) )
- {
- $nextfile =
${$filesref}[$sequenceorder->{$counter}];
- $nextcabinetfile =
$nextfile->{'assignedcabinetfile'};
- }
- }
-
- # creating the DDF file
-
- my $ddffilename = $cabinetfile;
- $ddffilename =~ s/.cab/.ddf/;
- $ddfdir =~ s/\Q$installer::globals::separator\E\s*$//;
- $ddffilename = $ddfdir . $installer::globals::separator
. $ddffilename;
-
- installer::files::save_file($ddffilename ,\@ddffile);
- my $infoline = "Created ddf file: $ddffilename\n";
- $installer::logger::Lang->print($infoline);
-
- # lines in ddf files must not be longer than 256
characters
- check_ddf_file(\@ddffile, $ddffilename);
-
- # Writing the makecab system call
-
- my $oneline = "makecab.exe /V3 /F " . $ddffilename . "
2\>\&1 |" . "\n";
-
- push(@cabfilelist, $oneline);
-
- # collecting all ddf files
- push(@installer::globals::allddffiles, $ddffilename);
- }
- }
- elsif (( $installer::globals::fix_number_of_cab_files ) && (
$installer::globals::updatedatabase ))
+ if (( $installer::globals::fix_number_of_cab_files ) && (
$installer::globals::updatedatabase ))
{
my $sequenceorder = get_sequenceorder($filesref);
