123678: Removed ::globals::one_cab_file

3 files changed, 0 insertions, 94 deletions

diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index c5909dbd9fde..31dd1b254295 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -418,7 +418,6 @@ BEGIN
     %usedtreeconditions = ();
     %moduledestination = ();
 
-    $one_cab_file = 0;
     $fix_number_of_cab_files = 1;
     $cabfilecompressionlevel = 2;
     $number_of_cabfiles = 1;    # only for $fix_number_of_cab_files = 1
diff --git a/solenv/bin/modules/installer/windows/media.pm b/solenv/bin/modules/installer/windows/media.pm
index bebacd4916d3..866fe6560bad 100644
--- a/solenv/bin/modules/installer/windows/media.pm
+++ b/solenv/bin/modules/installer/windows/media.pm
@@ -372,36 +372,6 @@ sub create_media_table
             }
         }
     }
-    elsif ( $installer::globals::one_cab_file )
-    {
-        my %media = ();
-        $diskid++;
-
-        my $maximumfile = $#{$filesref};
-
-        $media{'DiskId'} = get_media_diskid($diskid);
-        # $media{'LastSequence'} = ${$filesref}[$maximumfile]->{'sequencenumber'};  # sequence number of the last file
-        $media{'LastSequence'} = $maximumfile + 1; # This works also for unsorted file collector
-        $media{'DiskPrompt'} = get_media_diskprompt();
-        $media{'Cabinet'} = generate_cab_filename($allvariables);
-        $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);
-
-        # Saving the cabinet file name in the file collector
-
-        $media{'Cabinet'} =~ s/^\s*\#//;    # removing leading hash
-
-        for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-        {
-            my $onefile = ${$filesref}[$i];
-            $onefile->{'cabinet'} = $media{'Cabinet'};
-        }
-    }
     else
     {
         installer::exiter::exit_program("ERROR: No cab file specification in globals.pm !", "create_media_table");
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index e6a1d2648eb6..0dc019156293 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -428,69 +428,6 @@ sub generate_cab_file_list
             push(@installer::globals::allddffiles, $ddffilename);
         }
     }
-    elsif (( $installer::globals::one_cab_file ) && ( $installer::globals::updatedatabase ))
-    {
-        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;
-            }
-
-            my $onefile = ${$filesref}[$sequenceorder->{$counter}];
-
-            $cabinetfile = $onefile->{'cabinet'};
-            my $sourcepath =  $onefile->{'sourcepath'};
-            if ( $^O =~ /cygwin/i ) { $sourcepath = $onefile->{'cyg_sourcepath'}; }
-            my $uniquename =  $onefile->{'uniquename'};
-
-            # 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); }
-
-            if ( $counter == 1 ) { write_ddf_file_header(\@ddffile, $cabinetfile, $installdir); }
-
-            my $styles = "";
-            my $doinclude = 1;
-            if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; };
-            if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
-
-            my $ddfline = "\"" . $sourcepath . "\"" . " " . $uniquename . "\n";
-            if ( $doinclude ) { push(@ddffile, $ddfline); }
-
-            $counter++; # increasing the counter
-        }
-
-        # creating the DDF file
-
-        my $ddffilename = $cabinetfile;
-        $ddffilename =~ s/.cab/.ddf/;
-        $ddfdir =~ s/[\/\\]\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 /F " . $ddffilename . "\n";
-        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::one_cab_file )
     {
         my @ddffile = ();