[Libreoffice-commits] .: solenv/bin

[Libreoffice Gerrit user]

 solenv/bin/make_installer.pl            |   46 ++++++++++----------------------
 solenv/bin/modules/installer/globals.pm |    3 --
 2 files changed, 15 insertions(+), 34 deletions(-)

New commits:
commit fa98546caa64ff830c5fa91bc603f2685e99c64f
Author: Tim Retout <tim at retout.co.uk>
Date:   Sun Aug 19 13:33:53 2012 +0100

    installer: Some cleanup of packages loop and unused globals.
    
    Change-Id: I219247cacc9924eed33d0aeb85097dbbe73697d0

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 1603c5d..18f3838 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1071,18 +1071,24 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
 
         if (  $installer::globals::issolarisbuild ) { installer::epmfile::read_packagemap($allvariableshashref, $includepatharrayref, $languagesarrayref); }
 
+        ###########################################
+        # Checking epm state
+        ###########################################
+
         my $epmexecutable = "";
-        my $found_epm = 0;
+        if ( $installer::globals::call_epm )
+        {
+            $epmexecutable = installer::epmfile::find_epm_on_system($includepatharrayref);
+            installer::epmfile::set_patch_state($epmexecutable);    # setting $installer::globals::is_special_epm
+        }
 
         # shuffle array to reduce parallel packaging process in pool
         installer::worker::shuffle_array($packages)
             unless $installer::globals::simple;
 
         # iterating over all packages
-        for ( my $k = 0; $k <= $#{$packages}; $k++ )
+        for my $onepackage ( @{$packages} )
         {
-            my $onepackage = ${$packages}[$k];
-
             # checking, if this is a language pack or a project pack.
             # Creating language packs only, if $installer::globals::languagepack is set. Parameter: -languagepack
 
@@ -1123,14 +1129,11 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
             # Debian allows no underline in package name
             if ( $installer::globals::debian ) { $packagename =~ s/_/-/g; }
 
-            # Debian allows no underline in package name
-            if ( $installer::globals::debian ) { $packagename =~ s/_/-/g; }
-
             ####################################################
             # Header for this package into log file
             ####################################################
 
-            installer::logger::include_header_into_logfile("Creating package: $packagename ($k)");
+            installer::logger::include_header_into_logfile("Creating package: $packagename");
 
             ###########################################
             # Root path, can be defined as parameter
@@ -1218,29 +1221,10 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
                 strip_libraries($filesinpackage, $languagestringref);
             }
 
-            ###########################################
-            # Simple installation mechanism
-            ###########################################
-
-            if ( $installer::globals::simple ) { installer::worker::install_simple($onepackagename, $$languagestringref, $dirsinpackage, $filesinpackage, $linksinpackage, $unixlinksinpackage); }
-
-            ###########################################
-            # Checking epm state
-            ###########################################
-
-            if (( $installer::globals::call_epm ) && ( ! $found_epm ))
-            {
-                $epmexecutable = installer::epmfile::find_epm_on_system($includepatharrayref);
-                installer::epmfile::set_patch_state($epmexecutable);    # setting $installer::globals::is_special_epm
-                $found_epm = 1; # searching only once
+            if ( $installer::globals::simple ) {
+                installer::worker::install_simple($onepackagename, $$languagestringref, $dirsinpackage, $filesinpackage, $linksinpackage, $unixlinksinpackage);
             }
-
-            ###########################################
-            # Creating epm list file
-            ###########################################
-
-            if ( ! $installer::globals::simple )
-            {
+            else {
                 # epm list file format:
                 # type mode owner group destination source options
                 # Example for a file: f 755 root sys /usr/bin/foo foo
@@ -1372,7 +1356,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
 
             } # end of "if ( ! $installer::globals::simple )
 
-        }   # end of "for ( my $k = 0; $k <= $#{$packages}; $k++ )"
+        }   # end of "for ( @{$packages} )"
 
         ##############################################################
         # Post epm functionality, after the last package is packed
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index cbfe885..d8afbe1 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -192,9 +192,6 @@ BEGIN
     $packagename = "";
     $packagelist = "";
     $shiptestdirectory = "";
-    @linuxpatchfiles = ();
-    $linuxlibrarybaselevel = "1";
-    $linuxlibrarypatchlevel = "1.1";
     $archiveformat = "";
     $updatelastsequence = 0;
     $updatesequencecounter = 0;