A few more patches to clean up parts of the solenv perl scripts.
The first is just removing pieces that became useless after prior
patches, or that were added as part of a larger patch, even though
they were never used. (I'm basing this on the master branch git log
entries.)
The second has a minor impact on build.pl calling behavior, but seems
reasonable. The --dontgraboutput switch hasn't done anything for some
time, except cause build.pl to abort if this switch was specified
before the --html switch. If specified now, it will pass through to
the dmake options (where it shouldn't do anything); it can no longer
prevent build.pl from running.
The last just shortens the debuginfo / debugsave calls; since every
time these were used, they were wrapped in checks against the debug
flag, I pushed the debug flag check into those routines. Now they can
just be called, and if debugging is off they do nothing.
Again, I ran another autogen / make / make dev-install cycle on an
Ubuntu 11.04 to test; I didn't see any problems.
LGPLv3+ / MPL
Jordan Ayers
From 545b48073d7b00df5653e8353b01724c9d00e093 Mon Sep 17 00:00:00 2001
From: Jordan Ayers <jordan.ayers@gmail.com>
Date: Thu, 11 Aug 2011 07:57:33 -0500
Subject: [PATCH 1/3] Remove dead code from solenv/bin/build.pl
Remove several unused functions, and an impossible warning.
---
solenv/bin/build.pl | 121 ---------------------------------------------------
1 files changed, 0 insertions(+), 121 deletions(-)
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 9c710fe..7840704 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -59,7 +59,6 @@
if (defined $ENV{verbose} || defined $ENV{VERBOSE}) {
$verbose_mode = ($ENV{verbose} =~ /^t\S*$/i);
}
- my $enable_multiprocessing = 1;
### for XML file format
eval { require XMLBuildListParser; import XMLBuildListParser; };
@@ -360,35 +359,6 @@ sub start_html_listener {
} while(1);
};
-sub start_html_message_trigger {
- my $child_id=fork(); ### VG: for windows there is a "simulation of the "fork"", no new
procs... One can use Win32::Process::Create
-
- if ($child_id) {
- # parent
- } else {
- my $buffer_size = 1024;
- my $buffer;
- my $rv;
- my $full_buffer = '';
- my %modules_to_rebuild = ();
- my $paddr;
- while ($rv = sysread(HTML_PIPE, $buffer, $buffer_size)) {
- $full_buffer .= $buffer;
- };
- if (length $full_buffer) {
- print "**********Got message $full_buffer\n";
- socket(SOCKET, PF_INET, SOCK_STREAM, getprotobyname('tcp')) or die "socket: $!";
- if (connect(SOCKET, $paddr)) {
- $full_buffer .= "\n";
- syswrite SOCKET, $full_buffer, length $full_buffer;
- } else {
- die "Child connect: $!";
- };
- }
- _exit(0);
- };
-};
-
sub get_html_orders {
return if (!$interactive);
my $buffer_size = 1024;
@@ -1312,18 +1282,6 @@ sub get_dependency_array {
return @dependencies;
};
-
-#
-# Getting current directory list
-#
-sub get_directory_list {
- my $path = shift;
- opendir(CurrentDirList, $path);
- my @directory_list = readdir(CurrentDirList);
- closedir(CurrentDirList);
- return @directory_list;
-};
-
sub print_error {
my $message = shift;
my $force = shift;
@@ -1467,9 +1425,6 @@ sub get_options {
if ($ignore && !$html) {
print_error("Cannot ignore errors in multiprocessing build");
};
- if (!$enable_multiprocessing) {
- print_error("Cannot load Win32::Process module for multiprocessing build");
- };
} elsif ($stop_build_on_error) {
print_error("Switch --stoponerror is only for multiprocessing builds");
};
@@ -1518,25 +1473,6 @@ sub get_dmake_args {
};
#
-# get all options without '-'
-#
-sub get_switch_options {
- my $string = '';
- my $option = '';
- while ($option = shift @ARGV) {
- if (!($option =~ /^-+/)) {
- $string .= '-' . $option;
- $string .= ' ';
- } else {
- unshift(@ARGV, $option);
- last;
- };
- };
- $string =~ s/\s$//;
- return $string;
-};
-
-#
# cancel build when one of children has error exit code
#
sub cancel_build {
@@ -2018,20 +1954,6 @@ sub zenity_message {
};
};
-sub are_all_dependent {
- my $build_queue = shift;
- my $folder = '';
- my $first_candidate = undef;
- foreach my $prj (keys %$build_queue) {
- $folder = find_indep_prj($projects_deps_hash{$prj});
- $first_candidate = $folder if (!defined $first_candidate);
- };
- $folder = $first_candidate;
- return '' if ($first_candidate);
- return '1';
-};
-
-
#
# Procedure removes output tree from the module (without common trees)
#
@@ -2119,12 +2041,6 @@ sub retrieve_build_list {
return undef;
};
-sub fix_permissions {
- my $file = $File::Find::name;
- return unless -f $file;
- chmod '0664', $file;
-};
-
sub prepare_build_from_with_branches {
my ($full_deps_hash, $reversed_full_deps_hash) = @_;
foreach my $prerequisite (keys %$full_deps_hash) {
@@ -2397,43 +2313,6 @@ sub get_solar_vars {
}
#
-# Procedure renames <module>.lnk (.link) into <module>
-#
-sub get_current_module {
- my $module_name = shift;
- my $link_name = $module_name . '.lnk';
- $link_name .= '.link' if (-e $workspace_path.$module_name . '.link');
- chdir $workspace_path;
- getcwd();
- print "\nBreaking link to module $module_name";
- my $result = rename $link_name, $module_name;
- if ( ! $result ) {
- print_error("Cannot rename $module_name: $!\n");
- }
- if ( $initial_module eq $link_name) {
- $initial_module = $module_name;
- }
- chdir $module_name;
- getcwd();
-};
-
-sub check_dir {
- my $start_dir = getcwd();
- my @dir_entries = split(/[\\\/]/, $ENV{PWD});
- my $current_module = $dir_entries[$#dir_entries];
- if (($current_module =~ /(\.lnk)$/) || ($current_module =~ /(\.link)$/)) {
- $current_module = $`;
- # we're dealing with a link => fallback to SOLARSRC under UNIX
- $workspace_path = $ENV{SOLARSRC}.'/';
- get_current_module($current_module);
- return;
- } else {
- chdir $start_dir;
- getcwd();
- };
-};
-
-#
# Store all available build modi in %build_modes
#
sub get_build_modes {
--
1.7.4.1
From 009e22dadc496ba9e9035aab4055fdf36aefe676 Mon Sep 17 00:00:00 2001
From: Jordan Ayers <jordan.ayers@gmail.com>
Date: Fri, 12 Aug 2011 22:02:51 -0500
Subject: [PATCH 2/3] Remove dead command line switch from solenv/bin/build.pl (--dontgraboutput)
---
solenv/bin/build.pl | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 7840704..13e3ea7 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -153,7 +153,6 @@
my %had_error = (); # hack for mysterious windows problems - try run dmake 2 times if first
time there was an error
my $mkout = correct_path("$ENV{SOLARENV}/bin/mkout.pl");
my %weights_hash = (); # hash contains info about how many modules are dependent from one
module
- my $grab_output = 1;
my $stop_build_on_error = 0; # for multiprocessing mode: do not build further module if there
is an error
my $interactive = 0; # for interactive mode... (for testing purpose enabled by default)
my $parent_process = 1;
@@ -1304,7 +1303,7 @@ sub print_error {
sub usage {
print STDERR "\nbuild\n";
- print STDERR "Syntax: build [--all|-a[:prj_name]]|[--from|-f prj_name1[:prj_name2]
[prj_name3 [...]]]|[--since|-c prj_name] [--with_branches prj_name1[:prj_name2] [--skip
prj_name1[:prj_name2] [prj_name3 [...]] [prj_name3 [...]|-b] [--deliver|-d [--dlv_switch
deliver_switch]]] [-P processes] [--show|-s] [--help|-h] [--file|-F] [--ignore|-i] [--version|-V]
[--mode|-m OOo[,SO[,EXT]] [--html [--html_path html_file_path] [--dontgraboutput]]
[--pre_job=pre_job_sring] [--job=job_string|-j] [--post_job=post_job_sring] [--stoponerror]
[--exclude_branch_from prj_name1[:prj_name2] [prj_name3 [...]]] [--interactive] [--verbose]\n";
+ print STDERR "Syntax: build [--all|-a[:prj_name]]|[--from|-f prj_name1[:prj_name2]
[prj_name3 [...]]]|[--since|-c prj_name] [--with_branches prj_name1[:prj_name2] [--skip
prj_name1[:prj_name2] [prj_name3 [...]] [prj_name3 [...]|-b] [--deliver|-d [--dlv_switch
deliver_switch]]] [-P processes] [--show|-s] [--help|-h] [--file|-F] [--ignore|-i] [--version|-V]
[--mode|-m OOo[,SO[,EXT]] [--html [--html_path html_file_path]] [--pre_job=pre_job_sring]
[--job=job_string|-j] [--post_job=post_job_sring] [--stoponerror] [--exclude_branch_from
prj_name1[:prj_name2] [prj_name3 [...]]] [--interactive] [--verbose]\n";
print STDERR "Example1: build --from sfx2\n";
print STDERR " - build all projects dependent from sfx2, starting with
sfx2, finishing with the current module\n";
print STDERR "Example2: build --all:sfx2\n";
@@ -1331,7 +1330,6 @@ sub usage {
print STDERR " --html - generate html page with build status\n";
print STDERR " file named $ENV{INPATH}.build.html will be generated in
$ENV{SOLARSRC}\n";
print STDERR " --html_path - set html page path\n";
- print STDERR " --dontgraboutput - do not grab console output when generating html
page\n";
print STDERR " --stoponerror - stop build when error occurs (for mp builds)\n";
print STDERR " --interactive - start interactive build process (process can be
managed via html page)\n";
print STDERR " --verbose - generates a detailed output of the build process\n";
@@ -1347,7 +1345,7 @@ sub usage {
# Get all options passed
#
sub get_options {
- my ($arg, $dont_grab_output);
+ my $arg;
while ($arg = shift @ARGV) {
$arg =~ /^-P$/ and $processes_to_run = shift @ARGV and next;
$arg =~ /^-P(\d+)$/ and $processes_to_run = $1 and next;
@@ -1386,7 +1384,6 @@ sub get_options {
$arg =~ /^-h$/ and usage() and do_exit(0);
$arg =~ /^--ignore$/ and $ignore = 1 and next;
$arg =~ /^--html$/ and $html = 1 and next;
- $arg =~ /^--dontgraboutput$/ and $dont_grab_output = 1 and next;
$arg =~ /^--html_path$/ and $html_path = shift @ARGV and next;
$arg =~ /^-i$/ and $ignore = 1 and next;
$arg =~ /^--version$/ and do_exit(0);
@@ -1404,12 +1401,10 @@ sub get_options {
};
if (!$html) {
print_error("\"--html_path\" switch is used only with \"--html\"") if ($html_path);
- print_error("\"--dontgraboutput\" switch is used only with \"--html\"") if
($dont_grab_output);
};
if ((scalar keys %exclude_branches) && !$build_all_parents) {
print_error("\"--exclude_branch_from\" is not applicable for one module builds!!");
};
- $grab_output = 0 if ($dont_grab_output);
print_error('Switches --with_branches and --all collision') if ($build_from_with_branches &&
$build_all_cont);
print_error('Switch --skip is for building multiple modules only!!') if ((scalar keys
%skip_modules) && (!$build_all_parents));
print_error('Switches --with_branches and --since collision') if ($build_from_with_branches &&
$build_since);
--
1.7.4.1
From b3af68edfab11f23c27d80b48936e9fef080a9eb Mon Sep 17 00:00:00 2001
From: Jordan Ayers <jordan.ayers@gmail.com>
Date: Fri, 12 Aug 2011 22:36:37 -0500
Subject: [PATCH 3/3] Simplify debug calls in make_installer.pl
Push the debug flag checks into installer::logger::debuginfo and debugsave
to shrink some long lines.
---
solenv/bin/make_installer.pl | 26 ++++----
solenv/bin/modules/installer/archivefiles.pm | 2 +-
solenv/bin/modules/installer/configuration.pm | 24 ++++----
solenv/bin/modules/installer/exiter.pm | 2 +-
solenv/bin/modules/installer/files.pm | 16 +++---
solenv/bin/modules/installer/logger.pm | 5 +-
solenv/bin/modules/installer/parameter.pm | 16 +++---
solenv/bin/modules/installer/scriptitems.pm | 74 ++++++++++++------------
8 files changed, 83 insertions(+), 82 deletions(-)
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 561dcef..328a353 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -125,8 +125,8 @@ 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::logger::debuginfo("\nPart 1: The platform independent part\n");
+installer::logger::debuginfo("\nPart 1a: The language independent part\n");
installer::parameter::control_fundamental_parameter();
installer::parameter::setglobalvariables();
@@ -597,10 +597,10 @@ 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"); }
+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); }
+installer::logger::savedebug($installer::globals::exitlog);
#################################################
# Part 1b: The language dependent part
@@ -615,7 +615,7 @@ 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"); }
+installer::logger::debuginfo("\nPart 1b: The language dependent part\n");
for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
{
@@ -1255,22 +1255,22 @@ 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"); }
+ 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); }
+ 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"); }
+ 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"); }
+ installer::logger::debuginfo("\nPart 2a: All non-Windows platforms\n");
#########################################################
# ... creating epm list file ...
@@ -1905,13 +1905,13 @@ 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"); }
+ 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"); }
+ installer::logger::debuginfo("\nPart 2b: The Windows platform\n");
#####################################################################
# ... creating idt files ...
@@ -2364,7 +2364,7 @@ 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"); }
+ 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";
@@ -2373,7 +2373,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
} # end of iteration for one language group
# saving debug info at end
-if ( $installer::globals::debug ) { installer::logger::savedebug($installer::globals::exitlog); }
+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 af23ed2..2bc2b19 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -149,7 +149,7 @@ 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"); }
+ installer::logger::debuginfo("installer::archivefiles::resolving_archive_flag :
$#{$filesarrayref} : $#{$additionalpathsref} : $$languagestringref : $loggingdir");
my @newallfilesarray = ();
diff --git a/solenv/bin/modules/installer/configuration.pm
b/solenv/bin/modules/installer/configuration.pm
index 0fb587f..08743a7 100644
--- a/solenv/bin/modules/installer/configuration.pm
+++ b/solenv/bin/modules/installer/configuration.pm
@@ -46,7 +46,7 @@ sub analyze_path_of_configurationitem
{
my ($configurationitemsref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::analyze_path_of_configurationitem :
$#{$configurationitemsref}"); }
+ installer::logger::debuginfo("installer::configuration::analyze_path_of_configurationitem :
$#{$configurationitemsref}");
my ($startpath, $nodes, $name, $packagename, $onenode, $first, $second, $third, $bracketnode);
@@ -193,7 +193,7 @@ sub insert_start_block_into_configfile
{
my ($configfileref, $oneconfig) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::insert_start_block_into_configfile :
$#{$configfileref} : $oneconfig->{'name'}"); }
+ installer::logger::debuginfo("installer::configuration::insert_start_block_into_configfile :
$#{$configfileref} : $oneconfig->{'name'}");
my $line = '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
push( @{$configfileref}, $line);
@@ -217,7 +217,7 @@ sub insert_end_block_into_configfile
{
my ($configfileref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::insert_end_block_into_configfile :
$#{$configfileref}"); }
+ installer::logger::debuginfo("installer::configuration::insert_end_block_into_configfile :
$#{$configfileref}");
my $line = "\n" . '</oor:component-data>' . "\n";
push( @{$configfileref}, $line);
@@ -231,7 +231,7 @@ sub get_node_content
{
my ($nodeline) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::get_node_content : $nodeline"); }
+ installer::logger::debuginfo("installer::configuration::get_node_content : $nodeline");
my $content = "";
@@ -256,7 +256,7 @@ sub get_node_line_number
{
my ($nodecount, $oneconfig, $oneconfigfileref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::get_node_line_number : $nodecount :
$oneconfig->{'name'} : $#{$oneconfigfileref}"); }
+ installer::logger::debuginfo("installer::configuration::get_node_line_number : $nodecount :
$oneconfig->{'name'} : $#{$oneconfigfileref}");
my $linenumber = -1; # the node does not exists, if returnvalue is "-1"
@@ -336,7 +336,7 @@ sub insert_into_config_file
{
my ($oneconfig, $oneconfigfileref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::insert_into_config_file :
$oneconfig->{'nodenumber'} : $#{$oneconfigfileref}"); }
+ installer::logger::debuginfo("installer::configuration::insert_into_config_file :
$oneconfig->{'nodenumber'} : $#{$oneconfigfileref}");
my ($nodename, $nodecontent, $newnodeline, $bracketkey, $line, $insertline);
@@ -627,7 +627,7 @@ sub insert_tabs_into_configfile
{
my ($configfileref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::insert_tabs_into_configfile :
$#{$configfileref}"); }
+ installer::logger::debuginfo("installer::configuration::insert_tabs_into_configfile :
$#{$configfileref}");
my $counter = 0;
@@ -680,7 +680,7 @@ sub collect_all_configuration_items
{
my ($configurationitemsref, $item) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::collect_all_configuration_items :
$#{$configurationitemsref} : $item"); }
+ installer::logger::debuginfo("installer::configuration::collect_all_configuration_items :
$#{$configurationitemsref} : $item");
my @allitems = ();
@@ -705,7 +705,7 @@ sub get_all_configitems_at_module
{
my ($moduleid, $configurationitemsref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::get_all_configitems_at_module : $moduleid :
$#{$configurationitemsref}"); }
+ installer::logger::debuginfo("installer::configuration::get_all_configitems_at_module :
$moduleid : $#{$configurationitemsref}");
my @moduleconfigurationitems = ();
@@ -730,7 +730,7 @@ sub save_and_zip_configfile
{
my ($oneconfigfileref, $onefile, $onemodule, $configdir) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::save_and_zip_configfile :
$#{$oneconfigfileref} : $onefile : $onemodule : $configdir"); }
+ installer::logger::debuginfo("installer::configuration::save_and_zip_configfile :
$#{$oneconfigfileref} : $onefile : $onemodule : $configdir");
my $savefilename = $onefile;
$savefilename =~ s/\./\_/g;
@@ -783,7 +783,7 @@ sub add_zipfile_into_filelist
{
my ($zipfilename, $configdir, $filesarrayref, $onemodule) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::add_zipfile_into_filelist: $zipfilename :
$configdir : $#{$filesarrayref} : $onemodule"); }
+ installer::logger::debuginfo("installer::configuration::add_zipfile_into_filelist:
$zipfilename : $configdir : $#{$filesarrayref} : $onemodule");
my $longzipfilename = $configdir . $installer::globals::separator . $zipfilename;
my $gid = "gid_" . $zipfilename;
@@ -820,7 +820,7 @@ sub create_configuration_files
{
my ($configurationitemsref, $filesarrayref, $languagestringref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::configuration::create_configuration_files:
$#{$configurationitemsref} : $#{$filesarrayref} : $$languagestringref"); }
+ installer::logger::debuginfo("installer::configuration::create_configuration_files:
$#{$configurationitemsref} : $#{$filesarrayref} : $$languagestringref");
installer::logger::include_header_into_logfile("Creating configuration files:");
diff --git a/solenv/bin/modules/installer/exiter.pm b/solenv/bin/modules/installer/exiter.pm
index d5976f4..f2fb170 100644
--- a/solenv/bin/modules/installer/exiter.pm
+++ b/solenv/bin/modules/installer/exiter.pm
@@ -99,7 +99,7 @@ sub exit_program
# Saving the debug info
- if ( $installer::globals::debug ) {
installer::logger::savedebug($installer::globals::exitlog); }
+ installer::logger::savedebug($installer::globals::exitlog);
installer::logger::stoptime();
diff --git a/solenv/bin/modules/installer/files.pm b/solenv/bin/modules/installer/files.pm
index 73ea267..9847a25 100644
--- a/solenv/bin/modules/installer/files.pm
+++ b/solenv/bin/modules/installer/files.pm
@@ -38,7 +38,7 @@ sub check_file
{
my ($arg) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::files::check_file
: $arg"); }
+ installer::logger::debuginfo("installer::files::check_file : $arg");
if(!( -f $arg ))
{
@@ -51,7 +51,7 @@ sub read_file
my ($localfile) = @_;
my @localfile = ();
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::files::read_file
: $localfile"); }
+ installer::logger::debuginfo("installer::files::read_file : $localfile");
open( IN, "<$localfile" ) || installer::exiter::exit_program("ERROR: Cannot open file
$localfile for reading", "read_file");
@@ -75,7 +75,7 @@ sub save_file
{
my ($savefile, $savecontent) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::files::save_file
: $savefile : $#{$savecontent}"); }
+ installer::logger::debuginfo("installer::files::save_file : $savefile : $#{$savecontent}");
if ( open( OUT, ">$savefile" ) )
{
@@ -102,7 +102,7 @@ sub save_hash
{
my ($savefile, $hashref) = @_;
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::files::save_hash
: $savefile"); }
+ installer::logger::debuginfo("installer::files::save_hash : $savefile");
my @printcontent = ();
@@ -125,7 +125,7 @@ sub save_array_of_hashes
{
my ($savefile, $arrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::files::save_array_of_hashes : $savefile : $#{$arrayref}");
}
+ installer::logger::debuginfo("installer::files::save_array_of_hashes : $savefile :
$#{$arrayref}");
my @printcontent = ();
@@ -155,7 +155,7 @@ sub save_array_of_hashes_modules
{
my ($savefile, $arrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::files::save_array_of_hashes : $savefile : $#{$arrayref}");
}
+ installer::logger::debuginfo("installer::files::save_array_of_hashes : $savefile :
$#{$arrayref}");
my @printcontent = ();
@@ -189,7 +189,7 @@ sub read_binary_file
{
my ($filename) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::files::read_binary_file : $filename"); }
+ installer::logger::debuginfo("installer::files::read_binary_file : $filename");
my $file;
@@ -208,7 +208,7 @@ sub save_binary_file
{
my ($file, $filename) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::files::save_binary_file : $filename"); }
+ 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;
diff --git a/solenv/bin/modules/installer/logger.pm b/solenv/bin/modules/installer/logger.pm
index c5982c6..e72b529 100644
--- a/solenv/bin/modules/installer/logger.pm
+++ b/solenv/bin/modules/installer/logger.pm
@@ -163,9 +163,9 @@ sub copy_globalinfo_into_logfile
sub debuginfo
{
my ( $message ) = @_;
+ return if !$installer::globals::debug;
- $message = $message . "\n";
- push(@installer::globals::functioncalls, $message);
+ push(@installer::globals::functioncalls, $message . "\n");
}
###############################################################
@@ -175,6 +175,7 @@ sub debuginfo
sub savedebug
{
my ( $outputdir ) = @_;
+ return if !$installer::globals::debug;
installer::files::save_file($outputdir . $installer::globals::debugfilename,
\@installer::globals::functioncalls);
print_message( "... writing debug file " . $outputdir . $installer::globals::debugfilename .
"\n" );
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 9c5ec8c..4ef3e40 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -41,7 +41,7 @@ use installer::systemactions;
sub usage
{
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::parameter::usage"); }
+ installer::logger::debuginfo("installer::parameter::usage");
print <<Ende;
--------------------------------------------------------------------------------
@@ -98,7 +98,7 @@ Ende
sub saveparameter
{
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::parameter::saveparameter"); }
+ installer::logger::debuginfo("installer::parameter::saveparameter");
my $include = "";
@@ -123,7 +123,7 @@ sub saveparameter
sub getparameter
{
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::parameter::getparameter"); }
+ installer::logger::debuginfo("installer::parameter::getparameter");
while ( $#ARGV >= 0 )
{
@@ -196,7 +196,7 @@ sub getparameter
sub control_fundamental_parameter
{
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::parameter::control_fundamental_parameter"); }
+ installer::logger::debuginfo("installer::parameter::control_fundamental_parameter");
if ($installer::globals::product eq "")
{
@@ -215,7 +215,7 @@ sub make_path_absolute
{
my ($pathref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::parameter::make_path_absolute : $$pathref"); }
+ installer::logger::debuginfo("installer::parameter::make_path_absolute : $$pathref");
if ( $installer::globals::isunix )
{
@@ -267,7 +267,7 @@ sub make_path_absolute
sub setglobalvariables
{
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::parameter::setglobalvariables"); }
+ 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.
@@ -483,7 +483,7 @@ sub setglobalvariables
sub control_required_parameter
{
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::parameter::control_required_parameter"); }
+ installer::logger::debuginfo("installer::parameter::control_required_parameter");
if (!($installer::globals::is_copy_only_project))
{
@@ -595,7 +595,7 @@ sub control_required_parameter
sub outputparameter
{
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::parameter::outputparameter"); }
+ installer::logger::debuginfo("installer::parameter::outputparameter");
my $element;
diff --git a/solenv/bin/modules/installer/scriptitems.pm
b/solenv/bin/modules/installer/scriptitems.pm
index 34f16ec..7c8bd20 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -45,7 +45,7 @@ sub resolve_all_directory_names
{
my ($directoryarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::resolve_all_directory_names :
$#{$directoryarrayref}"); }
+ 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.
@@ -160,7 +160,7 @@ 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}"); }
+
installer::logger::debuginfo("installer::scriptitems::remove_delete_only_files_from_productlists :
$#{$productarrayref}");
my @newitems = ();
@@ -189,7 +189,7 @@ sub remove_notinsuite_files_from_productlists
{
my ($productarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_notinsuite_files_from_productlists :
$#{$productarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::remove_notinsuite_files_from_productlists :
$#{$productarrayref}");
my @newitems = ();
@@ -223,7 +223,7 @@ sub remove_office_start_language_files
{
my ($productarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_notinsuite_files_from_productlists :
$#{$productarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::remove_notinsuite_files_from_productlists :
$#{$productarrayref}");
my @newitems = ();
@@ -256,7 +256,7 @@ sub remove_uninstall_regitems_from_script
{
my ($registryarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_uninstall_regitems_from_script :
$#{$registryarrayref}"); }
+ installer::logger::debuginfo("installer::scriptitems::remove_uninstall_regitems_from_script :
$#{$registryarrayref}");
my @newitems = ();
@@ -309,7 +309,7 @@ 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}"); }
+ installer::logger::debuginfo("installer::scriptitems::resolving_all_languages_in_productlists
: $#{$productarrayref} : $#{$languagesarrayref}");
my @itemsinalllanguages = ();
@@ -711,7 +711,7 @@ 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}"); }
+ 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"
@@ -779,7 +779,7 @@ sub replace_setup_variables
{
my ($itemsarrayref, $languagestringref, $hashref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::replace_setup_variables : $#{$itemsarrayref}
: $$languagestringref : $hashref->{'PRODUCTNAME'}"); }
+ installer::logger::debuginfo("installer::scriptitems::replace_setup_variables :
$#{$itemsarrayref} : $$languagestringref : $hashref->{'PRODUCTNAME'}");
my $languagesstring = $$languagestringref;
$languagesstring =~ s/\_/ /g; # replacing underscore with whitespace
@@ -873,7 +873,7 @@ 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"); }
+
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
@@ -922,7 +922,7 @@ 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"); }
+ installer::logger::debuginfo("installer::scriptitems::get_Directoryname_From_Directorygid :
$#{$dirsarrayref} : $searchgid : $onelanguage");
my $directoryname = "";
my $onedirectory;
@@ -975,7 +975,7 @@ 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}"); }
+
installer::logger::debuginfo("installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist
: $#{$itemarrayref} : $#{$dirsarrayref}");
for ( my $i = 0; $i <= $#{$itemarrayref}; $i++ )
{
@@ -1038,7 +1038,7 @@ 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"); }
+
installer::logger::debuginfo("installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic
: $$searchfilenameref : $#{$includepatharrayref} : $write_logfile");
my ($onefile, $includepath, $infoline);
@@ -1095,7 +1095,7 @@ 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"); }
+
installer::logger::debuginfo("installer::scriptitems::get_sourcepath_from_filename_and_includepath
: $$searchfilenameref : $#{$includepatharrayref} : $write_logfile");
my ($onefile, $includepath, $infoline);
@@ -1207,7 +1207,7 @@ 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::debuginfo("installer::scriptitems::get_Source_Directory_For_Files_From_Includepathlist
: $#{$filesarrayref} : $#{$includepatharrayref} : $item");
installer::logger::include_header_into_logfile("$item:");
@@ -1301,7 +1301,7 @@ sub remove_Files_For_Languagepacks
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_Files_For_Languagepacks :
$#{$filesarrayref}"); }
+ installer::logger::debuginfo("installer::scriptitems::remove_Files_For_Languagepacks :
$#{$filesarrayref}");
my $infoline;
@@ -1337,7 +1337,7 @@ sub remove_Files_Without_Sourcedirectory
{
my ($filesarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_Files_Without_Sourcedirectory :
$#{$filesarrayref}"); }
+ installer::logger::debuginfo("installer::scriptitems::remove_Files_Without_Sourcedirectory :
$#{$filesarrayref}");
my $infoline;
@@ -1472,7 +1472,7 @@ 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}"); }
+ installer::logger::debuginfo("installer::scriptitems::add_License_Files_into_Installdir :
$#{$filesarrayref} : $#{$languagesarrayref}");
my $infoline;
@@ -1747,7 +1747,7 @@ sub remove_scpactions_without_name
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_scpactions_without_name :
$#{$itemsarrayref}"); }
+ installer::logger::debuginfo("installer::scriptitems::remove_scpactions_without_name :
$#{$itemsarrayref}");
my $infoline;
@@ -1782,7 +1782,7 @@ sub change_keys_of_scpactions
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::change_keys_of_scpactions :
$#{$itemsarrayref}"); }
+ installer::logger::debuginfo("installer::scriptitems::change_keys_of_scpactions :
$#{$itemsarrayref}");
for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
{
@@ -1827,7 +1827,7 @@ sub remove_Xpdonly_Items
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_Xpdonly_Items : $#{$itemsarrayref}"); }
+ installer::logger::debuginfo("installer::scriptitems::remove_Xpdonly_Items :
$#{$itemsarrayref}");
my $infoline;
@@ -1865,7 +1865,7 @@ sub remove_Languagepacklibraries_from_Installset
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_Languagepacklibraries_from_Installset
: $#{$itemsarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::remove_Languagepacklibraries_from_Installset
: $#{$itemsarrayref}");
my $infoline;
@@ -1903,7 +1903,7 @@ sub remove_Helppacklibraries_from_Installset
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_Helppacklibraries_from_Installset :
$#{$itemsarrayref}"); }
+ installer::logger::debuginfo("installer::scriptitems::remove_Helppacklibraries_from_Installset
: $#{$itemsarrayref}");
my $infoline;
@@ -1941,7 +1941,7 @@ sub remove_patchonlyfiles_from_Installset
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_patchonlyfiles_from_Installset :
$#{$itemsarrayref}"); }
+ installer::logger::debuginfo("installer::scriptitems::remove_patchonlyfiles_from_Installset :
$#{$itemsarrayref}");
my $infoline;
@@ -1979,7 +1979,7 @@ sub remove_tabonlyfiles_from_Installset
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_tabonlyfiles_from_Installset :
$#{$itemsarrayref}"); }
+ installer::logger::debuginfo("installer::scriptitems::remove_tabonlyfiles_from_Installset :
$#{$itemsarrayref}");
my $infoline;
@@ -2017,7 +2017,7 @@ sub remove_installedproductonlyfiles_from_Installset
{
my ($itemsarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_installedproductonlyfiles_from_Installset
: $#{$itemsarrayref}"); }
+
installer::logger::debuginfo("installer::scriptitems::remove_installedproductonlyfiles_from_Installset
: $#{$itemsarrayref}");
my $infoline;
@@ -2054,7 +2054,7 @@ sub quoting_illegal_filenames
{
my ($filesarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::rename_illegal_filenames :
$#{$filesarrayref}"); }
+ installer::logger::debuginfo("installer::scriptitems::rename_illegal_filenames :
$#{$filesarrayref}");
# This function has to be removed as soon as possible!
@@ -2117,7 +2117,7 @@ sub collect_directories_from_filesarray
{
my ($filesarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::collect_directories_from_filesarray :
$#{$filesarrayref}"); }
+ installer::logger::debuginfo("installer::scriptitems::collect_directories_from_filesarray :
$#{$filesarrayref}");
my @alldirectories = ();
my %alldirectoryhash = ();
@@ -2188,7 +2188,7 @@ 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}"); }
+
installer::logger::debuginfo("installer::scriptitems::collect_directories_with_create_flag_from_directoryarray
: $#{$directoryarrayref}");
my $alreadyincluded = 0;
my @alldirectories = ();
@@ -2312,7 +2312,7 @@ 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}"); }
+ installer::logger::debuginfo("installer::scriptitems::get_destination_file_path_for_links :
$#{$linksarrayref} : $#{$filesarrayref}");
my $infoline;
@@ -2359,7 +2359,7 @@ 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}"); }
+ installer::logger::debuginfo("installer::scriptitems::get_destination_link_path_for_links :
$#{$linksarrayref}");
my $infoline;
@@ -2406,7 +2406,7 @@ sub remove_workstation_only_items
{
my ($itemarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::remove_workstation_only_items :
$#{$itemarrayref}"); }
+ installer::logger::debuginfo("installer::scriptitems::remove_workstation_only_items :
$#{$itemarrayref}");
my @newitemarray = ();
@@ -2436,7 +2436,7 @@ sub resolve_links_with_flag_relative
{
my ($linksarrayref) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::resolve_links_with_flag_relative :
$#{$linksarrayref}"); }
+ 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
@@ -2535,7 +2535,7 @@ 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"); }
+ installer::logger::debuginfo("installer::scriptitems::get_string_of_modulegids_for_itemgid :
$#{$modulesref} : $itemgid : $itemname");
my $allmodules = "";
my $haslanguagemodule = 0;
@@ -2572,7 +2572,7 @@ 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"); }
+ installer::logger::debuginfo("installer::scriptitems::assigning_modules_to_items :
$#{$modulesref} : $#{$itemsref} : $itemname");
my $infoline = "";
my $languageassignmenterror = 0;
@@ -2638,7 +2638,7 @@ sub add_rootpath_to_directories
{
my ($dirsref, $rootpath) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::add_rootpath_to_directories : $#{$dirsref} :
$rootpath"); }
+ installer::logger::debuginfo("installer::scriptitems::add_rootpath_to_directories :
$#{$dirsref} : $rootpath");
for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
{
@@ -2669,7 +2669,7 @@ sub add_rootpath_to_files
{
my ($filesref, $rootpath) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::add_rootpath_to_files : $#{$filesref} :
$rootpath"); }
+ installer::logger::debuginfo("installer::scriptitems::add_rootpath_to_files : $#{$filesref} :
$rootpath");
for ( my $i = 0; $i <= $#{$filesref}; $i++ )
{
@@ -2684,7 +2684,7 @@ sub add_rootpath_to_links
{
my ($linksref, $rootpath) = @_;
- if ( $installer::globals::debug ) {
installer::logger::debuginfo("installer::scriptitems::add_rootpath_to_links : $#{$linksref} :
$rootpath"); }
+ installer::logger::debuginfo("installer::scriptitems::add_rootpath_to_links : $#{$linksref} :
$rootpath");
for ( my $i = 0; $i <= $#{$linksref}; $i++ )
{
--
1.7.4.1
Context
- [Libreoffice] [PATCH] More perl cleanup (fdo#39747) · Jordan Ayers
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.