[Libreoffice-commits] .: solenv/bin
Michael Meeks
michael at kemper.freedesktop.org
Sat Feb 18 06:39:41 PST 2012
solenv/bin/make_installer.pl | 29 ----------
solenv/bin/modules/installer/archivefiles.pm | 2
solenv/bin/modules/installer/exiter.pm | 4 -
solenv/bin/modules/installer/files.pm | 16 -----
solenv/bin/modules/installer/globals.pm | 3 -
solenv/bin/modules/installer/logger.pm | 27 ---------
solenv/bin/modules/installer/parameter.pm | 19 ------
solenv/bin/modules/installer/scriptitems.pm | 74 ---------------------------
8 files changed, 174 deletions(-)
New commits:
commit 97862219d6985611b2491ffa8df1d5fed499d115
Author: Tim Retout <tim at retout.co.uk>
Date: Sat Feb 18 13:28:08 2012 +0000
Remove installer debug logging.
The -debug option to make_installer.pl is not usually called; it logs
function calls at various points during the installer. However, it is
not used consistently within the code, and the same information can be
obtained via the Perl debugger or profiling tools.
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index a823306..23fea7a 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -120,10 +120,6 @@ installer::environment::set_global_environment_variables($environmentvariablesha
installer::parameter::saveparameter();
installer::parameter::getparameter();
-# debugging can start after function "getparameter"
-if ( $installer::globals::debug ) { installer::logger::debuginfo("\nPart 1: The platform independent part\n"); }
-if ( $installer::globals::debug ) { installer::logger::debuginfo("\nPart 1a: The language independent part\n"); }
-
installer::parameter::control_fundamental_parameter();
installer::parameter::setglobalvariables();
installer::parameter::control_required_parameter();
@@ -594,11 +590,6 @@ if (!($installer::globals::is_copy_only_project))
if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productdirectories2aa.log", $dirsinproductarrayref); }
}
-if ( $installer::globals::debug ) { installer::logger::debuginfo("\nEnd of part 1a: The language independent part\n"); }
-
-# saving debug info, before staring part 1b
-if ( $installer::globals::debug ) { installer::logger::savedebug($installer::globals::exitlog); }
-
#################################################
# Part 1b: The language dependent part
# (still platform independent)
@@ -612,8 +603,6 @@ if ( $installer::globals::debug ) { installer::logger::savedebug($installer::glo
# The for iterates over all products, separated by an # in the language list
###############################################################################
-if ( $installer::globals::debug ) { installer::logger::debuginfo("\nPart 1b: The language dependent part\n"); }
-
for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
{
my $languagesarrayref = installer::languages::get_all_languages_for_one_product($installer::globals::languageproducts[$n], $allvariableshashref);
@@ -1217,23 +1206,14 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
installer::packagelist::log_packages_content($packages);
installer::packagelist::create_module_destination_hash($packages, $allvariableshashref);
- if ( $installer::globals::debug ) { installer::logger::debuginfo("\nEnd of part 1b: The language dependent part\n"); }
-
- # saving debug info, before starting part 2
- if ( $installer::globals::debug ) { installer::logger::savedebug($installer::globals::exitlog); }
-
#################################################
# Part 2: The platform dependent part
#################################################
- if ( $installer::globals::debug ) { installer::logger::debuginfo("\nPart 2: The platform dependent part\n"); }
-
#################################################
# Part 2a: All non-Windows platforms
#################################################
- if ( $installer::globals::debug ) { installer::logger::debuginfo("\nPart 2a: All non-Windows platforms\n"); }
-
#########################################################
# ... creating epm list file ...
# Only for non-Windows platforms
@@ -1767,14 +1747,10 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
}
} # end of "if (!( $installer::globals::iswindowsbuild ))"
- if ( $installer::globals::debug ) { installer::logger::debuginfo("\nEnd of part 2a: All non-Windows platforms\n"); }
-
#################################################
# Part 2b: The Windows platform
#################################################
- if ( $installer::globals::debug ) { installer::logger::debuginfo("\nPart 2b: The Windows platform\n"); }
-
#####################################################################
# ... creating idt files ...
# Only for Windows builds ($installer::globals::compiler is wntmsci)
@@ -2221,17 +2197,12 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
} # end of "if ( $installer::globals::iswindowsbuild )"
- if ( $installer::globals::debug ) { installer::logger::debuginfo("\nEnd of part 2b: The Windows platform\n"); }
-
# saving file_info file for later analysis
my $speciallogfilename = "fileinfo_" . $installer::globals::product . "\.log";
installer::files::save_array_of_hashes($loggingdir . $speciallogfilename, $filesinproductlanguageresolvedarrayref);
} # end of iteration for one language group
-# saving debug info at end
-if ( $installer::globals::debug ) { installer::logger::savedebug($installer::globals::exitlog); }
-
#######################################################
# Stopping time
#######################################################
diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm
index 8d682e4..0d75b67 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -148,8 +148,6 @@ sub resolving_archive_flag
{
my ($filesarrayref, $additionalpathsref, $languagestringref, $loggingdir) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::archivefiles::resolving_archive_flag : $#{$filesarrayref} : $#{$additionalpathsref} : $$languagestringref : $loggingdir"); }
-
my @newallfilesarray = ();
my ($systemcall, $returnvalue, $infoline);
diff --git a/solenv/bin/modules/installer/exiter.pm b/solenv/bin/modules/installer/exiter.pm
index 243bef4..55a1dbb 100644
--- a/solenv/bin/modules/installer/exiter.pm
+++ b/solenv/bin/modules/installer/exiter.pm
@@ -100,10 +100,6 @@ sub exit_program
print "\n";
close(LOG);
- # Saving the debug info
-
- if ( $installer::globals::debug ) { installer::logger::savedebug($installer::globals::exitlog); }
-
installer::logger::stoptime();
exit(-1);
diff --git a/solenv/bin/modules/installer/files.pm b/solenv/bin/modules/installer/files.pm
index 379144e..cd2350d 100644
--- a/solenv/bin/modules/installer/files.pm
+++ b/solenv/bin/modules/installer/files.pm
@@ -41,8 +41,6 @@ sub check_file
{
my ($arg) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::files::check_file : $arg"); }
-
if(!( -f $arg ))
{
installer::exiter::exit_program("ERROR: Cannot find file $arg", "check_file");
@@ -54,8 +52,6 @@ sub read_file
my ($localfile) = @_;
my @localfile = ();
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::files::read_file : $localfile"); }
-
open( IN, "<$localfile" ) || installer::exiter::exit_program("ERROR: Cannot open file $localfile for reading", "read_file");
# Don't use "my @localfile = <IN>" here, because
@@ -78,8 +74,6 @@ sub save_file
{
my ($savefile, $savecontent) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::files::save_file : $savefile : $#{$savecontent}"); }
-
if ( open( OUT, ">$savefile" ) )
{
print OUT @{$savecontent};
@@ -105,8 +99,6 @@ sub save_hash
{
my ($savefile, $hashref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::files::save_hash : $savefile"); }
-
my @printcontent = ();
my $itemkey;
@@ -128,8 +120,6 @@ sub save_array_of_hashes
{
my ($savefile, $arrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::files::save_array_of_hashes : $savefile : $#{$arrayref}"); }
-
my @printcontent = ();
for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
@@ -158,8 +148,6 @@ sub save_array_of_hashes_modules
{
my ($savefile, $arrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::files::save_array_of_hashes : $savefile : $#{$arrayref}"); }
-
my @printcontent = ();
for ( my $i = 0; $i <= $#{$arrayref}; $i++ )
@@ -192,8 +180,6 @@ sub read_binary_file
{
my ($filename) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::files::read_binary_file : $filename"); }
-
my $file;
open( IN, "<$filename" ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "read_binary_file");
@@ -211,8 +197,6 @@ sub save_binary_file
{
my ($file, $filename) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::files::save_binary_file : $filename"); }
-
open( OUT, ">$filename" ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for writing", "save_binary_file");
binmode OUT;
print OUT $file;
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index f066c34..c1d814e 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -253,10 +253,7 @@ BEGIN
$followme_from_directory = 0;
$internal_cabinet_signing = 0;
- $debug = 0;
- $debugfilename = "debug.txt";
$checksumfilename = "checksum.txt";
- @functioncalls = ();
$ismultilingual = 0;
@multilanguagemodules = ();
diff --git a/solenv/bin/modules/installer/logger.pm b/solenv/bin/modules/installer/logger.pm
index dba0ea0..7191539 100644
--- a/solenv/bin/modules/installer/logger.pm
+++ b/solenv/bin/modules/installer/logger.pm
@@ -41,8 +41,6 @@ our @EXPORT_OK = qw(
log_hashref
globallog
copy_globalinfo_into_logfile
- debuginfo
- savedebug
starttime
stoptime
print_message
@@ -154,31 +152,6 @@ sub copy_globalinfo_into_logfile
}
###############################################################
-# For each product (new language) a new log file is created.
-# Therefore the global logging has to be saved in this file.
-###############################################################
-
-sub debuginfo
-{
- my ( $message ) = @_;
-
- $message = $message . "\n";
- push(@installer::globals::functioncalls, $message);
-}
-
-###############################################################
-# Saving the debug information.
-###############################################################
-
-sub savedebug
-{
- my ( $outputdir ) = @_;
-
- installer::files::save_file($outputdir . $installer::globals::debugfilename, \@installer::globals::functioncalls);
- print_message( "... writing debug file " . $outputdir . $installer::globals::debugfilename . "\n" );
-}
-
-###############################################################
# Starting the time
###############################################################
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index c5c7836..3ea13f8 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -41,8 +41,6 @@ use installer::systemactions;
sub usage
{
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::parameter::usage"); }
-
print <<Ende;
--------------------------------------------------------------------------------
$installer::globals::prog
@@ -74,7 +72,6 @@ The following parameter are needed:
-patchinc: Source for the patch include files (Solaris only)
-dontstrip: No file stripping (Unix only)
-log : Logging all available information (optional)
--debug : Collecting debug information
Examples for Windows:
@@ -98,8 +95,6 @@ Ende
sub saveparameter
{
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::parameter::saveparameter"); }
-
my $include = "";
installer::logger::globallog("Command line arguments:");
@@ -123,8 +118,6 @@ sub saveparameter
sub getparameter
{
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::parameter::getparameter"); }
-
while ( $#ARGV >= 0 )
{
my $param = shift(@ARGV);
@@ -142,7 +135,6 @@ sub getparameter
elsif ($param eq "-log") { $installer::globals::globallogging = 1; }
elsif ($param eq "-quiet") { $installer::globals::quiet = 1; }
elsif ($param eq "-verbose") { $installer::globals::quiet = 0; }
- elsif ($param eq "-debug") { $installer::globals::debug = 1; }
elsif ($param eq "-tab") { $installer::globals::tab = 1; }
elsif ($param eq "-u") { $installer::globals::unpackpath = shift(@ARGV); }
elsif ($param eq "-i") { $installer::globals::rootpath = shift(@ARGV); }
@@ -195,8 +187,6 @@ sub getparameter
sub control_fundamental_parameter
{
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::parameter::control_fundamental_parameter"); }
-
if ($installer::globals::product eq "")
{
installer::logger::print_error( "Product name not set!" );
@@ -214,8 +204,6 @@ sub make_path_absolute
{
my ($pathref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::parameter::make_path_absolute : $$pathref"); }
-
if ( $installer::globals::isunix )
{
if (!($$pathref =~ /^\s*\//)) # this is a relative unix path
@@ -266,8 +254,6 @@ sub make_path_absolute
sub setglobalvariables
{
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::parameter::setglobalvariables"); }
-
# Setting the installertype directory corresponding to the environment variable PKGFORMAT
# The global variable $installer::globals::packageformat can only contain one package format.
# If PKGFORMAT cotains more than one format (for example "rpm deb") this is splitted in the
@@ -462,8 +448,6 @@ sub setglobalvariables
sub control_required_parameter
{
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::parameter::control_required_parameter"); }
-
if (!($installer::globals::is_copy_only_project))
{
##############################################################################################
@@ -574,8 +558,6 @@ sub control_required_parameter
sub outputparameter
{
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::parameter::outputparameter"); }
-
my $element;
my @output = ();
@@ -613,7 +595,6 @@ sub outputparameter
if ((!($installer::globals::javalanguagepath eq "")) && ($installer::globals::iswindowsbuild)) { push(@output, "Java language path will be ignored for Windows builds!\n"); }
if ( $installer::globals::patchincludepath ) { push(@output, "Patch include path: $installer::globals::patchincludepath\n"); }
if ( $installer::globals::globallogging ) { push(@output, "Complete logging activated\n"); }
- if ( $installer::globals::debug ) { push(@output, "Debug is activated\n"); }
if ( $installer::globals::tab ) { push(@output, "TAB version\n"); }
if ( $installer::globals::strip ) { push(@output, "Stripping files\n"); }
else { push(@output, "No file stripping\n"); }
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index ac678be..3252058 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -44,8 +44,6 @@ sub resolve_all_directory_names
{
my ($directoryarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::resolve_all_directory_names : $#{$directoryarrayref}"); }
-
# After this procedure the hash shall contain the complete language
# dependent path, not only the language dependent HostName.
@@ -159,8 +157,6 @@ sub remove_delete_only_files_from_productlists
{
my ($productarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_delete_only_files_from_productlists : $#{$productarrayref}"); }
-
my @newitems = ();
for ( my $i = 0; $i <= $#{$productarrayref}; $i++ )
@@ -188,8 +184,6 @@ sub remove_notinsuite_files_from_productlists
{
my ($productarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_notinsuite_files_from_productlists : $#{$productarrayref}"); }
-
my @newitems = ();
for ( my $i = 0; $i <= $#{$productarrayref}; $i++ )
@@ -222,8 +216,6 @@ sub remove_office_start_language_files
{
my ($productarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_notinsuite_files_from_productlists : $#{$productarrayref}"); }
-
my @newitems = ();
for ( my $i = 0; $i <= $#{$productarrayref}; $i++ )
@@ -255,8 +247,6 @@ sub remove_uninstall_regitems_from_script
{
my ($registryarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_uninstall_regitems_from_script : $#{$registryarrayref}"); }
-
my @newitems = ();
for ( my $i = 0; $i <= $#{$registryarrayref}; $i++ )
@@ -308,8 +298,6 @@ sub resolving_all_languages_in_productlists
{
my ($productarrayref, $languagesarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::resolving_all_languages_in_productlists : $#{$productarrayref} : $#{$languagesarrayref}"); }
-
my @itemsinalllanguages = ();
my ($key, $value);
@@ -725,8 +713,6 @@ sub changing_name_of_language_dependent_keys
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::changing_name_of_language_dependent_keys : $#{$itemsarrayref}"); }
-
# Changing key for multilingual items from "Name ( )" to "Name" or "HostName ( )" to "HostName"
for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
@@ -793,8 +779,6 @@ sub replace_setup_variables
{
my ($itemsarrayref, $languagestringref, $hashref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::replace_setup_variables : $#{$itemsarrayref} : $$languagestringref : $hashref->{'PRODUCTNAME'}"); }
-
my $languagesstring = $$languagestringref;
$languagesstring =~ s/\_/ /g; # replacing underscore with whitespace
@@ -887,8 +871,6 @@ sub remove_non_existent_languages_in_productlists
{
my ($itemsarrayref, $languagestringref, $searchkey, $itemtype) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_non_existent_languages_in_productlists : $#{$itemsarrayref} : $$languagestringref : $searchkey : $itemtype"); }
-
# Removing of all non existent files, for instance asian fonts
installer::logger::include_header_into_logfile("Removing for this language $$languagestringref:");
@@ -936,8 +918,6 @@ sub get_Directoryname_From_Directorygid
{
my ($dirsarrayref ,$searchgid, $onelanguage, $oneitemgid) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_Directoryname_From_Directorygid : $#{$dirsarrayref} : $searchgid : $onelanguage"); }
-
my $directoryname = "";
my $onedirectory;
my $foundgid = 0;
@@ -989,8 +969,6 @@ sub get_Destination_Directory_For_Item_From_Directorylist # this is used f
{
my ($itemarrayref, $dirsarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist : $#{$itemarrayref} : $#{$dirsarrayref}"); }
-
for ( my $i = 0; $i <= $#{$itemarrayref}; $i++ )
{
my $oneitem = ${$itemarrayref}[$i];
@@ -1052,8 +1030,6 @@ sub get_sourcepath_from_filename_and_includepath_classic
{
my ($searchfilenameref, $includepatharrayref, $write_logfile) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic : $$searchfilenameref : $#{$includepatharrayref} : $write_logfile"); }
-
my ($onefile, $includepath, $infoline);
my $foundsourcefile = 0;
@@ -1109,8 +1085,6 @@ sub get_sourcepath_from_filename_and_includepath
{
my ($searchfilenameref, $unused, $write_logfile) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_sourcepath_from_filename_and_includepath : $$searchfilenameref : $#{$includepatharrayref} : $write_logfile"); }
-
my ($onefile, $includepath, $infoline);
my $foundsourcefile = 0;
@@ -1221,8 +1195,6 @@ sub get_Source_Directory_For_Files_From_Includepathlist
{
my ($filesarrayref, $includepatharrayref, $dirsref, $item) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist : $#{$filesarrayref} : $#{$includepatharrayref} : $item"); }
-
installer::logger::include_header_into_logfile("$item:");
my $infoline = "";
@@ -1315,8 +1287,6 @@ sub remove_Files_For_Languagepacks
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_Files_For_Languagepacks : $#{$filesarrayref}"); }
-
my $infoline;
my @newitemsarray = ();
@@ -1351,8 +1321,6 @@ sub remove_Files_Without_Sourcedirectory
{
my ($filesarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_Files_Without_Sourcedirectory : $#{$filesarrayref}"); }
-
my $infoline;
my $error_occurred = 0;
@@ -1486,8 +1454,6 @@ sub add_License_Files_into_Installdir
{
my ($filesarrayref, $dirsarrayref, $languagesarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::add_License_Files_into_Installdir : $#{$filesarrayref} : $#{$languagesarrayref}"); }
-
my $infoline;
my @newfilesarray = ();
@@ -1645,8 +1611,6 @@ sub remove_scpactions_without_name
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_scpactions_without_name : $#{$itemsarrayref}"); }
-
my $infoline;
my @newitemsarray = ();
@@ -1680,8 +1644,6 @@ sub change_keys_of_scpactions
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::change_keys_of_scpactions : $#{$itemsarrayref}"); }
-
for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
{
my $oneitem = ${$itemsarrayref}[$i];
@@ -1725,8 +1687,6 @@ sub remove_Xpdonly_Items
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_Xpdonly_Items : $#{$itemsarrayref}"); }
-
my $infoline;
my @newitemsarray = ();
@@ -1763,8 +1723,6 @@ sub remove_Languagepacklibraries_from_Installset
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_Languagepacklibraries_from_Installset : $#{$itemsarrayref}"); }
-
my $infoline;
my @newitemsarray = ();
@@ -1801,8 +1759,6 @@ sub remove_Helppacklibraries_from_Installset
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_Helppacklibraries_from_Installset : $#{$itemsarrayref}"); }
-
my $infoline;
my @newitemsarray = ();
@@ -1839,8 +1795,6 @@ sub remove_patchonlyfiles_from_Installset
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_patchonlyfiles_from_Installset : $#{$itemsarrayref}"); }
-
my $infoline;
my @newitemsarray = ();
@@ -1877,8 +1831,6 @@ sub remove_tabonlyfiles_from_Installset
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_tabonlyfiles_from_Installset : $#{$itemsarrayref}"); }
-
my $infoline;
my @newitemsarray = ();
@@ -1915,8 +1867,6 @@ sub remove_installedproductonlyfiles_from_Installset
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_installedproductonlyfiles_from_Installset : $#{$itemsarrayref}"); }
-
my $infoline;
my @newitemsarray = ();
@@ -1952,8 +1902,6 @@ sub quoting_illegal_filenames
{
my ($filesarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::rename_illegal_filenames : $#{$filesarrayref}"); }
-
# This function has to be removed as soon as possible!
installer::logger::include_header_into_logfile("Renaming illegal filenames:");
@@ -2015,8 +1963,6 @@ sub collect_directories_from_filesarray
{
my ($filesarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::collect_directories_from_filesarray : $#{$filesarrayref}"); }
-
my @alldirectories = ();
my %alldirectoryhash = ();
@@ -2086,8 +2032,6 @@ sub collect_directories_with_create_flag_from_directoryarray
{
my ($directoryarrayref, $alldirectoryhash) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::collect_directories_with_create_flag_from_directoryarray : $#{$directoryarrayref}"); }
-
my $alreadyincluded = 0;
my @alldirectories = ();
@@ -2210,8 +2154,6 @@ sub get_destination_file_path_for_links
{
my ($linksarrayref, $filesarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_destination_file_path_for_links : $#{$linksarrayref} : $#{$filesarrayref}"); }
-
my $infoline;
for ( my $i = 0; $i <= $#{$linksarrayref}; $i++ )
@@ -2257,8 +2199,6 @@ sub get_destination_link_path_for_links
{
my ($linksarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_destination_link_path_for_links : $#{$linksarrayref}"); }
-
my $infoline;
for ( my $i = 0; $i <= $#{$linksarrayref}; $i++ )
@@ -2304,8 +2244,6 @@ sub remove_workstation_only_items
{
my ($itemarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::remove_workstation_only_items : $#{$itemarrayref}"); }
-
my @newitemarray = ();
for ( my $i = 0; $i <= $#{$itemarrayref}; $i++ )
@@ -2334,8 +2272,6 @@ sub resolve_links_with_flag_relative
{
my ($linksarrayref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::resolve_links_with_flag_relative : $#{$linksarrayref}"); }
-
# Before this step is:
# destination=program/libsalhelperC52.so.3, this will be the name of the link
# destinationfile=program/libsalhelperC52.so.3, this will be the linked file or name
@@ -2433,8 +2369,6 @@ sub get_string_of_modulegids_for_itemgid
{
my ($module_lookup_table, $modulesref, $itemgid, $itemname) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_string_of_modulegids_for_itemgid : $#{$modulesref} : $itemgid : $itemname"); }
-
my $allmodules = "";
my $haslanguagemodule = 0;
my %foundmodules = ();
@@ -2470,8 +2404,6 @@ sub assigning_modules_to_items
{
my ($modulesref, $itemsref, $itemname) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::assigning_modules_to_items : $#{$modulesref} : $#{$itemsref} : $itemname"); }
-
my $infoline = "";
my $languageassignmenterror = 0;
my @languageassignmenterrors = ();
@@ -2536,8 +2468,6 @@ sub add_rootpath_to_directories
{
my ($dirsref, $rootpath) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::add_rootpath_to_directories : $#{$dirsref} : $rootpath"); }
-
for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
{
my $onedir = ${$dirsref}[$i];
@@ -2567,8 +2497,6 @@ sub add_rootpath_to_files
{
my ($filesref, $rootpath) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::add_rootpath_to_files : $#{$filesref} : $rootpath"); }
-
for ( my $i = 0; $i <= $#{$filesref}; $i++ )
{
my $onefile = ${$filesref}[$i];
@@ -2582,8 +2510,6 @@ sub add_rootpath_to_links
{
my ($linksref, $rootpath) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::add_rootpath_to_links : $#{$linksref} : $rootpath"); }
-
for ( my $i = 0; $i <= $#{$linksref}; $i++ )
{
my $onelink = ${$linksref}[$i];
More information about the Libreoffice-commits
mailing list