You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by af...@apache.org on 2013/10/31 11:37:57 UTC
svn commit: r1537433 [6/6] - in /openoffice/trunk/main/solenv/bin: ./
modules/installer/ modules/installer/windows/
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/sign.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/sign.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/sign.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/sign.pm Thu Oct 31 10:37:56 2013
@@ -63,7 +63,7 @@ sub copy_install_set
if ( -d $removepath ) { installer::systemactions::remove_complete_directory($removepath, 1); }
$infoline = "Copy installation set from $installsetpath to $newpath\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$installsetpath = installer::systemactions::copy_complete_directory($installsetpath, $newpath);
@@ -141,7 +141,8 @@ sub check_system_path
foreach my $onefile ( @needed_files_in_path )
{
- installer::logger::print_message( "...... searching $onefile ..." );
+
+ $installer::logger::Info->printf("...... searching %s ...\n", $onefile);
my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$onefile, $patharrayref , 0);
@@ -152,7 +153,7 @@ sub check_system_path
}
else
{
- installer::logger::print_message( "\tFound: $$fileref\n" );
+ $installer::logger::Info->printf("\tFound: %s\n", $$fileref);
}
}
@@ -169,24 +170,24 @@ sub make_systemcall
{
my ($systemcall, $displaysystemcall) = @_;
- installer::logger::print_message( "... $displaysystemcall ...\n" );
+ $installer::logger::Info->printf("... %s ...\n", $displaysystemcall);
my $success = 1;
my $returnvalue = system($systemcall);
my $infoline = "Systemcall: $displaysystemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ($returnvalue)
{
$infoline = "ERROR: Could not execute \"$displaysystemcall\"!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$success = 0;
}
else
{
$infoline = "Success: Executed \"$displaysystemcall\" successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
return $success;
@@ -200,24 +201,24 @@ sub make_systemcall_with_warning
{
my ($systemcall, $displaysystemcall) = @_;
- installer::logger::print_message( "... $displaysystemcall ...\n" );
+ $installer::logger::Info->printf("... %s ...\n", $displaysystemcall);
my $success = 1;
my $returnvalue = system($systemcall);
my $infoline = "Systemcall: $displaysystemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ($returnvalue)
{
$infoline = "WARNING: Could not execute \"$displaysystemcall\"!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$success = 0;
}
else
{
$infoline = "Success: Executed \"$displaysystemcall\" successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
return $success;
@@ -256,13 +257,13 @@ sub execute_open_system_call
if ($returnvalue)
{
$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$success = 0;
}
else
{
$infoline = "Success: Executed \"$systemcall\" successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
return ($success, \@openoutput);
@@ -504,7 +505,7 @@ sub cabinet_cosistency_check
my ( $onefile, $followmeinfohash, $filenamehash, $lastsequencehash, $temppath ) = @_;
my $infoline = "Making consistency check of $onefile\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $expandfile = "expand.exe"; # Has to be in the path
if ( $^O =~ /cygwin/i )
@@ -516,12 +517,12 @@ sub cabinet_cosistency_check
if ( $filenamehash == 0 )
{
$infoline = "Warning: Stopping consistency check: Important hash of filenames is empty!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
elsif ( $lastsequencehash == 0 )
{
$infoline = "Warning: Stopping consistency check; Important hash of last sequences is empty!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else # both hashes are available
{
@@ -529,7 +530,7 @@ sub cabinet_cosistency_check
my $sequence = $lastsequencehash->{$onefile};
my $lastfile = $filenamehash->{$sequence};
$infoline = "Check of $onefile: Sequence: $sequence is file: $lastfile\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# Therefore the file $lastfile need to be binary compared.
# It has to be expanded from the cabinet file
@@ -555,12 +556,12 @@ sub cabinet_cosistency_check
if ( ! -f $sourcecabfile )
{
$infoline = "WARNING: Check of cab file cannot happen, because source cabinet file was not found: $sourcecabfile\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
elsif ( ! -f $destcabfile )
{
$infoline = "WARNING: Check of cab file cannot happen, because destination cabinet file was not found: $sourcecabfile\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else # everything is okay for the check
{
@@ -574,14 +575,14 @@ sub cabinet_cosistency_check
my $systemcall = "$expandfile $sourcecabfile $origdiffpath -f:$lastfile ";
$infoline = $systemcall . "\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $success = make_systemcall($systemcall, $systemcall);
if ( ! $success ) { installer::exiter::exit_program("ERROR: Could not successfully execute: $systemcall !", "cabinet_cosistency_check"); }
$systemcall = "$expandfile $destcabfile $newdiffpath -f:$lastfile ";
$infoline = $systemcall . "\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$success = make_systemcall($systemcall, $systemcall);
if ( ! $success ) { installer::exiter::exit_program("ERROR: Could not successfully execute: $systemcall !", "cabinet_cosistency_check"); }
@@ -599,13 +600,13 @@ sub cabinet_cosistency_check
if ( $origsize != $newsize ) # This shows an error!
{
$infoline = "ERROR: Different filesize after signtool.exe was used. Original: $origsize Bytes, new: $newsize. File: $lastfile\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
installer::exiter::exit_program("ERROR: The cabinet file $destcabfile is broken after signtool.exe signed this file !", "cabinet_cosistency_check");
}
else
{
$infoline = "Same size of last file in cabinet file after usage of signtool.exe: $newsize (File: $lastfile)\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# Also making a binary diff?
@@ -620,18 +621,18 @@ sub cabinet_cosistency_check
if ( $success == 0 )
{
$infoline = "Last files are identical after signing cabinet file (File: $lastfile)\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
elsif ( $success == 1 )
{
$infoline = "ERROR: Last files are different after signing cabinet file (File: $lastfile)\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
installer::exiter::exit_program("ERROR: Last files are different after signing cabinet file (File: $lastfile)!", "cabinet_cosistency_check");
}
else
{
$infoline = "ERROR: Problem occured calling diff.exe (File: $lastfile)\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
installer::exiter::exit_program("ERROR: Problem occured calling diff.exe (File: $lastfile) !", "cabinet_cosistency_check");
}
}
@@ -671,7 +672,7 @@ sub sign_files
if ( already_certified($onefile) )
{
$infoline = "Already certified: Skipping file $onefile\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
next;
}
@@ -680,8 +681,16 @@ sub sign_files
while (( $counter <= $maxcounter ) && ( ! $success ))
{
- if ( $counter > 1 ) { installer::logger::print_message( "\n\n... repeating file $onefile ...\n" ); }
- if ( $cabinternal ) { installer::logger::print_message(" Signing: $onefile\n"); }
+ if ( $counter > 1 )
+ {
+ $installer::logger::Info->printf("\n");
+ $installer::logger::Info->printf("\n");
+ $installer::logger::Info->printf("... repeating file %s ...\n", $onefile);
+ }
+ if ( $cabinternal )
+ {
+ $installer::logger::Info->printf(" Signing: %s\n", $onefile);
+ }
my $systemcall = "signtool.exe sign /f \"$pfxfilepath\" /p $pw $productname $url /t \"$timestampurl\" \"$onefile\"";
my $displaysystemcall = "signtool.exe sign /f \"$pfxfilepath\" /p ***** $productname $url /t \"$timestampurl\" \"$onefile\"";
$success = make_systemcall_with_warning($systemcall, $displaysystemcall);
@@ -737,7 +746,7 @@ sub check_ddf_file
}
my $infoline = "Check of ddf file \"$ddffilename\": Maximum length \"$maxlength\" in line \"$maxline\" (allowed line length: 256 characters)\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
#################################################################
@@ -838,9 +847,10 @@ sub read_cab_file
{
my ($cabfilename) = @_;
- installer::logger::print_message( "\n... reading cabinet file $cabfilename ...\n" );
+ $installer::logger::Info->printf("\n");
+ $installer::logger::Info->printf("... reading cabinet file %s ...\n", $cabfilename);
my $infoline = "Reading cabinet file $cabfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $systemcall = "cabarc.exe" . " L " . $cabfilename;
push(@logfile, "$systemcall\n");
@@ -870,9 +880,10 @@ sub unpack_cab_file
{
my ($cabfilename, $temppath) = @_;
- installer::logger::print_message( "\n... unpacking cabinet file $cabfilename ...\n" );
+ $installer::logger::Info->printf("\n");
+ $installer::logger::Info->printf("... unpacking cabinet file %s ...\n", $cabfilename);
my $infoline = "Unpacking cabinet file $cabfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $dirname = $cabfilename;
$dirname =~ s/\.cab\s*$//;
@@ -965,9 +976,10 @@ sub do_pack_cab_file
{
my ($cabfilename, $allfiles, $workingpath, $temppath) = @_;
- installer::logger::print_message( "\n... packing cabinet file $cabfilename ...\n" );
+ $installer::logger::Info->print("\n");
+ $installer::logger::Info->printf("... packing cabinet file %s ...\n", $cabfilename);
my $infoline = "Packing cabinet file $cabfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ( -f $cabfilename ) { unlink($cabfilename); } # removing cab file
if ( -f $cabfilename ) { installer::exiter::exit_program("ERROR: Failed to remove file: $cabfilename!", "do_pack_cab_file"); }
@@ -1049,7 +1061,7 @@ sub already_certified
if ( $success )
{
$is_certified = 1;
- installer::logger::print_message( "... already certified -> skipping $filename ...\n" );
+ $installer::logger::Info->printf("... already certified -> skipping %s ...\n", $filename);
}
return $is_certified;
@@ -1116,7 +1128,7 @@ sub compare_directories
$dir2 =~ s/\/\s*//;
my $infoline = "Comparing directories: $dir1 and $dir2\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
foreach my $onefile ( @{$files} )
{
@@ -1130,7 +1142,7 @@ sub compare_directories
my $size2 = -s $file2;
$infoline = "Comparing files: $file1 ($size1) and $file2 ($size2)\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ( $size1 != $size2 )
{
@@ -1155,7 +1167,7 @@ sub sign_install_set
my $success = 1;
my $infoline = "Signing installation set in $installsetpath\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# check required files.
if ( ! $installer::globals::signfiles_checked ) { check_system_path(); }
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/strip.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/strip.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/strip.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/strip.pm Thu Oct 31 10:37:56 2013
@@ -66,18 +66,15 @@ sub do_strip
my $returnvalue = system($systemcall);
- my $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Systemcall: %s\n", $systemcall);
if ($returnvalue)
{
- $infoline = "ERROR: Could not strip $filename!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("ERROR: Could not strip %s!\n", $filename);
}
else
{
- $infoline = "SUCCESS: Stripped library $filename!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("SUCCESS: Stripped library %s!\n", $filename);
}
}
@@ -123,9 +120,8 @@ sub strip_binaries
{
my $shortfilename = $sourcefilename;
installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$shortfilename);
-
- $infoline = "Strip: $shortfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+
+ $installer::logger::Lang->printf("Strip: %s\n", $shortfilename);
# copy file into directory for stripped libraries
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/update.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/update.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/update.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/update.pm Thu Oct 31 10:37:56 2013
@@ -56,19 +56,16 @@ sub extract_all_tables_from_msidatabase
$systemcall = $msidb . " -d " . $fulldatabasepath . " -f " . $workdir . " -e " . $extraslash . "*";
$returnvalue = system($systemcall);
- $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Systemcall: %s\n", $systemcall);
if ($returnvalue)
{
- $infoline = "ERROR: Could not execute $systemcall !\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("ERROR: Could not execute %s !\n", $systemcall);
installer::exiter::exit_program("ERROR: Could not exclude tables from msi database: $fulldatabasepath !", "extract_all_tables_from_msidatabase");
}
else
{
- $infoline = "Success: Executed $systemcall successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Success: Executed %s successfully!\n", $systemcall);
}
}
@@ -323,17 +320,19 @@ sub readdatabase
if (( $databasename ) && ( $databasename ne "" )) # This is an update packaging process!
{
$installer::globals::updatedatabase = 1;
- installer::logger::print_message( "... update process, using database $databasename ...\n" );
- $infoline = "\nDatabase found in $completelistname: \"$databasename\"\n\n";
+ $installer::logger::Info->printf("... update process, using database %s ...\n", $databasename);
+ $installer::logger::Lang->printf("\n");
+ $installer::logger::Lang->printf("Database found in %s: \"%s\"\n", $completelistname, $databasename);
+ $installer::logger::Lang->printf("\n");
# Saving in global variable
$installer::globals::updatedatabasepath = $databasename;
}
else
{
- # installer::logger::print_message( "... no update process, no database found ...\n" );
- $infoline = "\nNo database found in $completelistname. This is no update process!\n\n";
+ $installer::logger::Lang->printf("\n");
+ $installer::logger::Lang->printf("No database found in %s. This is no update process!\n", $completelistname);
+ $installer::logger::Lang->printf("\n");
}
- push( @installer::globals::logfileinfo, $infoline);
if ( $installer::globals::updatedatabase )
{
@@ -342,7 +341,7 @@ sub readdatabase
my $msifilename = $databasename;
installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$msifilename);
- installer::logger::include_timestamp_into_logfile("Performance Info: readdatabase start");
+ $installer::logger::Lang->add_timestamp("Performance Info: readdatabase start");
# create directory for unpacking
my $databasedir = installer::systemactions::create_directories("database", $languagestringref);
@@ -351,12 +350,12 @@ sub readdatabase
my $fulldatabasepath = $databasedir . $installer::globals::separator . $msifilename;
installer::systemactions::copy_one_file($databasename, $fulldatabasepath);
- installer::logger::include_timestamp_into_logfile("Performance Info: readdatabase: before extracting tables");
+ $installer::logger::Lang->add_timestamp("Performance Info: readdatabase: before extracting tables");
# extract all tables from database
extract_all_tables_from_msidatabase($fulldatabasepath, $databasedir);
- installer::logger::include_timestamp_into_logfile("Performance Info: readdatabase: before reading tables");
+ $installer::logger::Lang->add_timestamp("Performance Info: readdatabase: before reading tables");
# read all tables
$database = read_all_tables_from_msidatabase($databasedir);
@@ -402,7 +401,7 @@ sub readdatabase
# }
# }
- installer::logger::include_timestamp_into_logfile("Performance Info: readdatabase end");
+ $installer::logger::Lang->add_timestamp("Performance Info: readdatabase end");
}
return $database;
@@ -416,7 +415,7 @@ sub readmergedatabase
{
my ( $mergemodules, $languagestringref, $includepatharrayref ) = @_;
- installer::logger::include_timestamp_into_logfile("Performance Info: readmergedatabase start");
+ $installer::logger::Lang->add_timestamp("Performance Info: readmergedatabase start");
my $mergemoduledir = installer::systemactions::create_directories("mergedatabase", $languagestringref);
@@ -461,7 +460,7 @@ sub readmergedatabase
}
}
- installer::logger::include_timestamp_into_logfile("Performance Info: readmergedatabase end");
+ $installer::logger::Lang->add_timestamp("Performance Info: readmergedatabase end");
}
#################################################################################
@@ -593,4 +592,4 @@ sub create_database_hashes
}
-1;
\ No newline at end of file
+1;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/upgrade.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/upgrade.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/upgrade.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/upgrade.pm Thu Oct 31 10:37:56 2013
@@ -124,16 +124,14 @@ sub create_upgrade_table
{
@upgradetable = ();
installer::windows::idtglobal::write_idt_header(\@upgradetable, "upgrade");
- my $infoline = "Beta product -> empty Upgrade table\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Beta product -> empty Upgrade table\n");
}
# Saving the file
my $upgradetablename = $basedir . $installer::globals::separator . "Upgrade.idt";
installer::files::save_file($upgradetablename ,\@upgradetable);
- my $infoline = "Created idt file: $upgradetablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Created idt file: %s\n", $upgradetablename);
}
##############################################################
Modified: openoffice/trunk/main/solenv/bin/modules/installer/worker.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/worker.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/worker.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/worker.pm Thu Oct 31 10:37:56 2013
@@ -52,7 +52,7 @@ sub unpack_all_targzfiles_in_directory
installer::logger::include_header_into_logfile("Unpacking tar.gz files:");
- installer::logger::print_message( "... unpacking tar.gz files ... \n" );
+ $installer::logger::Info->print( "... unpacking tar.gz files ... \n" );
my $localdirectory = $directory . $installer::globals::separator . "packages";
my $alltargzfiles = installer::systemactions::find_file_with_file_extension("tar.gz", $localdirectory);
@@ -65,17 +65,17 @@ sub unpack_all_targzfiles_in_directory
$returnvalue = system($systemcall);
my $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ($returnvalue)
{
$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "Success: Executed \"$systemcall\" successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
}
@@ -97,7 +97,7 @@ sub copy_install_sets_to_ship
if ( ! -d $localshipinstalldir ) { installer::systemactions::create_directory_structure($localshipinstalldir); }
# copy installation set to /ship ($localshipinstalldir)
- installer::logger::print_message( "... copy installation set from " . $destdir . " to " . $localshipinstalldir . "\n" );
+ $installer::logger::Info->print( "... copy installation set from " . $destdir . " to " . $localshipinstalldir . "\n" );
installer::systemactions::copy_complete_directory($destdir, $localshipinstalldir);
if (( ! $installer::globals::iswindowsbuild ) && ( $installer::globals::addjavainstaller ))
@@ -126,16 +126,16 @@ sub link_install_sets_to_ship
installer::logger::include_header_into_logfile("Linking installation set to ship:");
my $infoline = "... destination directory: $shipinstalldir ...\n";
- installer::logger::print_message( $infoline );
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Info->print( $infoline );
+ $installer::logger::Lang->print($infoline);
if ( ! -d $shipinstalldir)
{
$infoline = "Creating directory: $shipinstalldir\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
installer::systemactions::create_directory_structure($shipinstalldir);
$infoline = "Created directory: $shipinstalldir\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
my $dirname = $destdir;
@@ -144,24 +144,24 @@ sub link_install_sets_to_ship
my $localshipinstalldir = $shipinstalldir . $installer::globals::separator . $dirname;
# link installation set to /ship ($localshipinstalldir)
- installer::logger::print_message( "... linking installation set from " . $destdir . " to " . $localshipinstalldir . "\n" );
+ $installer::logger::Lang->print( "... linking installation set from " . $destdir . " to " . $localshipinstalldir . "\n" );
my $systemcall = "ln -s $destdir $localshipinstalldir";
$returnvalue = system($systemcall);
$infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ($returnvalue)
{
$infoline = "ERROR: Could not create link \"$localshipinstalldir\"!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "Success: Created link \"$localshipinstalldir\"!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
return $localshipinstalldir;
@@ -292,14 +292,14 @@ sub save_patchlist_file
$patchlistfilename =~ s/log\_/patchfiles\_/;
$patchlistfilename =~ s/\.log/\.txt/;
installer::files::save_file($installpatchlistdir . $installer::globals::separator . $patchlistfilename, \@installer::globals::patchfilecollector);
- installer::logger::print_message( "... creating patchlist file $patchlistfilename \n" );
+ $installer::logger::Info->print( "... creating patchlist file $patchlistfilename \n" );
if (( $installer::globals::patch ) && ( ! $installer::globals::creating_windows_installer_patch )) # only for non-Windows patches
{
$patchlistfilename =~ s/patchfiles\_/nopatchfiles\_/;
my $nopatchlist = create_nopatchlist();
installer::files::save_file($installpatchlistdir . $installer::globals::separator . $patchlistfilename, $nopatchlist);
- installer::logger::print_message( "... creating patch exclusion file $patchlistfilename \n" );
+ $installer::logger::Info->print( "... creating patch exclusion file $patchlistfilename \n" );
}
}
@@ -313,7 +313,7 @@ sub remove_old_installation_sets
{
my ($basedir) = @_;
- installer::logger::print_message( "... removing old installation directories ...\n" );
+ $installer::logger::Info->print( "... removing old installation directories ...\n" );
my $removedir = $basedir;
@@ -342,7 +342,7 @@ sub remove_old_ship_installation_sets
{
my ($fulldir, $counter) = @_;
- installer::logger::print_message( "... removing old installation directories ...\n" );
+ $installer::logger::Info->print( "... removing old installation directories ...\n" );
my $basedir = $fulldir;
installer::pathanalyzer::get_path_from_fullqualifiedname(\$basedir);
@@ -398,7 +398,7 @@ sub create_installation_directory
else
{
$installdir = installer::systemactions::create_directories("install", $languageref);
- installer::logger::print_message( "... creating installation set in $installdir ...\n" );
+ $installer::logger::Info->print( "... creating installation set in $installdir ...\n" );
remove_old_installation_sets($installdir);
my $inprogressinstalldir = $installdir . "_inprogress";
installer::systemactions::rename_directory($installdir, $inprogressinstalldir);
@@ -421,16 +421,19 @@ sub analyze_and_save_logfile
my $is_success = 1;
my $finalinstalldir = "";
- installer::logger::print_message( "... checking log file " . $loggingdir . $installer::globals::logfilename . "\n" );
-
- my $contains_error = installer::control::check_logfile(\@installer::globals::logfileinfo);
+ $installer::logger::Info->print( "... checking log file " . $loggingdir . $installer::globals::logfilename . "\n" );
+ my $contains_error = installer::control::check_logfile();
+
# Dependent from the success, the installation directory can be renamed and mails can be send.
- if ( $contains_error )
+ if ($contains_error)
{
my $errordir = installer::systemactions::rename_string_in_directory($installdir, "_inprogress", "_witherror");
- if ( $installer::globals::updatepack ) { installer::mail::send_fail_mail($allsettingsarrayref, $languagestringref, $errordir); }
+ if ($installer::globals::updatepack)
+ {
+ installer::mail::send_fail_mail($allsettingsarrayref, $languagestringref, $errordir);
+ }
# Error output to STDERR
for ( my $j = 0; $j <= $#installer::globals::errorlogfileinfo; $j++ )
{
@@ -469,14 +472,21 @@ sub analyze_and_save_logfile
# Saving the logfile in the log file directory and additionally in a log directory in the install directory
my $numberedlogfilename = $installer::globals::logfilename;
- if ( $installer::globals::updatepack ) { $numberedlogfilename =~ s /log_/log_$current_install_number\_/; }
- installer::logger::print_message( "... creating log file $numberedlogfilename \n" );
- installer::files::save_file($loggingdir . $numberedlogfilename, \@installer::globals::logfileinfo);
- installer::files::save_file($installlogdir . $installer::globals::separator . $numberedlogfilename, \@installer::globals::logfileinfo);
-
- # Saving the checksumfile in a checksum directory in the install directory
- # installer::worker::save_checksum_file($current_install_number, $installchecksumdir, $checksumfile);
-
+ if ( $installer::globals::updatepack )
+ {
+ $numberedlogfilename =~ s /log_/log_$current_install_number\_/;
+ }
+ foreach my $log_file_name (
+ $loggingdir . $numberedlogfilename,
+ $installlogdir . $installer::globals::separator . $numberedlogfilename)
+ {
+ if ($log_file_name ne $installer::logger::Lang->{'filename'})
+ {
+ $installer::logger::Info->printf(" copying log file to %s\n", $log_file_name);
+ installer::systemactions::copy_one_file($installer::logger::Lang->{'filename'}, $log_file_name);
+ }
+ }
+
# Saving the list of patchfiles in a patchlist directory in the install directory
if (( $installer::globals::patch ) || ( $installer::globals::creating_windows_installer_patch )) { installer::worker::save_patchlist_file($installlogdir, $numberedlogfilename); }
@@ -502,7 +512,7 @@ sub save_logfile_after_linking
# Saving the logfile in the log file directory and additionally in a log directory in the install directory
my $numberedlogfilename = $installer::globals::logfilename;
if ( $installer::globals::updatepack ) { $numberedlogfilename =~ s /log_/log_$current_install_number\_/; }
- installer::logger::print_message( "... creating log file $numberedlogfilename \n" );
+ $installer::logger::Info->print( "... creating log file $numberedlogfilename \n" );
installer::files::save_file($loggingdir . $numberedlogfilename, \@installer::globals::logfileinfo);
installer::files::save_file($installlogdir . $installer::globals::separator . $numberedlogfilename, \@installer::globals::logfileinfo);
}
@@ -514,13 +524,13 @@ sub save_logfile_after_linking
sub clean_output_tree
{
- installer::logger::print_message( "... cleaning the output tree ...\n" );
+ $installer::logger::Info->print( "... cleaning the output tree ...\n" );
for ( my $i = 0; $i <= $#installer::globals::removedirs; $i++ )
{
if ( -d $installer::globals::removedirs[$i] )
{
- installer::logger::print_message( "... removing directory $installer::globals::removedirs[$i] ...\n" );
+ $installer::logger::Info->print( "... removing directory $installer::globals::removedirs[$i] ...\n" );
installer::systemactions::remove_complete_directory($installer::globals::removedirs[$i], 1);
}
}
@@ -532,7 +542,7 @@ sub clean_output_tree
if ( -d $installer::globals::shiptestdirectory )
{
my $infoline = "Last try to remove $installer::globals::shiptestdirectory . \n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $systemcall = "rmdir $installer::globals::shiptestdirectory";
my $returnvalue = system($systemcall);
}
@@ -546,13 +556,13 @@ sub clean_output_tree
sub clean_jds_temp_dirs
{
- installer::logger::print_message( "... cleaning jds directories ...\n" );
+ $installer::logger::Info->print( "... cleaning jds directories ...\n" );
for ( my $i = 0; $i <= $#installer::globals::jdsremovedirs; $i++ )
{
if ( -d $installer::globals::jdsremovedirs[$i] )
{
- installer::logger::print_message( "... removing directory $installer::globals::jdsremovedirs[$i] ...\n" );
+ $installer::logger::Info->print( "... removing directory $installer::globals::jdsremovedirs[$i] ...\n" );
installer::systemactions::remove_complete_directory($installer::globals::jdsremovedirs[$i], 1);
}
}
@@ -724,7 +734,7 @@ sub remove_all_items_with_special_flag
if ( $styles =~ /\b$flag\b/ )
{
my $infoline = "Attention: Removing from collector: $oneitem->{'Name'} !\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ( $flag eq "BINARYTABLE_ONLY" ) { push(@installer::globals::binarytableonlyfiles, $oneitem); }
next;
}
@@ -748,13 +758,13 @@ sub install_simple ($$$$$$)
my $copyopts = '-af';
$copyopts = '-PpRf' unless ( $ENV{'GNUCOPY'} ); # if not gnucopy, assume POSIX copy
- installer::logger::print_message( "... installing module $packagename ...\n" );
+ $installer::logger::Info->print( "... installing module $packagename ...\n" );
my $destdir = $installer::globals::destdir;
my @lines = ();
- installer::logger::print_message( "DestDir: $destdir \n" );
- installer::logger::print_message( "Rootpath: $installer::globals::rootpath \n" );
+ $installer::logger::Info->print( "DestDir: $destdir \n" );
+ $installer::logger::Info->print( "Rootpath: $installer::globals::rootpath \n" );
`mkdir -p $destdir` if $destdir ne "";
`mkdir -p $destdir$installer::globals::rootpath`;
@@ -1092,7 +1102,7 @@ sub create_inf_file
my $infdir = installer::systemactions::create_directories($infdirname, $languagestringref);
my $infoline = "Number of inf files: $#{$inf_files} + 1 \n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# there are inffiles for all modules
@@ -1115,7 +1125,7 @@ sub create_inf_file
my $onelanguage = ${$languagesarrayref}[$j];
$infoline = "Templatefile: $inf_file_name, Language: $onelanguage \n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $templatefile = installer::files::read_file($templatefilename);
@@ -1124,7 +1134,7 @@ sub create_inf_file
write_content_into_inf_file($templatefile, $filesref, $registryitemsref, $folderref, $folderitemsref, $modulesref, $onelanguage, $inffile, $firstlanguage, $allvariableshashref);
$infoline = "Lines change: From $linesbefore to $#{$templatefile}.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# rename language specific inffile
my $language_inf_file_name = $inf_file_name;
@@ -1135,7 +1145,7 @@ sub create_inf_file
installer::files::save_file($sourcepath, $templatefile);
$infoline = "Saving file: $sourcepath\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# creating new file object
@@ -1342,7 +1352,7 @@ sub prepare_linuxlinkfiles
else { $onefile->{'destination'} = $onefile->{'destination'} . "\.$installer::globals::linuxlibrarybaselevel"; }
my $infoline = "LINUXLINK: Changing file destination from $original_destination to $onefile->{'destination'} !\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# all files without PATCH flag are included into the RPM
if ( ! $ispatchfile ) { push( @filesarray, $onefile); }
@@ -1357,7 +1367,7 @@ sub prepare_linuxlinkfiles
push( @installer::globals::linuxlinks, $linkfile );
$infoline = "LINUXLINK: Created link: $linkfile->{'destination'} pointing to $linkfile->{'destinationfile'} !\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
return \@filesarray;
@@ -1412,7 +1422,7 @@ sub prepare_forced_linuxlinkfiles
$linkfile->{'destination'} = $localdestination . $installer::globals::separator . $onelink->{'Name'};
$infoline = "Forced link into update file: $linkfile->{'destination'} pointing to $linkfile->{'destinationfile'} !\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# The file, defined by the link, has to be included into the
# link array @installer::globals::linuxlinks
@@ -1443,7 +1453,7 @@ sub prepare_forced_linuxlinkfiles
$linkfile->{'destination'} = $localdestination . $installer::globals::separator . $onelink->{'Name'};
$infoline = "Forced link into update file: $linkfile->{'destination'} pointing to $linkfile->{'destinationfile'} !\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# The file, defined by the link, has to be included into the
# link array @installer::globals::linuxlinks
@@ -1684,8 +1694,8 @@ sub prepare_windows_patchfiles
$patchfilename = $winpatchdir . $installer::globals::separator . $patchfilename;
installer::files::save_file($patchfilename, $patchfilelist);
- my $infoline = "\nCreated list of patch files: $patchfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf("Created list of patch files: %s\n", $patchfilename);
# and assigning the new source
$patchlistfile->{'sourcepath'} = $patchfilename;
@@ -1695,8 +1705,8 @@ sub prepare_windows_patchfiles
{
my $filesize = ( -s $patchfilename );
$infoline = "Size of patch file list: $filesize\n\n";
- push( @installer::globals::logfileinfo, $infoline);
- installer::logger::print_message( "... size of patch list file: $filesize Byte ... \n" );
+ $installer::logger::Lang->print($infoline);
+ $installer::logger::Info->print( "... size of patch list file: $filesize Byte ... \n" );
# Win 98: Maximum size of ini file is 65 kB
# if ( $filesize > 64000 ) { installer::exiter::exit_program("ERROR: Maximum size of patch file list is 65 kB (Win98), now reached: $filesize Byte !", "prepare_windows_patchfiles"); }
@@ -1948,13 +1958,13 @@ sub copy_all_packages
else
{
$infoline = "Excluding package (matching): $onepackage\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
else
{
$infoline = "Excluding package (precise name): $onepackage\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
}
@@ -1970,17 +1980,17 @@ sub make_systemcall
my $returnvalue = system($systemcall);
my $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ($returnvalue)
{
$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "Success: Executed \"$systemcall\" successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -1993,7 +2003,7 @@ sub copy_additional_packages
my ($allcopypackages, $destdir, $includepatharrayref) = @_;
my $infoline = "Copy additional packages into installation set.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$destdir =~ s/\/\s*$//;
@@ -2001,7 +2011,7 @@ sub copy_additional_packages
{
my $onepackage = ${$allcopypackages}[$i];
$infoline = "Copy package: $onepackage\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# this package must be delivered into the solver
@@ -2029,9 +2039,10 @@ sub create_jds_sets
{
my ($installationdir, $allvariableshashref, $languagestringref, $languagesarrayref, $includepatharrayref) = @_;
- installer::logger::print_message( "\n******************************************\n" );
- installer::logger::print_message( "... creating jds installation set ...\n" );
- installer::logger::print_message( "******************************************\n" );
+ $installer::logger::Info->print("\n");
+ $installer::logger::Info->print("******************************************\n");
+ $installer::logger::Info->print("... creating jds installation set ...\n");
+ $installer::logger::Info->print("******************************************\n");
installer::logger::include_header_into_logfile("Creating jds installation sets:");
@@ -2072,7 +2083,7 @@ sub create_jds_sets
my $listfile = installer::files::read_file($$filelistnameref);
my $infoline = "Found jds list file: $$filelistnameref\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# substituting the variables
substitute_dollar_variables($listfile, $allvariableshashref);
@@ -2301,8 +2312,7 @@ sub add_variables_from_inc_to_hashref
$includefilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$includefilename, $includepatharrayref, 1);
if ( $$includefilenameref eq "" ) { installer::exiter::exit_program("Include file $includefilename not found!\nADD_INCLUDE_FILES = $allvariables->{'ADD_INCLUDE_FILES'}", "add_variables_from_inc_to_hashref"); }
- $infoline = "Including inc file: $$includefilenameref \n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->printf("Including inc file: %s\n", $$includefilenameref);
my $includefile = installer::files::read_file($$includefilenameref);
@@ -2316,8 +2326,8 @@ sub add_variables_from_inc_to_hashref
my $key = $1;
my $value = $2;
$allvariables->{$key} = $value;
- $infoline = "Setting of variable: $key = $value\n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->printf("Setting of variable: %s = %s\n",
+ $key, $value);
}
}
}
@@ -2330,8 +2340,9 @@ sub add_variables_from_inc_to_hashref
if (( exists($allvariables->{'WINDOWSJAVAVERSION'})) && ( $allvariables->{'WINDOWSJAVAVERSION'} ne "" ))
{
$allvariables->{'JAVAVERSION'} = $allvariables->{'WINDOWSJAVAVERSION'};
- $infoline = "Changing value of property \"JAVAVERSION\" to $allvariables->{'JAVAVERSION'} (property \"WINDOWSJAVAVERSION\").\n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->printf(
+ "Changing value of property \"JAVAVERSION\" to %s (property \"WINDOWSJAVAVERSION\").\n",
+ $allvariables->{'JAVAVERSION'});
}
}
}
@@ -2345,7 +2356,7 @@ sub collect_all_files_from_includepathes
my ($patharrayref) = @_;
installer::logger::globallog("Reading all directories: Start");
- installer::logger::print_message( "... reading include pathes ...\n" );
+ $installer::logger::Info->print( "... reading include pathes ...\n" );
# empty the global
@installer::globals::allincludepathes =();
@@ -2358,8 +2369,9 @@ sub collect_all_files_from_includepathes
if ( ! -d $includepath )
{
- $infoline = "$includepath does not exist. (Can be removed from include path list?)\n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->printf(
+ "%s does not exist. (Can be removed from include path list?)\n",
+ $includepath);
next;
}
@@ -2370,14 +2382,16 @@ sub collect_all_files_from_includepathes
if ( ! ( $#sourcefiles > -1 ))
{
- $infoline = "$includepath is empty. (Can be removed from include path list?)\n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->printf(
+ "%s is empty. (Can be removed from include path list?)\n",
+ $includepath);
}
else
{
my $number = $#sourcefiles + 1;
- $infoline = "Directory $includepath contains $number files (including subdirs)\n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->printf(
+ "Directory %s contains $number files (including subdirs)\n",
+ $includepath);
my %allfileshash = ();
$allfileshash{'includepath'} = $includepath;
@@ -2393,8 +2407,8 @@ sub collect_all_files_from_includepathes
$installer::globals::include_pathes_read = 1;
- installer::logger::globallog("Reading all directories: End");
- push( @installer::globals::globallogfileinfo, "\n");
+ installer::logger::globallog("Reading all directories: End");
+ $installer::logger::Global->print("\n");
}
##############################################
@@ -2478,17 +2492,17 @@ sub call_sum
my $returnvalue = $?; # $? contains the return value of the systemcall
my $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ($returnvalue)
{
$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "Success: Executed \"$systemcall\" successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
return $sumoutput;
@@ -2518,17 +2532,17 @@ sub call_wc
my $returnvalue = $?; # $? contains the return value of the systemcall
my $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ($returnvalue)
{
$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "Success: Executed \"$systemcall\" successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
return $wcoutput;
@@ -2633,17 +2647,17 @@ sub set_time_stamp
my $returnvalue = system($systemcall);
my $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ($returnvalue)
{
$infoline = "ERROR: \"$systemcall\" failed!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "Success: \"$systemcall\" !\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
}
@@ -2684,10 +2698,10 @@ sub generate_cygwin_pathes
{
my ($filesref) = @_;
- installer::logger::include_timestamp_into_logfile("Starting generating cygwin pathes");
+ $installer::logger::Lang->add_timestamp("Starting generating cygwin pathes");
my $infoline = "Generating cygwin pathes (generate_cygwin_pathes)\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $max = 5000; # number of pathes in one file
@@ -2708,7 +2722,7 @@ sub generate_cygwin_pathes
$temppath =~ s/\Q$installer::globals::separator\E\s*$//;
$tmpfilename = $temppath . $installer::globals::separator . $tmpfilename;
$infoline = "Creating temporary file for cygwin conversion: $tmpfilename (contains $counter pathes)\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ( -f $tmpfilename ) { unlink $tmpfilename; }
installer::files::save_file($tmpfilename, \@pathcollector);
@@ -2724,12 +2738,12 @@ sub generate_cygwin_pathes
if ($success)
{
$infoline = "Success: Successfully converted to cygwin pathes!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "ERROR: Failed to convert to cygwin pathes!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
installer::exiter::exit_program("ERROR: Failed to convert to cygwin pathes!", "generate_cygwin_pathes");
}
@@ -2753,12 +2767,12 @@ sub generate_cygwin_pathes
if (( ! exists(${$filesref}[$i]->{'cyg_sourcepath'}) ) || ( ${$filesref}[$i]->{'cyg_sourcepath'} eq "" ))
{
$infoline = "ERROR: No cygwin sourcepath defined for file ${$filesref}[$i]->{'sourcepath'}\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
installer::exiter::exit_program("ERROR: No cygwin sourcepath defined for file ${$filesref}[$i]->{'sourcepath'}!", "generate_cygwin_pathes");
}
}
- installer::logger::include_timestamp_into_logfile("Ending generating cygwin pathes");
+ $installer::logger::Lang->add_timestamp("Ending generating cygwin pathes");
}
##############################################
@@ -2978,18 +2992,18 @@ sub resolving_hidden_flag
else { $onefile->{'destination'} = $destination . $installer::globals::separator . $newfilename; }
$infoline = "Success: Using file with flag HIDDEN from \"$onefile->{'sourcepath'}\"!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "Error: Failed to copy HIDDEN file from \"$sourcefile\" to \"$destfile\"!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
}
$infoline = "\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
################################################
@@ -3053,8 +3067,7 @@ sub set_spellcheckerlanguages
if ($$spellcheckfileref eq "") { installer::exiter::exit_program("ERROR: Could not find $spellcheckfilename!", "set_spellcheckerlanguages"); }
- my $infoline = "Using spellchecker file: $$spellcheckfileref \n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->printf("Using spellchecker file: %s\n", $$spellcheckfileref);
my $spellcheckfile = installer::files::read_file($$spellcheckfileref);
my %spellcheckhash = ();
@@ -3113,9 +3126,8 @@ sub set_spellcheckerlanguages
my $langstring = "";
foreach my $lang (sort keys %installer::globals::spellcheckerlanguagehash) { $langstring = $langstring . "," . $lang }
$langstring =~ s/^\s*,//;
-
- $infoline = "Collected spellchecker languages for spellchecker: $langstring \n";
- push( @installer::globals::globallogfileinfo, $infoline);
+
+ $installer::logger::Global->printf("Collected spellchecker languages for spellchecker: %s\n", $langstring);
}
################################################
@@ -3142,7 +3154,7 @@ sub put_license_into_setup
# Replacement
my $infoline = "Adding licensefile into setup script\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $includestring = "";
for ( my $i = 0; $i <= $#{$licensefile}; $i++ ) { $includestring = $includestring . ${$licensefile}[$i]; }
@@ -3185,17 +3197,17 @@ sub tar_package
my $returnvalue = system($systemcall);
my $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ($returnvalue)
{
$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "Success: Executed \"$systemcall\" successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
my $localcall = "chmod 775 $tarfilename \>\/dev\/null 2\>\&1";
@@ -3223,17 +3235,17 @@ sub untar_package
my $returnvalue = system($systemcall);
my $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ($returnvalue)
{
$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "Success: Executed \"$systemcall\" successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
my $localcall = "chmod 775 $tarfilename \>\/dev\/null 2\>\&1";
@@ -3250,12 +3262,12 @@ sub shuffle_array
# my $counter = 0;
# my $infoline = "Old package order: \n";
- # push( @installer::globals::logfileinfo, $infoline);
+ # $installer::logger::Lang->print($infoline);
# foreach my $onepackage ( @{$arrayref} )
# {
# $counter++;
# $infoline = "$counter: $onepackage->{'module'}\n";
- # push( @installer::globals::logfileinfo, $infoline);
+ # $installer::logger::Lang->print($infoline);
# }
my $i = @$arrayref;
@@ -3267,12 +3279,12 @@ sub shuffle_array
# $counter = 0;
# $infoline = "New package order: \n";
- # push( @installer::globals::logfileinfo, $infoline);
+ # $installer::logger::Lang->print($infoline);
# foreach my $onepackage ( @{$arrayref} )
# {
# $counter++;
# $infoline = "$counter: $onepackage->{'module'}\n";
- # push( @installer::globals::logfileinfo, $infoline);
+ # $installer::logger::Lang->print($infoline);
# }
}
@@ -3305,17 +3317,17 @@ sub set_time_stamp_for_file
my $returnvalue = system($systemcall);
my $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ($returnvalue)
{
$infoline = "ERROR: \"$systemcall\" failed!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "Success: \"$systemcall\" !\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
Modified: openoffice/trunk/main/solenv/bin/modules/installer/xpdinstaller.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/xpdinstaller.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/xpdinstaller.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/xpdinstaller.pm Thu Oct 31 10:37:56 2013
@@ -611,7 +611,7 @@ sub get_size_value
my $rpmname = $packagename;
installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$rpmname);
$infoline = "Filesize $rpmname : $value\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
if ( $installer::globals::issolarispkgbuild )
@@ -671,7 +671,7 @@ sub get_md5_value
my $rpmname = $packagename;
installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$rpmname);
$infoline = "md5sum of $rpmname : $value\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -746,7 +746,7 @@ sub get_fullpkgname_value
installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$rpmname);
$infoline = "Full package name from $rpmname: $value\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
return $value;
@@ -873,23 +873,26 @@ sub make_systemcall
my $returnvalue = $?; # $? contains the return value of the systemcall
my $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ( $logreturn )
{
- for ( my $j = 0; $j <= $#returns; $j++ ) { push( @installer::globals::logfileinfo, "$returns[$j]"); }
+ foreach my $line (@returns)
+ {
+ $installer::logger::Lang->print($line);
+ }
}
if ($returnvalue)
{
$infoline = "ERROR: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$error_occured = 1;
}
else
{
$infoline = "SUCCESS: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
return \@returns;
@@ -914,11 +917,14 @@ sub make_systemcall_allowing_error
my $returnvalue = $?; # $? contains the return value of the systemcall
my $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ( $logreturn )
{
- for ( my $j = 0; $j <= $#returns; $j++ ) { push( @installer::globals::logfileinfo, "$returns[$j]"); }
+ foreach my $line (@returns)
+ {
+ $installer::logger::Lang->print($line);
+ }
}
if ($returnvalue)
@@ -926,20 +932,20 @@ sub make_systemcall_allowing_error
if ( $can_fail )
{
$infoline = "WARNING: Failed system call: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$error_occured = 1;
}
else
{
$infoline = "ERROR: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$error_occured = 1;
}
}
else
{
$infoline = "SUCCESS: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
return (\@returns, $returnvalue);
@@ -1480,7 +1486,7 @@ sub create_emptyparents_xpd_file
installer::files::save_file($xpdfilename, $xpdfile);
push(@installer::globals::allxpdfiles, $xpdfilename);
my $infoline = "Saving xpd file: $xpdfilename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
# push(@installer::globals::emptyxpdparents, $parentgid);
@@ -1595,7 +1601,7 @@ sub create_xpd_file
installer::files::save_file($xpdfilename, $emptyfilecontent);
push(@installer::globals::allxpdfiles, $xpdfilename);
$infoline = "Saving xpd file: $xpdfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$xpdfilename = $newxpdfilename;
change_parent_in_xpdfile($xpdfile, $module->{'XpdPackageName'});
@@ -1605,7 +1611,7 @@ sub create_xpd_file
push( @installer::globals::createdxpdfiles, $modulegid);
push(@installer::globals::allxpdfiles, $xpdfilename);
$infoline = "Saving xpd file: $xpdfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $grandpagid = "root";
if ( $parentgid ne "root" )
@@ -1663,7 +1669,7 @@ sub create_xpd_file_for_childproject
push( @installer::globals::createdxpdfiles, $modulegid);
push(@installer::globals::allxpdfiles, $xpdfilename);
my $infoline = "Saving xpd file: $xpdfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ( $parentgid ne "root" )
{
@@ -1697,7 +1703,7 @@ sub create_xpd_file_for_systemintegratio
# installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$newpackagename);
my $infoline = "Creating xpd file for package: $newpackagename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $childmodule = installer::worker::copy_hash_from_references($module);
$childmodule->{'ParentID'} = $module->{'gid'}; # the module gid is the new parent
@@ -1748,7 +1754,7 @@ sub create_xpd_file_for_systemintegratio
installer::files::save_file($xpdfilename, $xpdfile);
push(@installer::globals::allxpdfiles, $xpdfilename);
$infoline = "Saving xpd file: $xpdfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
# Creating the top level visible xpd file
@@ -1804,7 +1810,7 @@ sub create_setup_xpd
installer::files::save_file($xpdfilename, $xpdfile);
push(@installer::globals::allxpdfiles, $xpdfilename);
my $infoline = "Saving xpd file: $xpdfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
###################################################
Modified: openoffice/trunk/main/solenv/bin/modules/installer/ziplist.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/ziplist.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/ziplist.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/ziplist.pm Thu Oct 31 10:37:56 2013
@@ -584,18 +584,18 @@ sub replace_languages_in_pathes
{
$installer::globals::refresh_includepathes = 1;
$infoline = "Directory $newdir exists and is not empty. Refreshing global file array is required.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "Directory $newdir is empty. No refresh of global file array required.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
else
{
$infoline = "Directory $newdir does not exist. No refresh of global file array required.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
}
@@ -623,10 +623,10 @@ sub list_all_files_from_include_path
my $path = ${$patharrayref}[$i];
installer::remover::remove_leading_and_ending_whitespaces(\$path);
my $infoline = "$path\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
- push( @installer::globals::logfileinfo, "\n");
+ $installer::logger::Lang->print("\n");
return \@filesarray;
}