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 [5/6] - in /openoffice/trunk/main/solenv/bin: ./
modules/installer/ modules/installer/windows/
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/font.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/font.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/font.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/font.pm Thu Oct 31 10:37:56 2013
@@ -68,7 +68,7 @@ sub create_font_table
my $fonttablename = $basedir . $installer::globals::separator . "Font.idt";
installer::files::save_file($fonttablename ,\@fonttable);
my $infoline = "Created idt file: $fonttablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
@@ -92,12 +92,12 @@ sub get_font_version
{
$fontversion = $1;
$infoline = "FONT: Font \"$fontfile\" version: $fontversion\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "FONT: Could not determine font version: \"$fontfile\"\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
return $fontversion;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/icon.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/icon.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/icon.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/icon.pm Thu Oct 31 10:37:56 2013
@@ -65,9 +65,7 @@ sub create_icon_table
my $icontablename = $basedir . $installer::globals::separator . "Icon.idt";
installer::files::save_file($icontablename ,\@icontable);
- my $infoline = "Created idt file: $icontablename\n";
- push(@installer::globals::logfileinfo, $infoline);
-
+ $installer::logger::Lang->printf("Created idt file: %s\n", $icontablename);
}
1;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/idtglobal.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/idtglobal.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/idtglobal.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/idtglobal.pm Thu Oct 31 10:37:56 2013
@@ -790,8 +790,12 @@ sub prepare_language_idt_directory
if ( $allvariables->{'WINDOWSBITMAPDIRECTORY'} ) { $bitmapdir = $allvariables->{'WINDOWSBITMAPDIRECTORY'}; }
my $newsourcedir = $installer::globals::unpackpath . $installer::globals::separator . $bitmapdir; # path setting in list file dependent from unpackpath !?
- $infoline = "\nOverwriting files in directory \"" . $destinationdir . $installer::globals::separator . "Binary" . "\" with files from directory \"" . $newsourcedir . "\".\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("\n");
+ $installer::logger::Lang->printf(
+ "Overwriting files in directory \"%s%sBinary\" with files from directory \"%s\".\n",
+ $destinationdir,
+ $installer::globals::separator,
+ $newsourcedir);
if ( ! -d $newsourcedir )
{
my $currentdir = cwd();
@@ -856,8 +860,7 @@ sub get_rtflicensefilesource
if ($$sourcefileref eq "") { installer::exiter::exit_program("ERROR: Could not find $licensefilename!", "get_rtflicensefilesource"); }
- my $infoline = "Using licensefile: $$sourcefileref\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Using licensefile: %s\n", $$sourcefileref);
return $$sourcefileref;
}
@@ -1041,7 +1044,7 @@ sub add_officedir_to_database
installer::files::save_file($customactionfilename ,$customacfile);
my $infoline = "Updated idt file: $customactionfilename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
@@ -1282,7 +1285,7 @@ sub set_custom_action
push(@{$customactionidttable}, $line);
$infoline = "Added $actionname CustomAction into table $customactionidttablename (NO_FILE has been set)\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$included_customaction = 1;
return $included_customaction;
@@ -1335,7 +1338,7 @@ sub set_custom_action
if ( $included_customaction ) { $infoline = "Added $actionname CustomAction into table $customactionidttablename\n"; }
else { $infoline = "Did not add $actionname CustomAction into table $customactionidttablename\n"; }
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
return $included_customaction;
}
@@ -1368,7 +1371,7 @@ sub add_custom_action_to_install_table
push(@{$installtable}, $line);
$infoline = "Added $actionname CustomAction into table $installtablename (NO_FILE has been set)\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
return;
}
@@ -1423,7 +1426,7 @@ sub add_custom_action_to_install_table
if ( $included_customaction ) { $infoline = "Added $actionname CustomAction into table $installtablename\n"; }
else { $infoline = "Did not add $actionname CustomAction into table $installtablename\n"; }
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
@@ -1443,7 +1446,7 @@ sub connect_custom_action_to_control
$line =~ s/\s*$//g;
$infoline = "Added line \"$line\" into table $tablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
##################################################################
@@ -1462,7 +1465,7 @@ sub connect_condition_to_control
$line =~ s/\s*$//g;
$infoline = "Added line \"$line\" into table $tablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
##################################################################
@@ -1618,7 +1621,7 @@ sub include_subdirname_into_directory_ta
push(@{$directorytable}, $line);
installer::remover::remove_leading_and_ending_whitespaces(\$line);
$infoline = "Added $line into directory table $directorytablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$includedline = 1;
last;
@@ -1659,7 +1662,7 @@ sub include_subdir_into_componenttable
installer::remover::remove_leading_and_ending_whitespaces(\$oldvalue);
installer::remover::remove_leading_and_ending_whitespaces(\$newvalue);
$infoline = "Change in Component table: From \"$oldvalue\" to \"$newvalue\"\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$changeddirectory = 1;
last;
@@ -1727,7 +1730,7 @@ sub add_childprojects
$infoline = "SystemFolder already exists in table $directorytablename\n";
}
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# Additional content for the directory table
# subjava INSTALLLOCATION program:java
@@ -1763,7 +1766,7 @@ sub add_childprojects
push(@{$customactiontable} ,$line);
installer::remover::remove_leading_and_ending_whitespaces(\$line);
$infoline = "Added $line into table $customactiontablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
if ( $allvariables->{'UREPRODUCT'} )
@@ -1772,7 +1775,7 @@ sub add_childprojects
push(@{$customactiontable} ,$line);
installer::remover::remove_leading_and_ending_whitespaces(\$line);
$infoline = "Added $line into table $customactiontablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
if ( $allvariables->{'JAVAPRODUCT'} )
@@ -1781,7 +1784,7 @@ sub add_childprojects
push(@{$customactiontable} ,$line);
installer::remover::remove_leading_and_ending_whitespaces(\$line);
$infoline = "Added $line into table $customactiontablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
if ( $allvariables->{'UREPRODUCT'} )
@@ -1790,7 +1793,7 @@ sub add_childprojects
push(@{$customactiontable} ,$line);
installer::remover::remove_leading_and_ending_whitespaces(\$line);
$infoline = "Added $line into table $customactiontablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
# Content for InstallUISequence table
@@ -1808,7 +1811,7 @@ sub add_childprojects
push(@{$installuitable} ,$line);
installer::remover::remove_leading_and_ending_whitespaces(\$line);
$infoline = "Added $line into table $installuitablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
if ( $allvariables->{'JAVAPRODUCT'} )
@@ -1820,7 +1823,7 @@ sub add_childprojects
push(@{$installuitable} ,$line);
installer::remover::remove_leading_and_ending_whitespaces(\$line);
$infoline = "Added $line into table $installuitablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
if ( $allvariables->{'ADAPRODUCT'} )
@@ -1831,7 +1834,7 @@ sub add_childprojects
push(@{$installuitable} ,$line);
installer::remover::remove_leading_and_ending_whitespaces(\$line);
$infoline = "Added $line into table $installuitablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
if ( $allvariables->{'JAVAPRODUCT'} )
@@ -1843,7 +1846,7 @@ sub add_childprojects
push(@{$installuitable} ,$line);
installer::remover::remove_leading_and_ending_whitespaces(\$line);
$infoline = "Added $line into table $installuitablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
if ( $allvariables->{'UREPRODUCT'} )
@@ -1855,7 +1858,7 @@ sub add_childprojects
push(@{$installuitable} ,$line);
installer::remover::remove_leading_and_ending_whitespaces(\$line);
$infoline = "Added $line into table $installuitablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
if ( $allvariables->{'UREPRODUCT'} )
@@ -1867,7 +1870,7 @@ sub add_childprojects
push(@{$installuitable} ,$line);
installer::remover::remove_leading_and_ending_whitespaces(\$line);
$infoline = "Added $line into table $installuitablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
# Content for Feature table, better from scp (translation)
@@ -2101,8 +2104,8 @@ sub set_positions_in_table
{
my ( $sequencetable, $tablename ) = @_;
- my $infoline = "\nSetting positions in table \"$tablename\".\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf("Setting positions in table \"%s\".\n", $tablename);
# Step 1: Resolving all occurences of "POSITIONTEMPLATE_end"
@@ -2116,7 +2119,7 @@ sub set_positions_in_table
$lastposition = $lastposition + 25;
${$sequencetable}[$i] =~ s/POSITIONTEMPLATE_end/$lastposition/;
$infoline = "Setting position \"$lastposition\" for custom action \"$customaction\".\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -2166,12 +2169,12 @@ sub set_positions_in_table
${$sequencetable}[$i] =~ s/$templatename/$newposition/;
$template_replaced = 1;
$infoline = "Setting position \"$newposition\" for custom action \"$onename\" (scp: \"$positionname\" at position $position).\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "Could not assign position for custom action \"$onename\" yet (scp: \"$positionname\").\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
}
@@ -2207,13 +2210,13 @@ sub set_positions_in_table
$lastposition = $lastposition + 25;
${$sequencetable}[$i] =~ s/$fulltemplate/$lastposition/;
$infoline = "WARNING: Setting position \"$lastposition\" for custom action \"$customactionname\". Could not find CustomAction \"$template\".\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
# $templatestring =~ s/,\s*$//;
# $infoline = "Error: Saving table \"$tablename\"\n";
- # push(@installer::globals::logfileinfo, $infoline);
+ # $installer::logger::Lang->print($infoline);
# print $infoline;
# installer::files::save_file($tablename, $sequencetable);
# installer::exiter::exit_program("ERROR: Unresolved positions in CustomActions in scp2: $templatestring", "set_positions_in_table");
@@ -2229,7 +2232,8 @@ sub addcustomactions
{
my ($languageidtdir, $customactions, $filesarray) = @_;
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: addcustomactions start\n");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: addcustomactions start\n");
my $customactionidttablename = $languageidtdir . $installer::globals::separator . "CustomAc.idt";
my $customactionidttable = installer::files::read_file($customactionidttablename);
@@ -2344,19 +2348,20 @@ sub addcustomactions
installer::files::save_file($controlconditiontablename, $controlconditiontable);
my $infoline = "Updated idt file: $customactionidttablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Updated idt file: $installexecutetablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Updated idt file: $adminexecutetablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Updated idt file: $installuitablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Updated idt file: $controleventtablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Updated idt file: $controlconditiontablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: addcustomactions end\n");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: addcustomactions end\n");
}
##########################################################################
@@ -2427,11 +2432,11 @@ sub setbidiattributes
installer::files::save_file($dialogfilename, $dialogfile);
$infoline = "Set bidi support in idt file \"$dialogfilename\" for language $onelanguage\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
installer::files::save_file($controlfilename, $controlfile);
$infoline = "Set bidi support in idt file \"$controlfilename\" for language $onelanguage\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
1;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/inifile.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/inifile.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/inifile.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/inifile.pm Thu Oct 31 10:37:56 2013
@@ -134,9 +134,7 @@ sub create_inifile_table
my $inifiletablename = $basedir . $installer::globals::separator . "IniFile.idt";
installer::files::save_file($inifiletablename ,\@inifiletable);
- my $infoline = "Created idt file: $inifiletablename\n";
- push(@installer::globals::logfileinfo, $infoline);
-
+ $installer::logger::Lang->printf("Created idt file: %s\n", $inifiletablename);
}
1;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/java.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/java.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/java.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/java.pm Thu Oct 31 10:37:56 2013
@@ -101,15 +101,15 @@ sub update_java_tables
installer::files::save_file($reglocatfilename ,$reglocatfile);
my $infoline = "Updated idt file for Java: $reglocatfilename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
installer::files::save_file($appsearchfilename ,$appsearchfile);
$infoline = "Updated idt file for Java: $appsearchfilename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
installer::files::save_file($signaturefilename ,$signaturefile);
$infoline = "Updated idt file: $signaturefilename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/media.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/media.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/media.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/media.pm Thu Oct 31 10:37:56 2013
@@ -277,8 +277,9 @@ sub create_media_table
}
else
{
- my $localinfoline = "Warning: Could not find cabinet file \"$media{'Cabinet'}}\" in update database. This seems to be an new cabinet file!?\n";
- push(@installer::globals::logfileinfo, $localinfoline);
+ $installer::logger::Lang->printf(
+ "Warning: Could not find cabinet file \"%s}\" in update database. This seems to be an new cabinet file!?\n",
+ $media{'Cabinet'});
}
}
}
@@ -447,8 +448,7 @@ sub create_media_table
my $mediatablename = $basedir . $installer::globals::separator . "Media.idt";
installer::files::save_file($mediatablename ,\@mediatable);
- my $infoline = "Created idt file: $mediatablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Created idt file: %s\n", $mediatablename);
}
1;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/mergemodule.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/mergemodule.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/mergemodule.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/mergemodule.pm Thu Oct 31 10:37:56 2013
@@ -52,8 +52,9 @@ sub merge_mergemodules_into_msi_database
if ( $domerge )
{
installer::logger::include_header_into_logfile("Merging merge modules into msi database");
- installer::logger::print_message( "... merging msm files into msi database ... \n" );
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: MergeModule into msi database, start");
+ $installer::logger::Info->printf("... merging msm files into msi database ... \n");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: MergeModule into msi database, start");
my $msidb = "msidb.exe"; # Has to be in the path
my $cabinetfile = "MergeModule.CABinet"; # the name of each cabinet file in a merge file
@@ -68,9 +69,10 @@ sub merge_mergemodules_into_msi_database
if ( ! $installer::globals::mergemodules_analyzed )
{
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: Analyzing MergeModules, start");
- $infoline = "Analyzing all Merge Modules\n\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: Analyzing MergeModules, start");
+ $installer::logger::Lang->print("Analyzing all Merge Modules\n");
+ $installer::logger::Lang->print("\n");
%installer::globals::mergemodules = ();
@@ -91,7 +93,7 @@ sub merge_mergemodules_into_msi_database
if ( ! -d $workdir ) { installer::systemactions::create_directory($workdir); }
$infoline = "Analyzing Merge Module: $filename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# copy msm file into working directory
my $completedest = $workdir . $installer::globals::separator . $filename;
@@ -111,18 +113,18 @@ sub merge_mergemodules_into_msi_database
$returnvalue = system($systemcall);
$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);
installer::exiter::exit_program("ERROR: Could not extract cabinet file from merge file: $completedest !", "merge_mergemodules_into_msi_database");
}
else
{
$infoline = "Success: Executed $systemcall successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
# exclude tables from mergefile
@@ -147,18 +149,18 @@ sub merge_mergemodules_into_msi_database
$returnvalue = system($systemcall);
$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);
installer::exiter::exit_program("ERROR: Could not exclude tables from merge file: $completedest !", "merge_mergemodules_into_msi_database");
}
else
{
$infoline = "Success: Executed $systemcall successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
# Determining files
@@ -320,13 +322,14 @@ sub merge_mergemodules_into_msi_database
}
$infoline = "All Merge Modules successfully analyzed\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$installer::globals::mergemodules_analyzed = 1;
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: Analyzing MergeModules, stop");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: Analyzing MergeModules, stop");
$infoline = "\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
# 2. Change msi database (has to be done for every msi database -> for every language)
@@ -344,7 +347,7 @@ sub merge_mergemodules_into_msi_database
$counter++;
installer::logger::include_header_into_logfile("Merging Module: $mergemodulehash->{'name'}");
- installer::logger::print_message( "\t... $mergemodulehash->{'name'} ... \n" );
+ $installer::logger::Info->printf("\t... %s ... \n", $mergemodulehash->{'name'});
$msifilename = installer::converter::make_path_conform($msifilename);
my $workdir = $msifilename;
@@ -360,7 +363,8 @@ sub merge_mergemodules_into_msi_database
# Merging msm file, this is the "real" merge command
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: Before merging database");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: Before merging database");
if ( $^O =~ /cygwin/i ) {
# msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
@@ -377,21 +381,22 @@ sub merge_mergemodules_into_msi_database
$returnvalue = system($systemcall);
$infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ($returnvalue)
{
$infoline = "ERROR: Could not execute $systemcall . Returnvalue: $returnvalue!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
installer::exiter::exit_program("ERROR: Could not merge msm file into database: $mergemodulehash->{'mergefilepath'} !", "merge_mergemodules_into_msi_database");
}
else
{
$infoline = "Success: Executed $systemcall successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: After merging database");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: After merging database");
# Saving original idt files
if ( -f "File.idt" ) { installer::systemactions::rename_one_file("File.idt", "File.idt.$counter"); }
@@ -405,7 +410,8 @@ sub merge_mergemodules_into_msi_database
# Extracting tables
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: Before extracting tables");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: Before extracting tables");
my $workingtables = "File Media Directory FeatureComponents"; # required tables
# Optional tables can be added now
@@ -427,21 +433,22 @@ sub merge_mergemodules_into_msi_database
$returnvalue = system($systemcall);
$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);
installer::exiter::exit_program("ERROR: Could not exclude tables from msi database: $msifilename !", "merge_mergemodules_into_msi_database");
}
else
{
$infoline = "Success: Executed $systemcall successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: After extracting tables");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: After extracting tables");
# Using 8+3 table names, that are used, when tables are integrated into database. The export of tables
# creates idt-files, that have long names.
@@ -451,17 +458,22 @@ sub merge_mergemodules_into_msi_database
if ( -f "MsiAssembly.idt" ) { installer::systemactions::rename_one_file("MsiAssembly.idt", "MsiAssem.idt"); }
# Changing content of tables: File, Media, Directory, FeatureComponent, MsiAssembly
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: Changing Media table");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: Changing Media table");
change_media_table($mergemodulehash, $workdir, $mergemodulegid, $allupdatelastsequences, $allupdatediskids);
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: Changing File table");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: Changing File table");
$filesref = change_file_table($mergemodulehash, $workdir, $allupdatesequences, $includepatharrayref, $filesref, $mergemodulegid);
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: Changing FeatureComponent table");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: Changing FeatureComponent table");
change_featurecomponent_table($mergemodulehash, $workdir);
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: Changing Directory table");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: Changing Directory table");
change_directory_table($mergemodulehash, $workdir);
if ( $mergemodulehash->{'hasmsiassemblies'} )
{
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: Changing MsiAssembly table");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: Changing MsiAssembly table");
change_msiassembly_table($mergemodulehash, $workdir);
}
@@ -523,29 +535,35 @@ sub merge_mergemodules_into_msi_database
# into tables InstallExecuteSequence, AdminExecuteSequence and AdvtExecuteSequence
if ( -f "ModuleInstallExecuteSequence.idt" )
{
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: Changing InstallExecuteSequence table");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: Changing InstallExecuteSequence table");
change_executesequence_table($mergemodulehash, $workdir, "InstallE.idt", "ModuleInstallExecuteSequence.idt");
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: Changing InstallUISequence table");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: Changing InstallUISequence table");
change_executesequence_table($mergemodulehash, $workdir, "InstallU.idt", "ModuleInstallExecuteSequence.idt");
}
if ( -f "ModuleAdminExecuteSequence.idt" )
{
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: Changing AdminExecuteSequence table");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: Changing AdminExecuteSequence table");
change_executesequence_table($mergemodulehash, $workdir, "AdminExe.idt", "ModuleAdminExecuteSequence.idt");
}
if ( -f "ModuleAdvtExecuteSequence.idt" )
{
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: Changing AdvtExecuteSequence table");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: Changing AdvtExecuteSequence table");
change_executesequence_table($mergemodulehash, $workdir, "AdvtExec.idt", "ModuleAdvtExecuteSequence.idt");
}
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: All tables edited");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: All tables edited");
# Including tables into msi database
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: Before including tables");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: Before including tables");
if ( $^O =~ /cygwin/i ) {
# msidb.exe really wants backslashes. (And double escaping because system() expands the string.)
@@ -562,28 +580,30 @@ sub merge_mergemodules_into_msi_database
$returnvalue = system($systemcall);
$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);
installer::exiter::exit_program("ERROR: Could not include tables into msi database: $msifilename !", "merge_mergemodules_into_msi_database");
}
else
{
$infoline = "Success: Executed $systemcall successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: After including tables");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: After including tables");
chdir($from);
}
if ( ! $installer::globals::mergefiles_added_into_collector ) { $installer::globals::mergefiles_added_into_collector = 1; } # Now all mergemodules are merged for one language.
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: MergeModule into msi database, stop");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: MergeModule into msi database, stop");
}
return $filesref;
@@ -819,7 +839,7 @@ sub set_last_cabfile_name
if ( $mediafile->{$line}->{'DiskId'} == $lastdiskid ) { $installer::globals::lastcabfilename = $mediafile->{$line}->{'Cabinet'}; }
}
my $infoline = "Setting last cabinet file: $installer::globals::lastcabfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
#########################################################################
@@ -832,7 +852,7 @@ sub change_media_table
my ( $mergemodulehash, $workdir, $mergemodulegid, $allupdatelastsequences, $allupdatediskids ) = @_;
my $infoline = "Changing content of table \"Media\"\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $filename = "Media.idt";
if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find file \"$filename\" in \"$workdir\" !", "change_media_table"); }
@@ -857,11 +877,11 @@ sub change_media_table
my $start = $1;
my $final = $2;
$infoline = "Merge: Old line in media table: ${$filecontent}[$i]\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $newline = $start . $newmaxsequencenumber . $final . "\n";
${$filecontent}[$i] = $newline;
$infoline = "Merge: Changed line in media table: ${$filecontent}[$i]\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
}
@@ -874,7 +894,7 @@ sub change_media_table
}
$infoline = "Adding line: $installer::globals::merge_media_line{$mergemodulegid}\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# adding new line
push(@{$filecontent}, $installer::globals::merge_media_line{$mergemodulegid});
@@ -1072,7 +1092,7 @@ sub change_file_table
my ($mergemodulehash, $workdir, $allupdatesequenceshashref, $includepatharrayref, $filesref, $mergemodulegid) = @_;
my $infoline = "Changing content of table \"File\"\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $idtfilename = "File.idt";
if ( ! -f $idtfilename ) { installer::exiter::exit_program("ERROR: Could not find file \"$idtfilename\" in \"$workdir\" !", "change_file_table"); }
@@ -1133,7 +1153,7 @@ sub change_file_table
# should be available on every Windows system.
$infoline = "Unpacking cabinet file: $mergemodulehash->{'cabinetfile'}\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# Avoid the Cygwin expand command
my $expandfile = "expand.exe"; # Has to be in the path
@@ -1161,18 +1181,18 @@ sub change_file_table
my $returnvalue = system($systemcall);
$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);
installer::exiter::exit_program("ERROR: Could not extract cabinet file: $mergemodulehash->{'cabinetfile'} !", "change_file_table");
}
else
{
$infoline = "Success: Executed $systemcall successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
chdir($from);
@@ -1216,11 +1236,11 @@ sub change_file_table
${$filecontent}[$linenumber] = $newline;
$infoline = "Merge, replacing line:\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Old: $oldline\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "New: $newline\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# Adding files to the files collector (but only once)
if (( $installer::globals::fix_number_of_cab_files ) && ( ! $installer::globals::mergefiles_added_into_collector ))
@@ -1343,7 +1363,7 @@ sub change_featurecomponent_table
my ($mergemodulehash, $workdir) = @_;
my $infoline = "Changing content of table \"FeatureComponents\"\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $idtfilename = "FeatureC.idt";
if ( ! -f $idtfilename ) { installer::exiter::exit_program("ERROR: Could not find file \"$idtfilename\" in \"$workdir\" !", "change_featurecomponent_table"); }
@@ -1370,7 +1390,7 @@ sub change_featurecomponent_table
my $line = "$feature\t$component\n";
push(@{$filecontent}, $line);
$infoline = "Adding line: $line\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
# saving file
@@ -1392,7 +1412,7 @@ sub change_directory_table
if ( $scpdirectory ne "TARGETDIR" ) # TARGETDIR works fine, when using msidb.exe
{
my $infoline = "Changing content of table \"Directory\"\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $idtfilename = "Director.idt";
if ( ! -f $idtfilename ) { installer::exiter::exit_program("ERROR: Could not find file \"$idtfilename\" in \"$workdir\" !", "change_directory_table"); }
@@ -1432,11 +1452,11 @@ sub change_directory_table
${$filecontent}[$linenumber] = $newline;
$infoline = "Merge, replacing line:\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Old: $oldline\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "New: $newline\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -1454,7 +1474,7 @@ sub change_msiassembly_table
my ($mergemodulehash, $workdir) = @_;
my $infoline = "Changing content of table \"MsiAssembly\"\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $idtfilename = "MsiAssem.idt";
if ( ! -f $idtfilename ) { installer::exiter::exit_program("ERROR: Could not find file \"$idtfilename\" in \"$workdir\" !", "change_msiassembly_table"); }
@@ -1492,11 +1512,11 @@ sub change_msiassembly_table
${$filecontent}[$linenumber] = $newline;
$infoline = "Merge, replacing line:\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Old: $oldline\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "New: $newline\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
# saving file
@@ -1581,7 +1601,7 @@ sub change_executesequence_table
my ($mergemodulehash, $workdir, $idtfilename, $moduleidtfilename) = @_;
my $infoline = "Changing content of table \"$idtfilename\"\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ( ! -f $idtfilename ) { installer::exiter::exit_program("ERROR: Could not find file \"$idtfilename\" in \"$workdir\" !", "change_executesequence_table"); }
if ( ! -f $moduleidtfilename ) { installer::exiter::exit_program("ERROR: Could not find file \"$moduleidtfilename\" in \"$workdir\" !", "change_executesequence_table"); }
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/msiglobal.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/msiglobal.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/msiglobal.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/msiglobal.pm Thu Oct 31 10:37:56 2013
@@ -101,7 +101,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);
}
##########################################################################
@@ -162,7 +162,7 @@ sub generate_cab_file_list
installer::logger::include_header_into_logfile("Generating ddf files");
- installer::logger::include_timestamp_into_logfile("Performance Info: ddf file generation start");
+ $installer::logger::Lang->add_timestamp("Performance Info: ddf file generation start");
if ( $^O =~ /cygwin/i ) { installer::worker::generate_cygwin_pathes($filesref); }
@@ -244,7 +244,7 @@ sub generate_cab_file_list
installer::files::save_file($ddffilename ,\@ddffile);
my $infoline = "Created ddf file: $ddffilename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# lines in ddf files must not be longer than 256 characters
check_ddf_file(\@ddffile, $ddffilename);
@@ -337,7 +337,7 @@ sub generate_cab_file_list
installer::files::save_file($ddffilename ,\@ddffile);
my $infoline = "Created ddf file: $ddffilename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# lines in ddf files must not be longer than 256 characters
check_ddf_file(\@ddffile, $ddffilename);
@@ -413,7 +413,7 @@ sub generate_cab_file_list
installer::files::save_file($ddffilename ,\@ddffile);
my $infoline = "Created ddf file: $ddffilename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# lines in ddf files must not be longer than 256 characters
check_ddf_file(\@ddffile, $ddffilename);
@@ -476,7 +476,7 @@ sub generate_cab_file_list
installer::files::save_file($ddffilename ,\@ddffile);
my $infoline = "Created ddf file: $ddffilename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# lines in ddf files must not be longer than 256 characters
check_ddf_file(\@ddffile, $ddffilename);
@@ -528,7 +528,7 @@ sub generate_cab_file_list
installer::files::save_file($ddffilename ,\@ddffile);
my $infoline = "Created ddf file: $ddffilename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# lines in ddf files must not be longer than 256 characters
check_ddf_file(\@ddffile, $ddffilename);
@@ -547,7 +547,7 @@ sub generate_cab_file_list
installer::exiter::exit_program("ERROR: No cab file specification in globals.pm !", "create_media_table");
}
- installer::logger::include_timestamp_into_logfile("Performance Info: ddf file generation end");
+ $installer::logger::Lang->add_timestamp("Performance Info: ddf file generation end");
return \@cabfilelist; # contains all system calls for packaging process
}
@@ -593,7 +593,7 @@ sub save_packorder
{
installer::logger::include_header_into_logfile("Saving pack order");
- installer::logger::include_timestamp_into_logfile("Performance Info: saving pack order start");
+ $installer::logger::Lang->add_timestamp("Performance Info: saving pack order start");
my $packorderfilename = "packorder.txt";
$packorderfilename = $installer::globals::infodirectory . $installer::globals::separator . $packorderfilename;
@@ -638,7 +638,7 @@ sub save_packorder
installer::files::save_file($packorderfilename ,\@packorder);
- installer::logger::include_timestamp_into_logfile("Performance Info: saving pack order end");
+ $installer::logger::Lang->add_timestamp("Performance Info: saving pack order end");
}
#################################################################
@@ -708,17 +708,17 @@ sub create_msi_database
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 $msidb!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "Success: Executed $msidb successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -812,7 +812,7 @@ sub get_packagecode_for_sis
my $guid = "\{" . ${$guidref}[0] . "\}";
my $infoline = "PackageCode: $guid\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
return $guid;
}
@@ -949,17 +949,17 @@ sub write_summary_into_msi_database
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 $msiinfo!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "Success: Executed $msiinfo successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -1004,7 +1004,7 @@ sub create_transforms
my $returnvalue = system($systemcall);
my $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# Problem: msitran.exe in version 4.0 always returns "1", even if no failure occured.
# Therefore it has to be checked, if this is version 4.0. If yes, if the mst file
@@ -1015,7 +1015,7 @@ sub create_transforms
if ($returnvalue)
{
$infoline = "WARNING: Returnvalue of $msitran is not 0. Checking version of $msitran!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
open(FILE, "<$installer::globals::msitranpath") or die "ERROR: Can't open $installer::globals::msitranpath for creating file hash";
binmode(FILE);
@@ -1028,9 +1028,9 @@ sub create_transforms
foreach my $problemchecksum ( @problemchecksums )
{
$infoline = "Checksum of problematic MsiTran.exe: $problemchecksum\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Checksum of used MsiTran.exe: $digest\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ( $digest eq $problemchecksum ) { $isproblemchecksum = 1; }
}
@@ -1040,45 +1040,45 @@ sub create_transforms
if ( -f $transformfile )
{
$infoline = "File $transformfile exists.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $filesize = ( -s $transformfile );
$infoline = "Size of $transformfile: $filesize\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ( $filesize > 0 )
{
$infoline = "Info: Returnvalue $returnvalue of $msitran is no problem :-) .\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$returnvalue = 0; # reset the error
}
else
{
$infoline = "Filesize indicates that an error occured.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
else
{
$infoline = "File $transformfile does not exist -> An error occured.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
else
{
$infoline = "This is not a problematic version of msitran.exe. Therefore the error is not caused by problematic msitran.exe.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
if ($returnvalue)
{
$infoline = "ERROR: Could not execute $msitran!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "Success: Executed $msitran successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
# The reference database can be deleted
@@ -1089,7 +1089,7 @@ sub create_transforms
if ( $result == 0 )
{
$infoline = "ERROR: Could not remove file $$referencedbname !\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
installer::exiter::exit_program($infoline, "create_transforms");
}
}
@@ -1337,7 +1337,7 @@ sub create_setup_ini
installer::files::save_file($setupinifilename, $setupinifile);
$infoline = "Generated file $setupinifilename !\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
#################################################################
@@ -1479,19 +1479,19 @@ sub get_guid_list
close (UUIDGEN);
my $infoline = "Systemcall: $systemcall\n";
- if ( $log ) { push( @installer::globals::logfileinfo, $infoline); }
+ if ( $log ) { $installer::logger::Lang->print($infoline); }
my $comparenumber = $#uuidlist + 1;
if ( $comparenumber == $number )
{
$infoline = "Success: Executed $uuidgen successfully!\n";
- if ( $log ) { push( @installer::globals::logfileinfo, $infoline); }
+ if ( $log ) { $installer::logger::Lang->print($infoline); }
}
else
{
$infoline = "ERROR: Could not execute $uuidgen successfully!\n";
- if ( $log ) { push( @installer::globals::logfileinfo, $infoline); }
+ if ( $log ) { $installer::logger::Lang->print($infoline); }
}
# uppercase, no longer "-c", because this is only supported in uuidgen.exe v.1.01
@@ -1678,12 +1678,12 @@ sub set_uuid_into_component_table
# # installer::files::save_file($installer::globals::componentfilename, $componentfile); # version using new file in solver
#
# $infoline = "COMPONENTCODES: Created $counter new GUIDs for components ! \n";
-# push( @installer::globals::logfileinfo, $infoline);
+# $installer::logger::Lang->print($infoline);
# }
# else
# {
# $infoline = "SUCCESS COMPONENTCODES: All component codes exist! \n";
-# push( @installer::globals::logfileinfo, $infoline);
+# $installer::logger::Lang->print($infoline);
# }
}
@@ -1745,7 +1745,7 @@ sub prepare_64bit_database
# Saving the files
installer::files::save_file($reglocatfilename ,$reglocatfile);
$infoline = "Making idt file 64 bit conform: $reglocatfilename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -1778,7 +1778,7 @@ sub prepare_64bit_database
# Saving the files
installer::files::save_file($fullfilename ,$filecontent);
$infoline = "Making idt file 64 bit conform: $fullfilename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
}
@@ -1803,7 +1803,7 @@ sub include_cabs_into_msi
chdir($to);
my $infoline = "Changing into directory: $to";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $msidb = "msidb.exe"; # Has to be in the path
my $extraslash = ""; # Has to be set for non-ActiveState perl
@@ -1825,17 +1825,17 @@ sub include_cabs_into_msi
my $returnvalue = system($systemcall);
$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);
}
# deleting the cab file
@@ -1843,11 +1843,11 @@ sub include_cabs_into_msi
unlink(${$allcabfiles}[$i]);
$infoline = "Deleted cab file: ${$allcabfiles}[$i]\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
$infoline = "Changing back into directory: $from";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
chdir($from);
}
@@ -1863,7 +1863,7 @@ sub execute_packaging
installer::logger::include_header_into_logfile("Packaging process");
- installer::logger::include_timestamp_into_logfile("Performance Info: Execute packaging start");
+ $installer::logger::Lang->add_timestamp("Performance Info: Execute packaging start");
my $infoline = "";
my $from = cwd();
@@ -1871,7 +1871,7 @@ sub execute_packaging
chdir($to);
$infoline = "chdir: $to \n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# if the ddf file contains relative pathes, it is necessary to change into the temp directory
if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} )
@@ -1879,7 +1879,7 @@ sub execute_packaging
$to = $installer::globals::temppath;
chdir($to);
$infoline = "chdir: $to \n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
# changing the tmp directory, because makecab.exe generates temporary cab files
@@ -1895,8 +1895,8 @@ sub execute_packaging
my $systemcall = ${$localpackjobref}[$i];
my $callscounter = $i + 1;
-
- installer::logger::print_message( "... makecab.exe ($callscounter/$allmakecabcalls) ... \n" );
+
+ $installer::logger::Info->printf("... makecab.exe (%s/%s) ... \n", $callscounter, $allmakecabcalls);
# my $returnvalue = system($systemcall);
@@ -1905,7 +1905,7 @@ sub execute_packaging
my @ddfoutput = ();
$infoline = "Systemcall: $systemcall";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
open (DDF, "$systemcall");
while (<DDF>) {push(@ddfoutput, $_); }
@@ -1917,26 +1917,26 @@ sub execute_packaging
{
if ( $n < $maxmakecabcalls )
{
- installer::logger::print_message( "makecab_error (Try $n): Trying again \n" );
- $infoline = "makecab_error (Try $n): $systemcall !";
+ $installer::logger::Info->printf("makecab_error (Try %s): Trying again\n", $n);
+ $installer::logger::Lang->printf("makecab_error (Try %s): Trying again\n", $n);
}
else
{
- installer::logger::print_message( "ERROR (Try $n): Abort packing \n" );
- $infoline = "ERROR (Try $n): $systemcall !";
+ $installer::logger::Info->printf("ERROR (Try %s): Abort packing \n", $n);
+ $installer::logger::Lang->printf("ERROR (Try %s): Abort packing \n", $n);
}
- push( @installer::globals::logfileinfo, $infoline);
- # for ( my $j = 0; $j <= $#ddfoutput; $j++ ) { push( @installer::globals::logfileinfo, "$ddfoutput[$j]"); }
-
for ( my $m = 0; $m <= $#ddfoutput; $m++ )
{
if ( $ddfoutput[$m] =~ /(ERROR\:.*?)\s*$/ )
{
$infoline = $1 . "\n";
- if ( $n < $maxmakecabcalls ) { $infoline =~ s/ERROR\:/makecab_error\:/i; }
- installer::logger::print_message( $infoline );
- push( @installer::globals::logfileinfo, $infoline);
+ if ( $n < $maxmakecabcalls )
+ {
+ $infoline =~ s/ERROR\:/makecab_error\:/i;
+ }
+ $installer::logger::Info->print($infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -1944,22 +1944,21 @@ sub execute_packaging
}
else
{
- # installer::logger::print_message( "Success (Try $n): \"$systemcall\"\n" );
$infoline = "Success (Try $n): $systemcall";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
last;
}
}
}
- installer::logger::include_timestamp_into_logfile("Performance Info: Execute packaging end");
+ $installer::logger::Lang->add_timestamp("Performance Info: Execute packaging end");
# setting back to the original tmp directory
$ENV{'TMP'} = $origtemppath;
chdir($from);
$infoline = "chdir: $from \n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
###############################################################
@@ -1982,7 +1981,7 @@ sub set_global_code_variables
}
my $infoline = "Using Codes file: $installer::globals::codefilename \n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $codefile = installer::files::read_file($installer::globals::codefilename);
@@ -2051,9 +2050,9 @@ sub set_global_code_variables
if ( $installer::globals::upgradecode eq "" ) { installer::exiter::exit_program("ERROR: UpgradeCode not defined in $installer::globals::codefilename !", "set_global_code_variables"); }
$infoline = "Setting ProductCode to: $installer::globals::productcode \n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Setting UpgradeCode to: $installer::globals::upgradecode \n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# Adding both variables into the variables array
@@ -2061,10 +2060,10 @@ sub set_global_code_variables
$allvariableshashref->{'UPGRADECODE'} = $installer::globals::upgradecode;
$infoline = "Defined variable PRODUCTCODE: $installer::globals::productcode \n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Defined variable UPGRADECODE: $installer::globals::upgradecode \n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
@@ -2185,7 +2184,7 @@ sub update_reglocat_table
# Saving the file
installer::files::save_file($reglocatfilename ,$reglocatfile);
my $infoline = "Updated idt file: $reglocatfilename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
}
@@ -2220,7 +2219,7 @@ sub update_removere_table
# Saving the file
installer::files::save_file($removeregistryfilename ,$removeregistryfile);
my $infoline = "Updated idt file: $removeregistryfilename \n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -2234,7 +2233,7 @@ sub read_saved_mappings
{
installer::logger::include_header_into_logfile("Reading saved mappings from older installation sets:");
- installer::logger::include_timestamp_into_logfile("Performance Info: Reading saved mappings start");
+ $installer::logger::Lang->add_timestamp("Performance Info: Reading saved mappings start");
if ( $installer::globals::previous_idt_dir )
{
@@ -2250,8 +2249,12 @@ sub read_saved_mappings
# Reading File.idt
my $idtfile = $idtdir . $installer::globals::separator . "File.idt";
- push( @installer::globals::globallogfileinfo, "\nAnalyzing file: $idtfile\n" );
- if ( ! -f $idtfile ) { push( @installer::globals::globallogfileinfo, "Warning: File $idtfile does not exist!\n" ); }
+ $installer::logger::Global->print("\n");
+ $installer::logger::Global->printf("Analyzing file: %s\n", $idtfile);
+ if ( ! -f $idtfile )
+ {
+ $installer::logger::Global->printf("Warning: File %s does not exist!\n", $idtfile);
+ }
my $n = 0;
open (F, "<$idtfile") || installer::exiter::exit_program("ERROR: Cannot open file $idtfile for reading", "read_saved_mappings");
@@ -2319,13 +2322,18 @@ sub read_saved_mappings
close (F);
- push( @installer::globals::globallogfileinfo, "Read $n old file table key or 8.3 name mappings from $idtfile\n" );
+ $installer::logger::Global->printf("Read %s old file table key or 8.3 name mappings from %s\n",
+ $n, $idtfile);
# Reading Director.idt
$idtfile = $idtdir . $installer::globals::separator . "Director.idt";
- push( @installer::globals::globallogfileinfo, "\nAnalyzing file $idtfile\n" );
- if ( ! -f $idtfile ) { push( @installer::globals::globallogfileinfo, "Warning: File $idtfile does not exist!\n" ); }
+ $installer::logger::Global->print("\n");
+ $installer::logger::Global->printf("Analyzing file %s\n", $idtfile);
+ if ( ! -f $idtfile )
+ {
+ $installer::logger::Global->printf("Warning: File %s does not exist!\n", $idtfile);
+ }
$n = 0;
open (F, "<$idtfile") || installer::exiter::exit_program("ERROR: Cannot open file $idtfile for reading", "read_saved_mappings");
@@ -2356,25 +2364,25 @@ sub read_saved_mappings
}
close (F);
- push( @installer::globals::globallogfileinfo, "Read $n old directory 8.3 name mappings from $idtfile\n" );
+ $installer::logger::Global->printf("Read %s old directory 8.3 name mappings from %s\n",
+ $n, $idtfile);
# Analyzing errors
if ( $error_occured )
{
- for ( my $i = 0; $i <= $#errorlines; $i++ )
+ for my $line (@errorlines)
{
- print "$errorlines[$i]";
- push( @installer::globals::globallogfileinfo, "$errorlines[$i]");
+ $installer::logger::Info->print($line);
+ $installer::logger::Global->print($line);
}
installer::exiter::exit_program("ERROR: Duplicate entries in saved mappings!", "read_saved_mappings");
}
} else {
- # push( @installer::globals::globallogfileinfo, "WARNING: Windows patch shall be prepared, but PREVIOUS_IDT_DIR is not set!\n" );
installer::exiter::exit_program("ERROR: Windows patch shall be prepared, but environment variable PREVIOUS_IDT_DIR is not set!", "read_saved_mappings");
}
- installer::logger::include_timestamp_into_logfile("Performance Info: Reading saved mappings end");
+ $installer::logger::Lang->add_timestamp("Performance Info: Reading saved mappings end");
}
1;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/msp.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/msp.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/msp.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/msp.pm Thu Oct 31 10:37:56 2013
@@ -186,7 +186,7 @@ sub prepare_path_in_nopatchfilehash
if ( ! $found ) { installer::exiter::exit_program("ERROR: Could not determine flexible destination path for msp patch creation!", "prepare_path_in_nopatchfilehash"); }
$infoline = "Setting flexible path for msp creation: $flexiblepath\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
foreach my $onedestination ( keys %{$nopatchfiledestinations} )
{
@@ -206,25 +206,25 @@ sub synchronize_installation_sets
{
my ($olddatabase, $newdatabase, $filesarray) = @_;
- my $infoline = "\nSynchronizing installed products because of PATCH flag\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->print("Synchronizing installed products because of PATCH flag\n");
$infoline = "Old product: $olddatabase\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "New product: $newdatabase\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my ( $patchfiledestinations, $nopatchfiledestinations, $patchfilecounter, $nopatchfilecounter ) = collect_patch_file_destinations($filesarray);
$infoline = "Number of files with PATCH flag: $patchfilecounter\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Number of files without PATCH flag: $nopatchfilecounter\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
foreach my $localfile ( sort keys %{$patchfiledestinations} )
{
$infoline = "\tPATCH file: $localfile\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
my $oldpath = $olddatabase;
@@ -255,18 +255,18 @@ sub synchronize_installation_sets
my $copyreturn = copy($source, $dest);
# installer::systemactions::copy_one_file($source, $dest);
# $infoline = "Synchronizing file: $source to $dest\n";
- # push( @installer::globals::logfileinfo, $infoline);
+ # $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "Not synchronizing. Destination file \"$dest\" does not exist.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
else
{
$infoline = "Not synchronizing. Source file \"$source\" does not exist.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
}
@@ -301,18 +301,18 @@ sub extract_all_tables_from_pcpfile
$returnvalue = system($systemcall);
$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);
installer::exiter::exit_program("ERROR: Could not exclude tables from pcp file: $fullpcpfilepath !", "extract_all_tables_from_msidatabase");
}
else
{
$infoline = "Success: Executed $systemcall successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -363,18 +363,18 @@ sub include_tables_into_pcpfile
$returnvalue = system($systemcall);
$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);
installer::exiter::exit_program("ERROR: Could not include tables into pcp file: $fullpcpfilepath !", "include_tables_into_pcpfile");
}
else
{
$infoline = "Success: Executed $systemcall successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -424,23 +424,23 @@ sub execute_msimsp
}
$systemcall = $msimsp . " -s " . $localfullpcpfilename . " -p " . $localmspfilename . " -l " . $locallogfilename . " -f " . $localmsimsptemppath;
- installer::logger::print_message( "... $systemcall ...\n" );
+ $installer::logger::Info->printf("... %s ...\n", $systemcall);
$returnvalue = system($systemcall);
$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);
installer::exiter::exit_program("ERROR: Could not execute $systemcall !", "execute_msimsp");
}
else
{
$infoline = "Success: Executed $systemcall successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
return $logfilename;
@@ -544,7 +544,7 @@ sub change_properties_table
my ($localmspdir, $mspfilename) = @_;
my $infoline = "Changing content of table \"Properties\"\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $filename = $localmspdir . $installer::globals::separator . "Properties.idt";
if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find file \"$filename\" !", "change_properties_table"); }
@@ -602,7 +602,7 @@ sub change_targetimages_table
my ($localmspdir, $olddatabase) = @_;
my $infoline = "Changing content of table \"TargetImages\"\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $filename = $localmspdir . $installer::globals::separator . "TargetImages.idt";
if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find file \"$filename\" !", "change_targetimages_table"); }
@@ -630,7 +630,7 @@ sub change_upgradedimages_table
my ($localmspdir, $newdatabase) = @_;
my $infoline = "Changing content of table \"UpgradedImages\"\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $filename = $localmspdir . $installer::globals::separator . "UpgradedImages.idt";
if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find file \"$filename\" !", "change_upgradedimages_table"); }
@@ -679,7 +679,7 @@ sub change_imagefamilies_table
my ($localmspdir) = @_;
my $infoline = "Changing content of table \"ImageFamilies\"\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $filename = $localmspdir . $installer::globals::separator . "ImageFamilies.idt";
if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find file \"$filename\" !", "change_imagefamilies_table"); }
@@ -846,7 +846,7 @@ sub change_patchmetadata_table
my ($localmspdir, $allvariables, $languagestringref) = @_;
my $infoline = "Changing content of table \"PatchMetadata\"\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $filename = $localmspdir . $installer::globals::separator . "PatchMetadata.idt";
if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find file \"$filename\" !", "change_patchmetadata_table"); }
@@ -1054,7 +1054,7 @@ sub change_patchsequence_table
my ($localmspdir, $allvariables) = @_;
my $infoline = "Changing content of table \"PatchSequence\"\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $filename = $localmspdir . $installer::globals::separator . "PatchSequence.idt";
if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find file \"$filename\" !", "change_patchsequence_table"); }
@@ -1342,10 +1342,11 @@ sub create_msp_patch
{
my ($installationdir, $includepatharrayref, $allvariables, $languagestringref, $languagesarrayref, $filesarray) = @_;
- my $force = 1; # print this message even in 'quiet' mode
- installer::logger::print_message( "\n******************************************\n" );
- installer::logger::print_message( "... creating msp installation set ...\n", $force );
- installer::logger::print_message( "******************************************\n" );
+ # print this message even in 'quiet' mode
+ $installer::logger::Info->print("\n");
+ $installer::logger::Info->print("******************************************\n");
+ $installer::logger::Info->print("... creating msp installation set ...\n", 1);
+ $installer::logger::Info->print("******************************************\n");
$installer::globals::creating_windows_installer_patch = 1;
@@ -1381,22 +1382,25 @@ sub create_msp_patch
$installer::globals::saveinstalldir = $mspdir;
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: Starting product installation");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: Starting product installation");
# Installing both installation sets
- installer::logger::print_message( "... installing products ...\n" );
+ $installer::logger::Info->printf("... installing products ...\n");
my ($olddatabase, $newdatabase) = install_installation_sets($installationdir);
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: Starting synchronization of installation sets");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: Starting synchronization of installation sets");
# Synchronizing installed products, allowing only different files with PATCH flag
- installer::logger::print_message( "... synchronizing installation sets ...\n" );
+ $installer::logger::Info->printf("... synchronizing installation sets ...\n");
synchronize_installation_sets($olddatabase, $newdatabase, $filesarray);
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: Starting pcp file creation");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: Starting pcp file creation");
# Create pcp file
- installer::logger::print_message( "... creating pcp file ...\n" );
+ $installer::logger::Info->printf("... creating pcp file ...\n");
my $localmspdir = installer::systemactions::create_directories("msp", $languagestringref);
@@ -1437,12 +1441,14 @@ sub create_msp_patch
include_tables_into_pcpfile($fullpcpfilename, $localmspdir, $tablelist);
# Start msimsp.exe
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: Starting msimsp.exe");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: Starting msimsp.exe");
my $msimsplogfile = execute_msimsp($fullpcpfilename, $mspfilename, $localmspdir);
# Copy final installation set next to msp file
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: Copying installation set");
- installer::logger::print_message( "... copying installation set ...\n" );
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: Copying installation set");
+ $installer::logger::Info->printf("... copying installation set ...\n");
my $oldinstallationsetpath = $installer::globals::updatedatabasepath;
@@ -1470,7 +1476,7 @@ sub create_msp_patch
# Copying patch file
installer::systemactions::copy_one_file($requiredpatchfile, $mspdir);
# my $infoline = "Copy $requiredpatchfile to $mspdir\n";
- # push( @installer::globals::logfileinfo, $infoline);
+ # $installer::logger::Lang->print($infoline);
}
# Find all files included into the patch
@@ -1478,7 +1484,8 @@ sub create_msp_patch
analyze_msimsp_logfile($msimsplogfile, $filesarray);
# Done
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: msp creation done");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: msp creation done");
return $mspdir;
}
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/patch.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/patch.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/patch.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/patch.pm Thu Oct 31 10:37:56 2013
@@ -135,17 +135,13 @@ sub update_patch_tables
# Saving the files
installer::files::save_file($reglocatfilename ,$reglocatfile);
- my $infoline = "Updated idt file: $reglocatfilename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Updated idt file: %s\n", $reglocatfilename);
installer::files::save_file($appsearchfilename ,$appsearchfile);
- $infoline = "Updated idt file: $appsearchfilename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Updated idt file: %s\n", $appsearchfilename);
installer::files::save_file($signaturefilename ,$signaturefile);
- $infoline = "Updated idt file: $signaturefilename\n";
- push(@installer::globals::logfileinfo, $infoline);
-
+ $installer::logger::Lang->printf("Updated idt file: %s\n", $signaturefilename);
}
1;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/property.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/property.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/property.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/property.pm Thu Oct 31 10:37:56 2013
@@ -177,7 +177,7 @@ sub get_productname_for_property_table
# Saving this name in hash $allvariables for further usage
$allvariables->{'PROPERTYTABLEPRODUCTNAME'} = $productname;
my $infoline = "Defined variable PROPERTYTABLEPRODUCTNAME: $productname\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
return $productname;
}
@@ -193,7 +193,7 @@ sub get_quickstarterlinkname_for_propert
my $quickstartername = $name . " " . $version;
my $infoline = "Defined Quickstarter Link name: $quickstartername\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
return $quickstartername;
}
@@ -512,7 +512,7 @@ sub update_property_table
installer::files::save_file($properyfilename ,$propertyfile);
my $infoline = "Updated idt file: $properyfilename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
@@ -559,7 +559,7 @@ sub set_languages_in_property_table
installer::files::save_file($properyfilename ,$propertyfile);
my $infoline = "Added language content into idt file: $properyfilename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
@@ -590,7 +590,7 @@ sub set_codes_in_property_table
installer::files::save_file($properyfilename ,$propertyfile);
my $infoline = "Added language content into idt file: $properyfilename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
@@ -619,7 +619,7 @@ sub set_regkeyprodpath_in_property_table
installer::files::save_file($properyfilename ,$propertyfile);
my $infoline = "Added language content into idt file: $properyfilename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
@@ -650,7 +650,7 @@ sub update_checkbox_table
# Saving the property file
installer::files::save_file($checkboxfilename ,$checkboxfile);
my $infoline = "Added ms file type defaults into idt file: $checkboxfilename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
}
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/registry.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/registry.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/registry.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/registry.pm Thu Oct 31 10:37:56 2013
@@ -445,13 +445,11 @@ sub create_registry_table
my $registrytablename = $basedir . $installer::globals::separator . "Registry.idt" . "." . $onelanguage;
installer::files::save_file($registrytablename ,\@registrytable);
- my $infoline = "Created idt file: $registrytablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Created idt file: %s\n", $registrytablename);
$registrytablename = $basedir . $installer::globals::separator . "Reg64.idt" . "." . $onelanguage;
installer::files::save_file($registrytablename ,\@reg64table );
- $infoline = "Created idt file: $registrytablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Created idt file: %s\n", $registrytablename);
}
}
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/removefile.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/removefile.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/removefile.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/removefile.pm Thu Oct 31 10:37:56 2013
@@ -140,9 +140,7 @@ sub create_removefile_table
my $removefiletablename = $basedir . $installer::globals::separator . "RemoveFi.idt";
installer::files::save_file($removefiletablename ,\@removefiletable);
- my $infoline = "Created idt file: $removefiletablename\n";
- push(@installer::globals::logfileinfo, $infoline);
-
+ $installer::logger::Lang->printf("Created idt file: %s\n", $removefiletablename);
}
-1;
\ No newline at end of file
+1;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/selfreg.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/selfreg.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/selfreg.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/selfreg.pm Thu Oct 31 10:37:56 2013
@@ -77,8 +77,7 @@ sub create_selfreg_table
my $selfregtablename = $basedir . $installer::globals::separator . "SelfReg.idt";
installer::files::save_file($selfregtablename ,\@selfregtable);
- my $infoline = "Created idt file: $selfregtablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Created idt file: %s\n", $selfregtablename);
}
-1;
\ No newline at end of file
+1;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/shortcut.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/shortcut.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/shortcut.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/shortcut.pm Thu Oct 31 10:37:56 2013
@@ -677,17 +677,16 @@ sub create_shortcut_table
$installer::globals::sofficeiconadded = 1;
}
- my $localinfoline = "Added icon file $$sourcepathref for language pack into icon file collector.\n";
- push(@installer::globals::logfileinfo, $localinfoline);
+ $installer::logger::Lang->printf(
+ "Added icon file %s for language pack into icon file collector.\n", $$sourcepathref);
# Saving the file
my $shortcuttablename = $basedir . $installer::globals::separator . "Shortcut.idt" . "." . $onelanguage;
installer::files::save_file($shortcuttablename ,\@shortcuttable);
- my $infoline = "Created idt file: $shortcuttablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Created idt file: %s\n", $shortcuttablename);
}
}
-1;
\ No newline at end of file
+1;