[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

[Andre Fischer]

 solenv/bin/modules/installer/globals.pm           |    1 
 solenv/bin/modules/installer/windows/media.pm     |   37 ----------------------
 solenv/bin/modules/installer/windows/msiglobal.pm |    4 +-
 3 files changed, 2 insertions(+), 40 deletions(-)

New commits:
commit 41e4096dd00c29aff7dbbac2ab0fad38bc3509bc
Author: Andre Fischer <af at apache.org>
Date:   Tue Nov 12 12:04:47 2013 +0000

    123678: Removed ::globals::one_cab_file

diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index f4dcd0f..c5909db 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -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;
diff --git a/solenv/bin/modules/installer/windows/media.pm b/solenv/bin/modules/installer/windows/media.pm
index 0dc57b3..bebacd4 100644
--- a/solenv/bin/modules/installer/windows/media.pm
+++ b/solenv/bin/modules/installer/windows/media.pm
@@ -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
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 2434293..e6a1d26 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -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++ )
         {