Author: af
Date: Tue Nov 12 12:04:47 2013
New Revision: 1541017
URL: http://svn.apache.org/r1541017
Log:
123678: Removed ::globals::one_cab_file
Modified:
openoffice/trunk/main/solenv/bin/modules/installer/globals.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/modules/installer/globals.pm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/globals.pm?rev=1541017&r1=1541016&r2=1541017&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:04:47 2013
@@ -420,7 +420,6 @@ BEGIN
$one_cab_file = 0;
$fix_number_of_cab_files = 1;
- $cab_file_per_component = 0;
$cabfilecompressionlevel = 2;
$number_of_cabfiles = 1; # only for $fix_number_of_cab_files = 1
$include_cab_in_msi = 0;
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=1541017&r1=1541016&r2=1541017&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:04:47 2013
@@ -304,43 +304,6 @@ sub create_media_table
}
}
- elsif ( $installer::globals::cab_file_per_component )
- {
- for ( my $i = 0; $i <= $#{$filesref}; $i++ )
- {
- my $onefile = ${$filesref}[$i];
- my $nextfile = ${$filesref}[$i+1];
-
- my $filecomponent = "";
- my $nextcomponent = "";
-
- if ( $onefile->{'componentname'} ) { $filecomponent =
$onefile->{'componentname'}; }
- if ( $nextfile->{'componentname'} ) { $nextcomponent =
$nextfile->{'componentname'}; }
-
- if ( $filecomponent eq $nextcomponent )
- {
- next; # nothing to do, this is not
the last file of a component
- }
-
- my %media = ();
- $diskid++;
-
- $media{'DiskId'} = get_media_diskid($diskid);
- $media{'LastSequence'} =
get_media_lastsequence($onefile);
- $media{'DiskPrompt'} = get_media_diskprompt();
- $media{'Cabinet'} = get_media_cabinet($diskid);
- $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);
-
- $media{'Cabinet'} =~ s/^\s*\#//; # removing
leading hash
-
set_cabinetfilename_for_component_in_file_collector($media{'Cabinet'},
$filesref, $filecomponent, $i);
- }
- }
elsif ( $installer::globals::fix_number_of_cab_files )
{
# 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=1541017&r1=1541016&r2=1541017&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:04:47 2013
@@ -259,7 +259,7 @@ sub generate_cab_file_list
push(@installer::globals::allddffiles, $ddffilename);
}
}
- elsif ((( $installer::globals::cab_file_per_component ) || (
$installer::globals::fix_number_of_cab_files )) && (
$installer::globals::updatedatabase ))
+ elsif (( $installer::globals::fix_number_of_cab_files ) && (
$installer::globals::updatedatabase ))
{
my $sequenceorder = get_sequenceorder($filesref);
@@ -352,7 +352,7 @@ sub generate_cab_file_list
push(@installer::globals::allddffiles, $ddffilename);
}
}
- elsif (( $installer::globals::cab_file_per_component ) || (
$installer::globals::fix_number_of_cab_files ))
+ elsif ( $installer::globals::fix_number_of_cab_files )
{
for ( my $i = 0; $i <= $#{$filesref}; $i++ )
{
