[Libreoffice-commits] .: solenv/bin

[Tim Retout]

 solenv/bin/make_installer.pl                  |    4 ++--
 solenv/bin/modules/installer/simplepackage.pm |    4 ++--
 solenv/bin/modules/installer/strip.pm         |   12 ++++++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 37902bd34f206f3cb25b46c4c83e11fe70e06661
Author: Tim Retout <tim at retout.co.uk>
Date:   Wed Mar 14 22:39:22 2012 +0000

    Use Exporter in installer::strip.

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index e2a94d4..a7d45fd 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -57,7 +57,7 @@ use installer::scpzipfiles;
 use installer::scriptitems;
 use installer::setupscript;
 use installer::simplepackage;
-use installer::strip;
+use installer::strip qw(strip_libraries);
 use installer::substfilenamefiles;
 use installer::systemactions;
 use installer::windows::assembly;
@@ -1256,7 +1256,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
 
             if ( $installer::globals::strip )
             {
-                installer::strip::strip_libraries($filesinpackage, $languagestringref);
+                strip_libraries($filesinpackage, $languagestringref);
             }
 
             ###############################################################
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 8bd8bda..5f477a5 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -33,7 +33,7 @@ use installer::download;
 use installer::exiter;
 use installer::globals;
 use installer::logger;
-use installer::strip;
+use installer::strip qw(strip_libraries);
 use installer::systemactions;
 use installer::worker;
 
@@ -677,7 +677,7 @@ sub create_simple_package
     }
 
     # stripping files ?!
-    if (( $installer::globals::strip ) && ( ! $installer::globals::iswindowsbuild )) { installer::strip::strip_libraries($filesref, $languagestringref); }
+    if (( $installer::globals::strip ) && ( ! $installer::globals::iswindowsbuild )) { strip_libraries($filesref, $languagestringref); }
 
     # copy Files
     installer::logger::print_message( "... copying files ...\n" );
diff --git a/solenv/bin/modules/installer/strip.pm b/solenv/bin/modules/installer/strip.pm
index 7f0a39a..7a36672 100644
--- a/solenv/bin/modules/installer/strip.pm
+++ b/solenv/bin/modules/installer/strip.pm
@@ -30,16 +30,20 @@ package installer::strip;
 use strict;
 use warnings;
 
+use base 'Exporter';
+
 use installer::globals;
 use installer::logger;
 use installer::pathanalyzer;
 use installer::systemactions;
 
+our @EXPORT_OK = qw(strip_libraries);
+
 #####################################################################
 # Checking whether a file has to be stripped
 #####################################################################
 
-sub need_to_strip
+sub _need_to_strip
 {
     my ( $filename ) = @_;
 
@@ -60,7 +64,7 @@ sub need_to_strip
 # Checking whether a file has to be stripped
 #####################################################################
 
-sub do_strip
+sub _do_strip
 {
     my ( $filename ) = @_;
 
@@ -104,7 +108,7 @@ sub strip_libraries
     {
         my $sourcefilename = ${$filelist}[$i]->{'sourcepath'};
 
-        if ( need_to_strip($sourcefilename) )
+        if ( _need_to_strip($sourcefilename) )
         {
             my $shortfilename = $sourcefilename;
             installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$shortfilename);
@@ -132,7 +136,7 @@ sub strip_libraries
 
             # strip file
 
-            do_strip($destfilename);
+            _do_strip($destfilename);
         }
     }
 }