Kaydet (Commit) 37902bd3 authored tarafından Tim Retout's avatar Tim Retout

Use Exporter in installer::strip.

üst 36c26581
...@@ -57,7 +57,7 @@ use installer::scpzipfiles; ...@@ -57,7 +57,7 @@ use installer::scpzipfiles;
use installer::scriptitems; use installer::scriptitems;
use installer::setupscript; use installer::setupscript;
use installer::simplepackage; use installer::simplepackage;
use installer::strip; use installer::strip qw(strip_libraries);
use installer::substfilenamefiles; use installer::substfilenamefiles;
use installer::systemactions; use installer::systemactions;
use installer::windows::assembly; use installer::windows::assembly;
...@@ -1256,7 +1256,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) ...@@ -1256,7 +1256,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
if ( $installer::globals::strip ) if ( $installer::globals::strip )
{ {
installer::strip::strip_libraries($filesinpackage, $languagestringref); strip_libraries($filesinpackage, $languagestringref);
} }
############################################################### ###############################################################
......
...@@ -33,7 +33,7 @@ use installer::download; ...@@ -33,7 +33,7 @@ use installer::download;
use installer::exiter; use installer::exiter;
use installer::globals; use installer::globals;
use installer::logger; use installer::logger;
use installer::strip; use installer::strip qw(strip_libraries);
use installer::systemactions; use installer::systemactions;
use installer::worker; use installer::worker;
...@@ -677,7 +677,7 @@ sub create_simple_package ...@@ -677,7 +677,7 @@ sub create_simple_package
} }
# stripping files ?! # 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 # copy Files
installer::logger::print_message( "... copying files ...\n" ); installer::logger::print_message( "... copying files ...\n" );
......
...@@ -30,16 +30,20 @@ package installer::strip; ...@@ -30,16 +30,20 @@ package installer::strip;
use strict; use strict;
use warnings; use warnings;
use base 'Exporter';
use installer::globals; use installer::globals;
use installer::logger; use installer::logger;
use installer::pathanalyzer; use installer::pathanalyzer;
use installer::systemactions; use installer::systemactions;
our @EXPORT_OK = qw(strip_libraries);
##################################################################### #####################################################################
# Checking whether a file has to be stripped # Checking whether a file has to be stripped
##################################################################### #####################################################################
sub need_to_strip sub _need_to_strip
{ {
my ( $filename ) = @_; my ( $filename ) = @_;
...@@ -60,7 +64,7 @@ sub need_to_strip ...@@ -60,7 +64,7 @@ sub need_to_strip
# Checking whether a file has to be stripped # Checking whether a file has to be stripped
##################################################################### #####################################################################
sub do_strip sub _do_strip
{ {
my ( $filename ) = @_; my ( $filename ) = @_;
...@@ -104,7 +108,7 @@ sub strip_libraries ...@@ -104,7 +108,7 @@ sub strip_libraries
{ {
my $sourcefilename = ${$filelist}[$i]->{'sourcepath'}; my $sourcefilename = ${$filelist}[$i]->{'sourcepath'};
if ( need_to_strip($sourcefilename) ) if ( _need_to_strip($sourcefilename) )
{ {
my $shortfilename = $sourcefilename; my $shortfilename = $sourcefilename;
installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$shortfilename); installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$shortfilename);
...@@ -132,7 +136,7 @@ sub strip_libraries ...@@ -132,7 +136,7 @@ sub strip_libraries
# strip file # strip file
do_strip($destfilename); _do_strip($destfilename);
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment