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 [3/6] - in /openoffice/trunk/main/solenv/bin: ./
modules/installer/ modules/installer/windows/
Modified: openoffice/trunk/main/solenv/bin/modules/installer/javainstaller.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/javainstaller.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/javainstaller.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/javainstaller.pm Thu Oct 31 10:37:56 2013
@@ -162,8 +162,8 @@ sub set_productname_and_productversion
{
my ($templatefile, $variableshashref) = @_;
- my $infoline = "\nSetting product name and product version in Java template file\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->print("Setting product name and product version in Java template file\n");
my $productname = $variableshashref->{'PRODUCTNAME'};
my $productversion = $variableshashref->{'PRODUCTVERSION'};
@@ -175,7 +175,7 @@ sub set_productname_and_productversion
}
$infoline = "End of: Setting product name and product version in Java template file\n\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
#######################################################
@@ -186,8 +186,8 @@ sub set_component_name_and_description
{
my ($templatefile, $modulesarrayref, $onelanguage) = @_;
- my $infoline = "\nSetting component names and description in Java template file\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->print("Setting component names and description in Java template file\n");
for ( my $i = 0; $i <= $#{$templatefile}; $i++ )
{
@@ -204,7 +204,7 @@ sub set_component_name_and_description
$oldstring = $1;
$infoline = "Found: $oldstring\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ( $oldstring =~ /^\s*OOO_(gid_\w+)_(\w+?)\s*$/ )
{
@@ -215,14 +215,14 @@ sub set_component_name_and_description
my $newstring = get_module_name_description($modulesarrayref, $onelanguage, $gid, $type);
$infoline = "\tReplacing (language $onelanguage): OLDSTRING: $oldstring NEWSTRING $newstring\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
${$templatefile}[$i] =~ s/$oldstring/$newstring/; # always substitute, even if $newstring eq ""
}
}
$infoline = "End of: Setting component names and description in Java template file\n\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
#######################################################
@@ -276,7 +276,7 @@ sub get_licensefilesource
if ($$licenseref eq "") { installer::exiter::exit_program("ERROR: Could not find License file $licensefilename!", "get_licensefilesource"); }
my $infoline = "Found licensefile $licensefilename: $$licenseref \n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
return $$licenseref;
}
@@ -334,7 +334,7 @@ sub convert_licenstring
if ($$converterref eq "") { installer::exiter::exit_program("ERROR: Could not find converter $converter!", "convert_licenstring"); }
my $infoline = "Found converter file $converter: $$converterref \n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $systemcall = "$$converterref $licensefilename |";
open (CONV, "$systemcall");
@@ -357,12 +357,12 @@ sub convert_licenstring
}
$infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ( $licensestring eq "" )
{
$infoline = "ERROR: Could not convert $licensefilename !\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
return $licensestring;
@@ -402,7 +402,7 @@ sub make_systemcall
my @returns = ();
- installer::logger::print_message( "... $systemcall ...\n" );
+ $installer::logger::Info->printf("... %s ...\n", $systemcall);
open (REG, "$systemcall");
while (<REG>) {push(@returns, $_); }
@@ -411,23 +411,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->printf($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;
@@ -486,7 +489,7 @@ sub set_classpath_for_install_sdk
$ENV{'CLASSPATH'} = $newclasspathstring;
my $infoline = "Setting CLASSPATH to $ENV{'CLASSPATH'}\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
#######################################################
@@ -619,7 +622,7 @@ sub remove_package
if ( $do_delete )
{
my $infoline = "\tReally removing package $packagename from xml file.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
splice(@{$xmlfile},$i, $linecounter); # removing $linecounter lines, beginning in line $i
$removed_packge = 1;
last;
@@ -630,12 +633,12 @@ sub remove_package
if ( $removed_packge )
{
$infoline = "Package $packagename successfully removed from xml file.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "Did not find package $packagename in xml file.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -844,7 +847,7 @@ sub remove_empty_packages_in_xmlfile
{
my $packagename = $installer::globals::emptypackages[$i];
my $infoline = "Try to remove package $packagename from xml file.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
remove_package($xmlfile, $packagename);
}
}
@@ -877,7 +880,7 @@ sub get_rpm_unit_from_xmlfile
my ($rpmname, $xmlfile) = @_;
my $infoline = "Searching for $rpmname in xml file.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my @rpmunit = ();
my $includeline = 0;
@@ -906,7 +909,7 @@ sub get_rpm_unit_from_xmlfile
if ( ! $foundrpm ) { installer::exiter::exit_program("ERROR: Did not find rpmunit $rpmname in xml file!", "get_rpm_unit_from_xmlfile"); }
$infoline = "Found $rpmname in xml file. Returning block lines: $#rpmunit + 1. Includeline: $includeline \n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
return (\@rpmunit, $includeline);
}
@@ -941,7 +944,7 @@ sub prepare_linkrpm_in_xmlfile
my $rpmline = ${$rpmlist}[$i];
my $infoline = "Preparing link/patch RPM: $rpmline\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ( $rpmline =~ /^\s*(\S.*?\S)\s+(\S.*?\S)\s*$/ )
{
@@ -1033,12 +1036,12 @@ sub remove_scpgid_from_xmlfile
if ($successfully_removed)
{
$infoline = "Module $scpgid successfully removed from xml file.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "Module $scpgid not found in xml file (no problem).\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -1052,7 +1055,7 @@ sub remove_module_if_not_defined
my ($xmlfile, $modulesarrayref, $scpgid) = @_;
my $infoline = "Checking existence of $scpgid in scp definition\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $found = 0;
@@ -1066,7 +1069,7 @@ sub remove_module_if_not_defined
if ( ! $found )
{
$infoline = "Module $scpgid not found -> Removing from xml file.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
remove_scpgid_from_xmlfile($xmlfile, $scpgid);
}
}
@@ -1224,7 +1227,7 @@ sub replace_component_name_in_java_file
installer::files::save_file($javafilename, $javafile);
$infoline = "Changes in Java file: $javafilename : $oldname \-\> $newname\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -1304,7 +1307,7 @@ sub replace_component_names
if ( $modulename eq "" )
{
$infoline = "Info: Modulename for $gid not defined in modules collector. Looking in Java ulf file.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
if ( $modulename eq "" ) # the modulename can also be set in the Java ulf file
@@ -1317,7 +1320,7 @@ sub replace_component_names
${$xmlfile}[$i] =~ s/$componentname/$modulename/;
$infoline = "Replacement in xml file (Solaris): $componentname \-\> $modulename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# Replacement has to be done in all Java language files
replace_component_name_in_java_file($alljavafiles, $componentname, $modulename);
@@ -1326,7 +1329,7 @@ sub replace_component_names
if ( $modulename eq "" ) # the modulename can also be set in the Java ulf file
{
$infoline = "WARNING: No replacement in xml file for component: $componentname\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
}
@@ -1359,7 +1362,7 @@ sub get_all_packages_in_installdir
{
${$allrpms}[$i] = $directory . $installer::globals::separator . ${$allrpms}[$i];
$infoline = "Found RPM: ${$allrpms}[$i]\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -1416,7 +1419,7 @@ sub set_filesize_in_xmlfile
${$xmlfile}[$number] =~ s/FILESIZEPLACEHOLDER/$filesize/;
$filesizeset = 1;
$infoline = "Setting filesize for $rpmname : $filesize\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
last;
}
@@ -1430,13 +1433,13 @@ sub set_filesize_in_xmlfile
if ( ! $foundrpm )
{
$infoline = "ERROR: Did not find $rpmname in xml file !\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
if ( ! $filesizeset )
{
$infoline = "ERROR: Did not set filesize for $rpmname in xml file !\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -1497,24 +1500,24 @@ sub find_rpmname_to_uniquename
{
my $number = $#all_correct_rpms + 1;
$infoline = "There are $number RPMs for the unique name \"$uniquename\" :\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $allrpmstring = "";
for ( my $i = 0; $i <= $#all_correct_rpms; $i++ ) { $allrpmstring = $allrpmstring . $all_correct_rpms[$i] . "\n"; }
- push( @installer::globals::logfileinfo, $allrpmstring);
+ $installer::logger::Lang->print($allrpmstring);
installer::exiter::exit_program("ERROR: Found $number RPMs that start with unique name \"$uniquename\". Only one allowed!", "find_rpmname_to_uniquename");
}
if ( $#all_correct_rpms < 0 )
{
$infoline = "There is no rpm for the unique name \"$uniquename\"\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
installer::exiter::exit_program("ERROR: There is no RPM that start with unique name \"$uniquename\"!", "find_rpmname_to_uniquename");
}
if ( $#all_correct_rpms == 0 )
{
$infoline = "Found one rpm for the unique name \"$uniquename\" : $all_correct_rpms[0]\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
return $all_correct_rpms[0];
@@ -1549,7 +1552,7 @@ sub set_rpmname_into_xmlfile
${$xmlfile}[$number] =~ s/RPMFILENAMEPLACEHOLDER/$rpmname/;
$rpmnameset = 1;
$infoline = "Setting RPM name for $uniquename : $rpmname\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
last;
}
@@ -1563,13 +1566,13 @@ sub set_rpmname_into_xmlfile
if ( ! $foundrpm )
{
$infoline = "ERROR: Did not find $rpmname in xml file !\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
if ( ! $rpmnameset )
{
$infoline = "ERROR: Did not set rpm name for $uniquename in xml file !\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -1590,25 +1593,23 @@ sub put_rpmpath_into_xmlfile
my $number = $#{$listofpackages} + 1;
$infoline = "Number of packages in installation set: $number\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$number = $#{$alluniquenames} + 1;
$infoline = "Number of unique RPM names in xml file: $number\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
- $infoline = "\nPackages in installation set:\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("Packages in installation set:\n");
for ( my $i = 0; $i <= $#{$listofpackages}; $i++ )
{
- $infoline = "${$listofpackages}[$i]\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print(${$listofpackages}[$i] . "\n");
}
- $infoline = "\nUnique RPM names in xml file:\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->print("Unique RPM names in xml file:\n");
for ( my $i = 0; $i <= $#{$alluniquenames}; $i++ )
{
$infoline = "${$alluniquenames}[$i]\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
if ( $#{$alluniquenames} != $#{$listofpackages} ) { installer::exiter::exit_program("ERROR: xml file contains $#{$alluniquenames} unique names, but there are $#{$listofpackages} packages in installation set!", "put_rpmpath_into_xmlfile"); }
@@ -1644,7 +1645,7 @@ sub put_filesize_into_xmlfile
my $filesize = do_sum($rpmout);
$infoline = "Filesize $rpmname : $filesize\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
set_filesize_in_xmlfile($filesize, $rpmname, $xmlfile);
}
@@ -1695,11 +1696,11 @@ sub create_java_installer
$ulffilename = $installer::globals::javalanguagepath . $installer::globals::separator . $ulffilename;
my $ulffile = installer::files::read_file($ulffilename);
- $infoline = "\nReading ulf file: $ulffilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->print("Reading ulf file: $ulffilename\n");
$infoline = "Translating the Java template file\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
for ( my $i = 0; $i <= $#{$languagesarrayref}; $i++ )
{
@@ -1738,7 +1739,7 @@ sub create_java_installer
installer::files::save_file($newfilename, $templatefile);
$infoline = "Saving Java file: $newfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
# renaming one language java file to "MyResources.java"
@@ -1767,14 +1768,14 @@ sub create_java_installer
installer::files::save_file($basedestfilename, $basetemplatefile);
$infoline = "Created base Java file: $basedestfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# deleting the template file
unlink($templatefilename);
$infoline = "Deleted template Java resource file: $templatefilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# changing into Java directory
@@ -1783,7 +1784,7 @@ sub create_java_installer
chdir($javadir);
$infoline = "Changing into directory: $javadir\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# preparing the xml file
@@ -1823,7 +1824,7 @@ sub create_java_installer
if ( $installer::globals::islinuxrpmbuild ) { put_filesize_into_xmlfile($xmlfile, $listofpackages); }
installer::files::save_file($xmlfilename, $xmlfile);
$infoline = "Saving xml file: $xmlfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# Setting the classpath and starting compiler
@@ -1875,7 +1876,7 @@ sub create_java_installer
chdir($from);
$infoline = "Changing into directory: $from\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
1;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/languagepack.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/languagepack.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/languagepack.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/languagepack.pm Thu Oct 31 10:37:56 2013
@@ -136,7 +136,7 @@ sub put_license_file_into_script
my ($scriptfile, $licensefile) = @_;
my $infoline = "Adding licensefile into language pack script\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $includestring = "";
@@ -167,17 +167,17 @@ sub create_tar_gz_file
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);
}
return $targzname;
@@ -268,7 +268,7 @@ sub determine_packagename
}
my $infoline = "Found package in installation directory $installdir : $packagename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
return ( $packagename, $allnames);
}
@@ -285,7 +285,7 @@ sub put_packagename_into_script
my $localpackagename = $packagename;
$localpackagename =~ s/\.tar\.gz//; # making "OOOopenoffice-it-ea.tar.gz" to "OOOopenoffice-it-ea"
my $infoline = "Adding packagename $localpackagename into language pack script\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $installline = "";
@@ -319,7 +319,7 @@ sub put_productname_into_script
$productname =~ s/\.//g; # openoffice.org -> openofficeorg
my $infoline = "Adding productname $productname into language pack script\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
{
@@ -342,7 +342,7 @@ sub put_fullproductname_into_script
my $fullproductname = $productname . " " . $productversion;
my $infoline = "Adding full productname \"$fullproductname\" into language pack script\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
{
@@ -365,10 +365,10 @@ sub put_searchpackage_into_script
if ( $installer::globals::issolarisbuild ) { $basispackageversion =~ s/\.//g; } # "3.0" -> "30"
my $infoline = "Adding basis package prefix $basispackageprefix into language pack script\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Adding basis package version $basispackageversion into language pack script\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
{
@@ -389,7 +389,7 @@ sub put_linenumber_into_script
my $linenumber = $#{$scriptfile} + $#{$licensefile} + 3; # also adding the content of the license file!
my $infoline = "Adding linenumber $linenumber into language pack script\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
{
@@ -413,7 +413,7 @@ sub determine_scriptfile_name
$scriptfilename =~ s/\.tar\.gz\s*$/\.sh/;
my $infoline = "Setting language pack script file name to $scriptfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
return $scriptfilename;
}
@@ -430,7 +430,7 @@ sub save_script_file
installer::files::save_file($newscriptfilename, $scriptfile);
my $infoline = "Saving script file $newscriptfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
return $newscriptfilename;
}
@@ -449,17 +449,17 @@ sub include_package_into_script
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 $scriptfilename \>\/dev\/null 2\>\&1";
@@ -485,7 +485,7 @@ sub remove_package
unlink $longpackagename;
my $infoline = "Removing package: $longpackagename \n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -511,7 +511,7 @@ sub build_installer_for_languagepack
my $scriptfile = installer::files::read_file($$scriptref);
my $infoline = "Found script file $scriptfilename: $$scriptref \n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# find and read english license file
my $licenselanguage = "en-US"; # always english !
@@ -523,7 +523,7 @@ sub build_installer_for_languagepack
my $licensefile = installer::files::read_file($$licenseref);
$infoline = "Found licensefile $licensefilename: $$licenseref \n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# including variables into license file
installer::scpzipfiles::replace_all_ziplistvariables_in_file($licensefile, $allvariableshashref);
Modified: openoffice/trunk/main/solenv/bin/modules/installer/logger.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/logger.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/logger.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/logger.pm Thu Oct 31 10:37:56 2013
@@ -25,6 +25,330 @@ package installer::logger;
use installer::files;
use installer::globals;
+use Time::HiRes qw(gettimeofday tv_interval);
+use English;
+use IO::Handle;
+use strict;
+
+my $StartTime = undef;
+
+=head1 NAME
+
+ installer::logger
+
+ Logging for the installer modules.
+
+=cut
+
+=head1 DESCRIPTION
+
+ This module is in a transition state from a set of loosly connected functions to a single class.
+
+ There are three globaly available logger objects:
+
+=over
+
+=item $Lang
+
+ is language specific and writes messages to a log file.
+
+=cut
+
+=item $Glob
+
+ is independent of the current language. Its messages are prepended to each $Lang logger.
+
+=cut
+
+=item $Info
+
+ is for output to the console.
+
+=cut
+
+=back
+
+=cut
+
+
+our $Global = installer::logger->new("glob",
+ 'is_save_lines' => 1,
+ 'is_print_to_console' => 0,
+ 'is_show_relative_time' => 1);
+our $Lang = installer::logger->new("lang",
+ 'is_print_to_console' => 0,
+ 'is_show_relative_time' => 1,
+ 'is_show_log_id' => 1
+ );
+our $Info = installer::logger->new("info",
+ 'is_show_relative_time' => 0,
+ 'is_show_process_id' => 0,
+ 'is_show_log_id' => 0
+ );
+
+=head2 new($class, $id, @arguments)
+
+ Create a new instance of the logger class.
+ @arguments lets you override default values.
+
+=cut
+
+sub new ($$@)
+{
+ my ($class, $id, @arguments) = @_;
+
+ my $self = {
+ 'id' => $id,
+ 'filename' => "",
+ # When set then lines are printed to this file.
+ 'file' => undef,
+ # When true then lines are printed to the console.
+ 'is_print_to_console' => 1,
+ 'is_save_lines' => 0,
+ # A container of printed lines. Lines are added only when 'is_save_lines' is true.
+ 'lines' => [],
+ # Another logger to which all prints are forwarded.
+ 'forward' => [],
+ # A filter function that for example can recoginze build errors.
+ 'filter' => undef,
+ # Show relative time
+ 'is_show_relative_time' => 0,
+ # Show log id (mostly for debugging the logger)
+ 'is_show_log_id' => 0,
+ # Show the process id, useful on the console when doing a multiprocessor build.
+ 'is_show_process_id' => 0
+ };
+ while (scalar @arguments >= 2)
+ {
+ my $key = shift @arguments;
+ my $value = shift @arguments;
+ $self->{$key} = $value;
+ }
+
+ bless($self, $class);
+
+ return $self;
+}
+
+
+
+=head2 printf($self, $message, @arguments)
+
+ Identical in syntax and semantics to the usual perl (s)printf.
+
+=cut
+sub printf ($$@)
+{
+ my ($self, $format, @arguments) = @_;
+
+ $self->print(sprintf($format, @arguments), 0);
+}
+
+
+
+
+=head2 print ($self, $message, [optional] $force)
+
+ Print the given message.
+ If the optional $force parameter is given and it evaluates to true then the message
+ is printed even when the golbal $installer::globals::quiet is true.
+
+=cut
+sub print ($$;$)
+{
+ my ($self, $message, $force) = @_;
+
+ die "newline at start of line" if ($message =~ /^\n.+/);
+
+ $force = 0 unless defined $force;
+
+ my $relative_time = tv_interval($StartTime, [gettimeofday()]);
+ foreach my $target ($self, @{$self->{'forward'}})
+ {
+ $target->process_line(
+ $relative_time,
+ $self->{'id'},
+ $PID,
+ $message,
+ $force);
+ }
+}
+
+
+
+
+=head2 process_line ($self, $relative_time, $log_id, $pid, $message, $force)
+
+ Internal function that decides whether to
+ a) write to a log file
+ b) print to the console
+ c) store in an array for later use
+ the preformatted message.
+
+=cut
+sub process_line ($$$$$$)
+{
+ my ($self, $relative_time, $log_id, $pid, $message, $force) = @_;
+
+ # Apply the line filter.
+ if (defined $self->{'filter'})
+ {
+ $message = &{$self->{'filter'}}($relative_time, $log_id, $pid, $message);
+ }
+
+ # Format the line.
+ my $line = "";
+ if ($self->{'is_show_relative_time'})
+ {
+ $line .= sprintf("%12.6f : ", $relative_time);
+ }
+ if ($self->{'is_show_log_id'})
+ {
+ $line .= $log_id . " : ";
+ }
+ if ($self->{'is_show_process_id'})
+ {
+ $line .= $pid . " : ";
+ }
+ $line .= $message;
+
+ # Print the line to a file or to the console or store it for later use.
+ my $fid = $self->{'file'};
+ if (defined $fid)
+ {
+ print $fid ($line);
+ }
+ if (($force || ! $installer::globals::quiet)
+ && $self->{'is_print_to_console'})
+ {
+ print($line);
+ }
+ if ($self->{'is_save_lines'})
+ {
+ push @{$self->{'lines'}}, [$relative_time, $log_id, $pid, $message, $force];
+ }
+}
+
+
+
+
+=head2 set_filename (Self, $filename)
+
+ When the name of a writable file is given then all future messages will go to that file.
+ Output to the console is turned off.
+ This method is typically used to tie the language dependent $Lang logger to different log files.
+
+=cut
+sub set_filename ($$)
+{
+ my ($self, $filename) = @_;
+
+ $filename = "" unless defined $filename;
+ if ($self->{'filename'} ne $filename)
+ {
+ if (defined $self->{'file'})
+ {
+ $self->{'is_print_to_console'} = 1;
+ close $self->{'file'};
+ $self->{'file'} = undef;
+ }
+
+ $self->{'filename'} = $filename;
+
+ if ($filename ne "")
+ {
+ open $self->{'file'}, ">", $self->{'filename'}
+ || die "can not open log file ".$self->{'filename'}." for writing";
+ $self->{'is_print_to_console'} = 0;
+
+ # Make all writes synchronous so that we don't loose any messages on an
+ # 'abrupt' end.
+ my $handle = select $self->{'file'};
+ $| = 1;
+ select $handle;
+ }
+ }
+}
+
+
+
+
+=head2 set_filter ($self, $filter)
+
+ Sets $filter (a function reference) as line filter. It is applied to each line.
+ The filter can extract information from the given message and modify it before it is printed.
+
+=cut
+sub set_filter ($$)
+{
+ my ($self, $filter) = @_;
+ $self->{'filter'} = $filter;
+}
+
+
+
+
+=head2 add_timestamp ($self, $message)
+
+ Print the given message together with the current (absolute) time.
+
+=cut
+sub add_timestamp ($$)
+{
+ my ($self, $message) = @_;
+
+ my $timestring = get_time_string();
+ $self->printf("%s\t%s", $message, $timestring);
+}
+
+
+
+=head2 copy_lines_from ($self, $other)
+
+ Copy saved lines from another logger object.
+
+=cut
+sub copy_lines_from ($$)
+{
+ my ($self, $other) = @_;
+
+ my $is_print_to_console = $self->{'is_print_to_console'};
+ my $is_save_lines = $self->{'is_save_lines'};
+ my $fid = $self->{'file'};
+
+ foreach my $line (@{$other->{'lines'}})
+ {
+ $self->process_line(@$line);
+ }
+}
+
+
+
+
+=head2 set_forward ($self, $other)
+
+ Set a forwarding target. All future messages are forwarded (copied) to $other.
+ A typical use is to tie $Info to $Lang so that all messages sent to $Info are
+ printed to the console AND written to the log file.
+
+=cut
+sub set_forward ($$)
+{
+ my ($self, $other) = @_;
+
+ # At the moment at most one forward target is allowed.
+ if (defined $other)
+ {
+ $self->{'forward'} = [$other];
+ }
+ else
+ {
+ $self->{'forward'} = [];
+ }
+}
+
+
+
####################################################
# Including header files into the logfile
@@ -33,21 +357,12 @@ use installer::globals;
sub include_header_into_logfile
{
my ($message) = @_;
-
- my $infoline;
-
- $infoline = "\n" . get_time_string();
- push( @installer::globals::logfileinfo, $infoline);
-
- $infoline = "######################################################\n";
- push( @installer::globals::logfileinfo, $infoline);
-
- $infoline = "$message\n";
- push( @installer::globals::logfileinfo, $infoline);
-
- $infoline = "######################################################\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $Lang->print("\n");
+ $Lang->print(get_time_string());
+ $Lang->print("######################################################\n");
+ $Lang->print($message."\n");
+ $Lang->print("######################################################\n");
}
####################################################
@@ -58,20 +373,11 @@ sub include_header_into_globallogfile
{
my ($message) = @_;
- my $infoline;
-
- $infoline = "\n" . get_time_string();
- push( @installer::globals::globallogfileinfo, $infoline);
-
- $infoline = "######################################################\n";
- push( @installer::globals::globallogfileinfo, $infoline);
-
- $infoline = "$message\n";
- push( @installer::globals::globallogfileinfo, $infoline);
-
-
- $infoline = "######################################################\n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $Global->print("\n");
+ $Global->print(get_time_string());
+ $Global->print("######################################################\n");
+ $Global->print($message."\n");
+ $Global->print("######################################################\n");
}
####################################################
@@ -80,12 +386,12 @@ sub include_header_into_globallogfile
sub include_timestamp_into_logfile
{
+ die "deprected";
my ($message) = @_;
my $infoline;
my $timestring = get_time_string();
- $infoline = "$message\t$timestring";
- push( @installer::globals::logfileinfo, $infoline);
+ $Lang->printf("%s\t%s", $message, $timestring);
}
####################################################
@@ -96,8 +402,8 @@ sub log_hashref
{
my ($hashref) = @_;
- my $infoline = "\nLogging variable settings:\n";
- push(@installer::globals::globallogfileinfo, $infoline);
+ $Global->print("\n");
+ $Global->print("Logging variable settings:\n");
my $itemkey;
@@ -106,12 +412,10 @@ sub log_hashref
my $line = "";
my $itemvalue = "";
if ( $hashref->{$itemkey} ) { $itemvalue = $hashref->{$itemkey}; }
- $line = $itemkey . "=" . $itemvalue . "\n";
- push(@installer::globals::globallogfileinfo, $line);
+ $Global->printf("%s=%s\n", $itemkey, $itemvalue);
}
- $infoline = "\n";
- push(@installer::globals::globallogfileinfo, $infoline);
+ $Global->print("\n");
}
#########################################################
@@ -124,18 +428,11 @@ sub globallog
my $infoline;
- $infoline = "\n" . get_time_string();
- push( @installer::globals::globallogfileinfo, $infoline);
-
- $infoline = "################################################################\n";
- push( @installer::globals::globallogfileinfo, $infoline);
-
- $infoline = "$message\n";
- push( @installer::globals::globallogfileinfo, $infoline);
-
- $infoline = "################################################################\n";
- push( @installer::globals::globallogfileinfo, $infoline);
-
+ $Global->print("\n");
+ $Global->print(get_time_string());
+ $Global->print("################################################################\n");
+ $Global->print($message."\n");
+ $Global->print("################################################################\n");
}
###############################################################
@@ -183,6 +480,9 @@ sub savedebug
sub starttime
{
$installer::globals::starttime = time();
+ $StartTime = [gettimeofday()];
+
+ my $localtime = localtime();
}
###############################################################
@@ -258,8 +558,8 @@ sub get_file_age
sub stoptime
{
- my $infoline = get_time_string();
- print_message( "$infoline" );
+ my $localtime = localtime();
+ $Info->printf("stopping log at %s\n", $localtime);
}
###############################################################
@@ -291,6 +591,8 @@ sub set_installation_date
sub print_message
{
+ die "print_message is deprecated";
+
my $message = shift;
chomp $message;
my $force = shift || 0;
@@ -326,9 +628,11 @@ sub print_error
{
my $message = shift;
chomp $message;
- print STDERR "\n**************************************************\n";
+ print STDERR "\n";
+ print STDERR "**************************************************\n";
print STDERR "ERROR: $message";
- print STDERR "\n**************************************************\n";
+ print STDERR "\n";
+ print STDERR "**************************************************\n";
return;
}
Modified: openoffice/trunk/main/solenv/bin/modules/installer/packagelist.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/packagelist.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/packagelist.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/packagelist.pm Thu Oct 31 10:37:56 2013
@@ -527,8 +527,7 @@ sub check_packagelist
if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find script file $scriptfile for module $gid!", "check_packagelist"); }
- my $infoline = "$gid: Using script file: \"$$fileref\"!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("%s: Using script file: \"%s\"!\n", $gid, $$fileref);
$onepackage->{'script'} = $$fileref;
}
@@ -679,8 +678,7 @@ sub collectpackages
if ( $$fileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $packinfofile for module $modulegid!", "collectpackages"); }
- my $infoline = "$modulegid: Using packinfo: \"$$fileref\"!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("%s: Using packinfo: \"%s\"!\n", $modulegid, $$fileref);
get_packinfo($modulegid, $$fileref, \@packages, $onelanguage, $islanguagemodule);
}
@@ -709,8 +707,7 @@ sub log_packages_content
# checking all items that must be defined
- $infoline = "Package $onepackage->{'module'}\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Package %s\n", $onepackage->{'module'});
my $key;
foreach $key (sort keys %{$onepackage})
@@ -719,24 +716,20 @@ sub log_packages_content
if ( $key eq "allmodules" )
{
- $infoline = "\t$key:\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("\t%s:\n", $key);
my $onemodule;
foreach $onemodule ( @{$onepackage->{$key}} )
{
- $infoline = "\t\t$onemodule\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("\t\t%s\n", $onemodule);
}
}
else
{
- $infoline = "\t$key: $onepackage->{$key}\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("\t%s: %s\n", $key, $onepackage->{$key});
}
}
- $infoline = "\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("\n");
}
}
@@ -824,8 +817,7 @@ sub prepare_cabinet_files
# checking all items that must be defined
- $infoline = "Package $onepackage->{'module'}\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Package %s\n", $onepackage->{'module'});
# Assigning the cab file to the module and also to all corresponding sub modules
@@ -838,10 +830,12 @@ sub prepare_cabinet_files
}
else
{
- my $infoline = "Warning: Already existing assignment: $onemodule : $installer::globals::allcabinetassigns{$onemodule}\n";
- push(@installer::globals::logfileinfo, $infoline);
- $infoline = "Ignoring further assignment: $onemodule : $cabinetfile\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Warning: Already existing assignment: %s : %s\n",
+ $onemodule,
+ $installer::globals::allcabinetassigns{$onemodule});
+ $installer::logger::Lang->printf("Ignoring further assignment: %s : %s\n",
+ $onemodule,
+ $cabinetfile);
}
}
}
@@ -855,16 +849,23 @@ sub log_cabinet_assignments
{
installer::logger::include_header_into_logfile("Logging cabinet files:");
- my $infoline = "List of cabinet files:\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("List of cabinet files:\n");
my $key;
- foreach $key ( sort keys %installer::globals::allcabinets ) { push(@installer::globals::logfileinfo, "\t$key\n"); }
-
- $infoline = "\nList of assignments from modules to cabinet files:\n";
- push(@installer::globals::logfileinfo, $infoline);
-
- foreach $key ( sort keys %installer::globals::allcabinetassigns ) { push(@installer::globals::logfileinfo, "\t$key : $installer::globals::allcabinetassigns{$key}\n"); }
+ foreach $key ( sort keys %installer::globals::allcabinets )
+ {
+ $installer::logger::Lang->printf("\t%s\n", $key);
+ }
+
+ $installer::logger::Lang->printf("\n");
+ $installer::logger::Lang->printf("List of assignments from modules to cabinet files:\n");
+
+ foreach $key ( sort keys %installer::globals::allcabinetassigns )
+ {
+ $installer::logger::Lang->printf("\t%s : %s\n",
+ $key,
+ $installer::globals::allcabinetassigns{$key});
+ }
}
1;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/packagepool.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/packagepool.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/packagepool.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/packagepool.pm Thu Oct 31 10:37:56 2013
@@ -57,8 +57,8 @@ sub set_sessionid
my $timer = time(); # time
$installer::globals::sessionid = $pid . $timer;
$installer::globals::sessionidset = 1;
- my $infoline = "\nPool: Setting session id: $installer::globals::sessionid.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->print("Pool: Setting session id: $installer::globals::sessionid.\n");
}
####################################################
@@ -104,7 +104,8 @@ sub compare_epm_content
if ( $oldmember != $newmember )
{
$identical = 0;
- installer::logger::print_message("\n...... changed length of EPM file\n");
+ $installer::logger::Info->print("\n");
+ $installer::logger::Info->print("...... changed length of EPM file\n");
$diffinfo = "Pool: EPM, different line count: old epm file: $oldmember, new epm file: $newmember\n";
push(@installer::globals::epmdifflist, $diffinfo);
}
@@ -119,7 +120,8 @@ sub compare_epm_content
{
$identical = 0;
my $line = $i + 1;
- installer::logger::print_message("\n...... different content in EPM file\n");
+ $installer::logger::Info->print("\n");
+ $installer::logger::Info->print("...... different content in EPM file\n");
$diffinfo = "Pool: EPM, line $line changed from \"${$oldcontent}[$i]\" to \"$newlocalcontent[$i]\".\n";
push(@installer::globals::epmdifflist, $diffinfo);
last;
@@ -150,7 +152,8 @@ sub compare_package_content
{
# Logging the difference
$identical = 0;
- installer::logger::print_message("\n...... different number of files in packages. New number: $newmember, old number: $oldmember\n");
+ $installer::logger::Info->print("\n");
+ $installer::logger::Info->printf("...... different number of files in packages. New number: %s, old number: %s\n", $newmember, $oldmember);
$infoline = "Different number of files in packages. New number: $newmember, old number: $oldmember\n";
push(@installer::globals::pcfdiffcomment, $infoline);
}
@@ -166,7 +169,7 @@ sub compare_package_content
if ( ! exists($oldcontent->{$dest}) )
{
$identical = 0;
- installer::logger::print_message("$start...... file only in one package (A): $dest\n");
+ $installer::logger::Info->printf("%s...... file only in one package (A): %s\n", $start, $dest);
$infoline = "File only in existing pool package: $dest\n";
push(@installer::globals::pcfdiffcomment, $infoline);
if ( $first ) { $start = ""; }
@@ -182,7 +185,7 @@ sub compare_package_content
if ( ! exists($newcontent->{$dest}) )
{
$identical = 0;
- installer::logger::print_message("$start...... file only in one package (B): $dest\n");
+ $installer::logger::Info->printf("%s...... file only in one package (B): %s\n", $start, $dest);
$infoline = "File only in new package: $dest\n";
push(@installer::globals::pcfdiffcomment, $infoline);
if ( $first ) { $start = ""; }
@@ -205,11 +208,11 @@ sub compare_package_content
$identical = 0;
if ( $first == 1 )
{
- installer::logger::print_message("\n");
+ $installer::logger::Info->print("\n");
$first = 0;
}
$installer::globals::pcfdifflist{$dest} = 1;
- installer::logger::print_message("...... different file: $dest\n");
+ $installer::logger::Info->printf("...... different file: %s\n", $dest);
# last;
}
@@ -219,7 +222,8 @@ sub compare_package_content
{
$identical = 0;
$installer::globals::pcfdifflist{$dest} = 1;
- installer::logger::print_message("\n...... different file: $dest");
+ $installer::logger::Info->print("\n");
+ $installer::logger::Info->printf("...... different file: %s", $dest);
# last;
}
}
@@ -237,7 +241,8 @@ sub calculate_current_content
{
my ($filesarray, $packagename) = @_;
- installer::logger::include_timestamp_into_logfile("\nCalculating content for package content file ($packagename), start");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Calculating content for package content file ($packagename), start");
my %globalcontent = ();
@@ -265,7 +270,8 @@ sub calculate_current_content
$globalcontent{$destination} = \%onefilehash;
}
- installer::logger::include_timestamp_into_logfile("\nCalculating content for package content file ($packagename), start");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Calculating content for package content file ($packagename), start");
return \%globalcontent;
}
@@ -424,8 +430,10 @@ sub check_pool_exit
{
my $timestring = installer::logger::convert_timestring($timeage);
my $infoline = "\nPool: Attention: \"$lockfilename\" is too old ($timestring). Removing file!\n";
- installer::logger::print_message( "... $infoline" );
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Info->print("\n");
+ $installer::logger::Info->printf("... %s", $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->print($infoline);
unlink $lockfilename;
# installer::exiter::exit_program("ERROR: Waiting too long for removal of lock file \"$lockfilename\"", "check_pool_exit (packagepool)");
}
@@ -434,9 +442,11 @@ sub check_pool_exit
my $filecontent = installer::files::read_file($lockfilename);
my $waittime = $timecounter * 10;
$waittime = installer::logger::convert_timestring($waittime);
- my $infoline = "\nPool: Warning: \"$lockfilename\" blocks this process for $waittime. Lock content: \"${$filecontent}[0]\"\n";
- installer::logger::print_message( "... $infoline" );
- push( @installer::globals::logfileinfo, $infoline);
+ my $infoline = "Pool: Warning: \"$lockfilename\" blocks this process for $waittime. Lock content: \"${$filecontent}[0]\"\n";
+ $installer::logger::Info->print("\n");
+ $installer::logger::Info->printf("... %s", $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->print($infoline);
}
}
@@ -457,16 +467,24 @@ sub log_pool_info
if ( $file_exists )
{
- $infoline = "\nPool Problem: Lock file \"$installer::globals::savelockfilename\" belongs to another process. This process has session id: $installer::globals::sessionid .\n";
- push( @installer::globals::logfileinfo, $infoline);
- $infoline = "Content of Lock file:\n";
- push( @installer::globals::logfileinfo, $infoline);
- foreach my $line ( @{$installer::globals::savelockfilecontent} ) { push( @installer::globals::logfileinfo, $line); }
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf(
+ "Pool Problem: Lock file \"%s\" belongs to another process. This process has session id: %s.\n",
+ $installer::globals::savelockfilename,
+ $installer::globals::sessionid);
+ $installer::logger::Lang->print("Content of Lock file:\n");
+ foreach my $line ( @{$installer::globals::savelockfilecontent} )
+ {
+ $installer::logger::Lang->print($line);
+ }
}
else
{
- $infoline = "\nPool Problem: Lock file \"$installer::globals::savelockfilename\" does not exist anymore (this process has session id: $installer::globals::sessionid) .\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf(
+ "Pool Problem: Lock file \"%s\" does not exist anymore (this process has session id: %s).\n",
+ $installer::globals::savelockfilename,
+ $installer::globals::sessionid);
}
}
@@ -499,8 +517,8 @@ sub remove_package_from_installset
{
my ($newpackagepath) = @_;
- my $infoline = "Pool problem: Removing package \"$newpackagepath\" from installation set!\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Pool problem: Removing package \"%s\" from installation set!\n",
+ $newpackagepath);
if ( -f $newpackagepath ) { unlink $newpackagepath; }
if ( -d $newpackagepath ) { installer::systemactions::remove_complete_directory($newpackagepath, 1); }
@@ -518,7 +536,7 @@ sub package_is_up_to_date
{
my ($allvariables, $onepackage, $packagename, $newepmcontent, $filesinpackage, $installdir, $subdir, $languagestringref) = @_;
- installer::logger::print_message_without_newline( "... checking pool package $packagename ..." );
+ $installer::logger::Info->printf("... checking pool package ...\n", $packagename);
installer::logger::include_header_into_logfile("Checking package in pool: $packagename");
@@ -563,10 +581,12 @@ sub package_is_up_to_date
}
$infoline = "Pool: $checkfilename exists. WAITING 10 seconds ($timecounter).\n";
- if ( $timecounter == 1 ) { installer::logger::print_message( "\n" ); }
- installer::logger::print_message( "... $infoline" );
- push( @installer::globals::logfileinfo, $infoline);
- # if ( $timecounter % 50 == 0 ) { check_pool_exit($checkfilename, $timecounter); }
+ if ( $timecounter == 1 )
+ {
+ $installer::logger::Info->print("\n");
+ }
+ $installer::logger::Info->printf("... %s", $infoline);
+ $installer::logger::Lang->print($infoline);
if ( $timecounter % 100 == 0 ) { check_pool_exit($checkfilename, $timecounter); }
sleep 10; # process sleeps 10 seconds
$waited_for_check = 1;
@@ -580,7 +600,7 @@ sub package_is_up_to_date
if ( ! -f $checkfilename )
{
$infoline = "Pool problem: Pool lock file \"$checkfilename\" could not be created successfully or was removed by another process (A)!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
log_pool_info(0);
$package_is_up_to_date = 4; # repeat this package
return $package_is_up_to_date;
@@ -589,15 +609,18 @@ sub package_is_up_to_date
if ( ! process_is_owner($checkfilename) )
{
$infoline = "Pool problem: Pool lock file \"$checkfilename\" belongs to another process (A)!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
log_pool_info(1);
$package_is_up_to_date = 4; # repeat this package
return $package_is_up_to_date;
}
$infoline = "Pool: Created file: $checkfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
- if ( $waited_for_check ) { installer::logger::print_message( "... $infoline" ); }
+ $installer::logger::Lang->print($infoline);
+ if ( $waited_for_check )
+ {
+ $installer::logger::Info->printf("... %s", $infoline);
+ }
# Waiting, step 2
# Checking, if another process creates this package at the moment
@@ -606,17 +629,22 @@ sub package_is_up_to_date
{
$timecounter++;
$infoline = "Pool: $lockfilename exists. WAITING 10 seconds ($timecounter).\n";
- if ( $timecounter == 1 ) { installer::logger::print_message( "\n" ); }
- installer::logger::print_message( "... $infoline" );
- push( @installer::globals::logfileinfo, $infoline);
- # if ( $timecounter % 50 == 0 ) { check_pool_exit($lockfilename, $timecounter); }
+ if ( $timecounter == 1 )
+ {
+ $installer::logger::Info->print("\n");
+ }
+ $installer::logger::Info->printf("... %s", $infoline);
+ $installer::logger::Lang->print($infoline);
if ( $timecounter % 100 == 0 ) { check_pool_exit($lockfilename, $timecounter); }
sleep 10; # process sleeps 10 seconds
$waited_for_lock = 1;
}
# No lock file exists, therefore no process creates this package at the moment. Check can be done now.
- if ( $waited_for_lock ) { installer::logger::print_message( "... Pool: Proceeding, $lockfilename was removed.\n" ); }
+ if ( $waited_for_lock )
+ {
+ $installer::logger::Info->printf("... Pool: Proceeding, %s was removed.\n", $lockfilename);
+ }
my $package_already_exists = 0;
@@ -651,26 +679,35 @@ sub package_is_up_to_date
if ( $package_is_up_to_date )
{
$infoline = "Pool: $packagename: No new content, using existing package\n";
- push( @installer::globals::logfileinfo, $infoline);
- installer::logger::print_message( "... using package from pool\n" );
+ $installer::logger::Lang->print($infoline);
+ $installer::logger::Info->printf("... using package from pool\n");
}
else
{
if ( $package_already_exists )
{
$infoline = "Pool: $packagename: Contains new content, creating new package. Differences:\n";
- push( @installer::globals::logfileinfo, $infoline);
- foreach my $dest ( sort keys %installer::globals::pcfdifflist ) { push( @installer::globals::logfileinfo, "$dest\n"); }
- foreach my $dest ( @installer::globals::pcfdiffcomment ) { push( @installer::globals::logfileinfo, "$dest"); }
- foreach my $dest ( @installer::globals::epmdifflist ) { push( @installer::globals::logfileinfo, "$dest"); }
+ $installer::logger::Lang->print($infoline);
+ foreach my $dest ( sort keys %installer::globals::pcfdifflist )
+ {
+ $installer::logger::Lang->printf("%s\n", $dest);
+ }
+ foreach my $dest ( @installer::globals::pcfdiffcomment )
+ {
+ $installer::logger::Lang->printf("%s\n", $dest);
+ }
+ foreach my $dest ( @installer::globals::epmdifflist )
+ {
+ $installer::logger::Lang->printf("%s\n", $dest);
+ }
}
else
{
$infoline = "Pool: $packagename: Does not exist in pool.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
- installer::logger::print_message( "... packaging required\n" );
+ $installer::logger::Info->printf("... packaging required\n");
%installer::globals::xpdpackageinfo = (); # reset the filled hash, because the package cannot be used.
# Creating lock mechanism, so that other processes do not create this package, too.
@@ -682,7 +719,7 @@ sub package_is_up_to_date
if ( ! -f $lockfilename )
{
$infoline = "Pool problem: Pool lock file \"$lockfilename\" could not be created successfully or was removed by another process (D)!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
log_pool_info(0);
$package_is_up_to_date = 4; # repeat this package
return $package_is_up_to_date;
@@ -691,14 +728,14 @@ sub package_is_up_to_date
if ( ! process_is_owner($lockfilename) )
{
$infoline = "Pool problem: Pool lock file \"$lockfilename\" belongs to another process (D)!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
log_pool_info(1);
$package_is_up_to_date = 4; # repeat this package
return $package_is_up_to_date;
}
$infoline = "Pool: Created file: $lockfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
my $newpackagepath = "";
@@ -711,7 +748,7 @@ sub package_is_up_to_date
if ( ! -f $checkfilename )
{
$infoline = "Pool problem: Pool lock file \"$checkfilename\" was removed by another process (B)!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
log_pool_info(0);
$package_is_up_to_date = 4; # repeat this package
return $package_is_up_to_date;
@@ -720,7 +757,7 @@ sub package_is_up_to_date
if ( ! process_is_owner($checkfilename) )
{
$infoline = "Pool problem: Pool lock file \"$checkfilename\" belongs to another process (B)!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
log_pool_info(1);
$package_is_up_to_date = 4; # repeat this package
return $package_is_up_to_date;
@@ -735,7 +772,7 @@ sub package_is_up_to_date
if ( ! -f $checkfilename )
{
$infoline = "Pool problem: Pool lock file \"$checkfilename\" was removed by another process (C)!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
log_pool_info(0);
# removing new package from installation set
@@ -748,7 +785,7 @@ sub package_is_up_to_date
if ( ! process_is_owner($checkfilename) )
{
$infoline = "Pool problem: Pool lock file \"$checkfilename\" belongs to another process (C)!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
log_pool_info(1);
# removing new package from installation set
@@ -763,7 +800,7 @@ sub package_is_up_to_date
unlink $checkfilename;
$installer::globals::processhaspoolcheckfile = 0;
$infoline = "Pool: Removing file: $checkfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# Last chance before packaging starts, to check, if this process is really still owner
# of the packaging lock file. If not, this packaging process can be repeated.
@@ -772,7 +809,7 @@ sub package_is_up_to_date
if ( ! -f $lockfilename )
{
$infoline = "Pool problem: Pool lock file \"$lockfilename\" was removed by another process (E)!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
log_pool_info(0);
$package_is_up_to_date = 4; # repeat this package
return $package_is_up_to_date;
@@ -781,7 +818,7 @@ sub package_is_up_to_date
if ( ! process_is_owner($lockfilename) )
{
$infoline = "Pool problem: Pool lock file \"$lockfilename\" belongs to another process (E)!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
log_pool_info(1);
$package_is_up_to_date = 4; # repeat this package
return $package_is_up_to_date;
@@ -884,7 +921,7 @@ sub put_content_into_pool
# Put package into pool
$infoline = "Pool: Adding package \"$packagename\" into pool.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# Copying with unique name, containing PID. Only renaming if everything was fine.
my $realdestination = "";
@@ -929,7 +966,7 @@ sub put_content_into_pool
rename($uniquedestination, $realdestination);
$infoline = "Pool: Renamed file: \"$uniquedestination\" to \"$realdestination\".\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# Before the lock file in the pool can be removed, it has to be checked, if this process is still the owner of this lock file.
# Check, if lock file still exists and if this process is the owner. Otherwise a pool error occured.
@@ -949,7 +986,7 @@ sub put_content_into_pool
unlink $installer::globals::poollockfilename;
$installer::globals::processhaspoollockfile = 0;
$infoline = "Pool: Removing file: $installer::globals::poollockfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
###################################################################
@@ -961,7 +998,7 @@ sub copy_package_from_pool
my ($installdir, $subdir, $packagename) = @_;
my $infoline = "Pool: Using package \"$packagename\" from pool.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $sourcefile = $installer::globals::poolpath . $installer::globals::separator . $packagename;
if ( $installer::globals::issolarisbuild ) { $sourcefile = $sourcefile . ".tar"; }
if ( ! -f $sourcefile ) { installer::exiter::exit_program("ERROR: Missing package in package pool: \"$sourcefile\"", "copy_package_from_pool"); }
@@ -1016,27 +1053,26 @@ sub log_pool_statistics
my $created_packages = get_count(\%installer::globals::createpackages);
$infoline = "Number of packages from pool: $pool_packages\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
foreach my $packagename ( sort keys(%installer::globals::poolpackages) )
{
$infoline = "\t$packagename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
- $infoline = "\nNumber of packages that were created: $created_packages\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->print("Number of packages that were created: %s\n", $created_packages);
foreach my $packagename ( sort keys(%installer::globals::createpackages) )
{
$infoline = "\t$packagename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $reason = $installer::globals::createpackages{$packagename};
- for ( my $i = 0; $i <= $#{$reason}; $i++ )
+ foreach my $line (@reason)
{
- $infoline = "${$reason}[$i]";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($line);
}
}
}
Modified: openoffice/trunk/main/solenv/bin/modules/installer/parameter.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/parameter.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/parameter.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/parameter.pm Thu Oct 31 10:37:56 2013
@@ -30,6 +30,7 @@ use installer::globals;
use installer::logger;
use installer::remover;
use installer::systemactions;
+use strict;
############################################
# Parameter Operations
@@ -95,21 +96,16 @@ sub saveparameter
{
if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::parameter::saveparameter"); }
- my $include = "";
-
- installer::logger::globallog("Command line arguments:");
+ $installer::logger::Global->printf("Command line arguments:\n");
- for ( my $i = 0; $i <= $#ARGV; $i++ )
+ my $index = 0;
+ foreach my $argument (@ARGV)
{
- $include = $ARGV[$i] . "\n";
- push(@installer::globals::globallogfileinfo, $include);
+ $installer::logger::Global->printf(" %2d: %s\n", $index++, $argument);
}
# also saving global settings:
-
- $include = "Separator: $installer::globals::separator\n";
- push(@installer::globals::globallogfileinfo, $include);
-
+ $installer::logger::Global->printf("Separator: %s\n", $installer::globals::separator);
}
#####################################
@@ -340,8 +336,8 @@ sub setglobalvariables
$installer::globals::debian = 1;
$installer::globals::packageformat = "deb";
my $message = "Creating Debian packages";
- installer::logger::print_message( $message );
- push(@installer::globals::globallogfileinfo, $message);
+ $installer::logger::Info->print($message);
+ $installer::logger::Global->print($message);
$installer::globals::islinuxrpmbuild = 0;
$installer::globals::islinuxdebbuild = 1;
$installer::globals::epmoutpath = "DEBS";
@@ -573,15 +569,14 @@ sub control_required_parameter
# Writing parameter to shell and into logfile
################################################
-sub outputparameter
+sub outputparameter ()
{
if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::parameter::outputparameter"); }
- my $element;
-
my @output = ();
- push(@output, "\n########################################################\n");
+ push(@output, "\n");
+ push(@output, "########################################################\n");
push(@output, "$installer::globals::prog, version 1.0\n");
push(@output, "Product list file: $installer::globals::ziplistname\n");
if (!($installer::globals::setupscript_defined_in_productlist))
@@ -624,7 +619,7 @@ sub outputparameter
if (!($installer::globals::languages_defined_in_productlist))
{
push(@output, "Languages:\n");
- foreach $element (@installer::globals::languageproducts) { push(@output, "\t$element\n"); }
+ foreach my $element (@installer::globals::languageproducts) { push(@output, "\t$element\n"); }
}
else
{
@@ -637,10 +632,10 @@ sub outputparameter
# output into shell and into logfile
- for ( my $i = 0; $i <= $#output; $i++ )
+ foreach my $line (@output)
{
- installer::logger::print_message( $output[$i] );
- push(@installer::globals::globallogfileinfo, $output[$i]);
+ $installer::logger::Info->print($line);
+ $installer::logger::Global->print($line);
}
}
Modified: openoffice/trunk/main/solenv/bin/modules/installer/profiles.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/profiles.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/profiles.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/profiles.pm Thu Oct 31 10:37:56 2013
@@ -215,12 +215,10 @@ sub create_profiles
# Some data are set now, others are taken from the file "soffice.exe" ("soffice.bin")
add_profile_into_filelist($filesarrayref, $oneprofile, $completeprofilename, $allvariables);
- $infoline = "Created Profile: $completeprofilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Created Profile: %s\n", $completeprofilename);
}
- $infoline = "\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("\n");
}
Modified: openoffice/trunk/main/solenv/bin/modules/installer/scppatchsoname.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/scppatchsoname.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/scppatchsoname.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/scppatchsoname.pm Thu Oct 31 10:37:56 2013
@@ -183,13 +183,12 @@ sub resolving_patchsoname_flag
if ($found == 0)
{
- my $infoline = "Did not patch the file $destinationpath\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Did not patch the file %s\n", $destinationpath);
}
else
{
- my $infoline = "Successfully patched $destinationpath, Count: $found\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Successfully patched %s, Count: %s\n",
+ $destinationpath, $found);
}
}
@@ -207,8 +206,7 @@ sub resolving_patchsoname_flag
}
}
- my $infoline = "\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
}
1;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/scpzipfiles.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/scpzipfiles.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/scpzipfiles.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/scpzipfiles.pm Thu Oct 31 10:37:56 2013
@@ -176,8 +176,7 @@ sub resolving_scpzip_replace_flag
}
}
- my $infoline = "\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("\n");
}
1;