diff options
| author | Jordan Ayers <jordan.ayers@gmail.com> | 2011-08-13 22:49:11 -0500 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-08-23 11:52:49 +0100 |
| commit | 75953230cc287f24c039e7fc7005229b11addc50 (patch) | |
| tree | 13c0f3eeecc3a537439e4da3be23de37098b171f | |
| parent | d3bf28445af8080b7daace1b536fbc289b175bdd (diff) | |
Clean up globals in make_installer.pl
Reduce scope of $packjobref.
Remove $exithandler and its shutdown check, since no handler was ever assigned.
Remove some unused install::global:: variables.
| -rw-r--r-- | solenv/bin/make_installer.pl | 4 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/exiter.pm | 4 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/globals.pm | 6 |
3 files changed, 2 insertions, 12 deletions
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 561dcef6d16c..bb7c6844e459 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -2282,7 +2282,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) my $ddfdir = installer::systemactions::create_directories("ddf", $languagestringref); - $installer::globals::packjobref = installer::windows::msiglobal::generate_cab_file_list($filesinproductlanguageresolvedarrayref, $installdir, $ddfdir, $allvariableshashref); + my $packjobref = installer::windows::msiglobal::generate_cab_file_list($filesinproductlanguageresolvedarrayref, $installdir, $ddfdir, $allvariableshashref); # Update and patch reasons the pack order needs to be saved installer::windows::msiglobal::save_packorder(); @@ -2307,7 +2307,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) if ( $installer::globals::iswin ) # only possible on a Windows platform { installer::logger::print_message( "... packaging installation set ... \n" ); - installer::windows::msiglobal::execute_packaging($installer::globals::packjobref, $loggingdir, $allvariableshashref); + installer::windows::msiglobal::execute_packaging($packjobref, $loggingdir, $allvariableshashref); if ( $installer::globals::include_cab_in_msi ) { installer::windows::msiglobal::include_cabs_into_msi($installdir); } #################################### diff --git a/solenv/bin/modules/installer/exiter.pm b/solenv/bin/modules/installer/exiter.pm index d5976f428b93..fa9aeb4bf0af 100644 --- a/solenv/bin/modules/installer/exiter.pm +++ b/solenv/bin/modules/installer/exiter.pm @@ -103,10 +103,6 @@ sub exit_program installer::logger::stoptime(); - if (defined($installer::globals::exithandler)) { - &$installer::globals::exithandler; - } - exit(-1); } diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index ace634a3ac5e..eeb3760a7c95 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -104,8 +104,6 @@ BEGIN $ziplistname = ""; $pathfilename = ""; $setupscriptname = ""; - $headerfilename = ""; - $shellscriptsfilename = ""; $product = ""; $languagelist = ""; $added_english = 0; @@ -150,7 +148,6 @@ BEGIN $unpackpath = ""; $idttemplatepath = ""; $idtlanguagepath = ""; - $packjobref = ""; $buildid = "Not set"; $guidcounter = 1000; # for uniqueness of guids $fontsfolder = "FontsFolder"; @@ -221,7 +218,6 @@ BEGIN $makelinuxlinkrpm = 0; $linuxlinkrpmprocess = 0; $add_required_package = ""; - $linuxrespin = 0; @linuxpatchfiles = (); $linuxlibrarybaselevel = "1"; $linuxlibrarypatchlevel = "1.1"; @@ -498,8 +494,6 @@ BEGIN @emptypackages = (); %fontpackageexists = (); - $exithandler = undef; - $plat = $^O; if ( $plat =~ /cygwin/i ) |