openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1538719 [6/13] - in /openoffice/branches/capstone2013/main: ./ basegfx/inc/basegfx/polygon/ basegfx/source/inc/ basegfx/source/polygon/ basegfx/source/tools/ basegfx/test/ canvas/source/tools/ cui/source/dialogs/ cui/source/tabpages/ deskt...
Date Mon, 04 Nov 2013 19:00:39 GMT
Modified: openoffice/branches/capstone2013/main/solenv/bin/modules/installer/download.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/solenv/bin/modules/installer/download.pm?rev=1538719&r1=1538718&r2=1538719&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/solenv/bin/modules/installer/download.pm (original)
+++ openoffice/branches/capstone2013/main/solenv/bin/modules/installer/download.pm Mon Nov  4 19:00:37 2013
@@ -51,9 +51,8 @@ sub put_productname_into_script
 	$productname = lc($productname);
 	$productname =~ s/\.//g;	# openoffice.org -> openofficeorg
 	$productname =~ s/\s*//g;
-	
-	my $infoline = "Adding productname $productname into download shell script\n";
-	push( @installer::globals::logfileinfo, $infoline);
+
+    $installer::logger::Lang->printf("Adding productname %s into download shell script\n", $productname);
 
 	for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
 	{
@@ -71,8 +70,7 @@ sub put_linenumber_into_script
 	
 	my $linenumber =  $#{$scriptfile} + 2;
 
-	my $infoline = "Adding linenumber $linenumber into download shell script\n";
-	push( @installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf("Adding linenumber %d into download shell script\n", $linenumber);
 
 	for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
 	{
@@ -92,8 +90,7 @@ sub determine_scriptfile_name
 	$filename = $filename . $installer::globals::downloadfileextension;
 	$installer::globals::downloadfilename = $filename;
 
-	my $infoline = "Setting download shell script file name to $filename\n";
-	push( @installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf("Setting download shell script file name to %s\n", $filename);
 
 	return $filename;
 }
@@ -108,9 +105,8 @@ sub save_script_file
 	
 	$newscriptfilename = $directory . $installer::globals::separator . $newscriptfilename;
 	installer::files::save_file($newscriptfilename, $scriptfile);
-	
-	my $infoline = "Saving script file $newscriptfilename\n";
-	push( @installer::globals::logfileinfo, $infoline);
+
+    $installer::logger::Lang->printf("Saving script file %s\n", $newscriptfilename);
 
 	if ( ! $installer::globals::iswindowsbuild )
 	{
@@ -142,8 +138,8 @@ sub put_checksum_and_size_into_script
 		installer::exiter::exit_program("ERROR: Incorrect return value from /usr/bin/sum: $sumout", "put_checksum_and_size_into_script");
 	}
 
-	my $infoline = "Adding checksum $checksum and size $size into download shell script\n";
-	push( @installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf(
+        "Adding checksum %s and size %s into download shell script\n", $checksum, $size);
 
 	for ( my $i = 0; $i <= $#{$scriptfile}; $i++ )
 	{
@@ -175,18 +171,15 @@ sub call_md5sum
 
 	my $returnvalue = $?;	# $? contains the return value of the systemcall
 
-	my $infoline = "Systemcall: $systemcall\n";
-	push( @installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf("Systemcall: %s\n", $systemcall);
 		
 	if ($returnvalue)
 	{
-		$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("ERROR: Could not execute \"%s\"!\n", $systemcall);
 	}
 	else
 	{
-		$infoline = "Success: Executed \"$systemcall\" successfully!\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->print("Success: Executed \"%s\" successfully!\n", $systemcall);
 	}
 	
 	return $md5sumoutput;		
@@ -211,8 +204,7 @@ sub get_md5sum
 		installer::exiter::exit_program("ERROR: Incorrect return value from /usr/bin/md5sum: $md5sumoutput", "get_md5sum");
 	}
 
-	my $infoline = "Setting md5sum: $md5sum\n";
-	push( @installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf("Setting md5sum: %s\n", $md5sum);
 
 	return $md5sum;
 }
@@ -235,18 +227,15 @@ sub call_sum
 
 	my $returnvalue = $?;	# $? contains the return value of the systemcall
 
-	my $infoline = "Systemcall: $systemcall\n";
-	push( @installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf("Systemcall: %s\n", $systemcall);
 		
 	if ($returnvalue)
 	{
-		$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("ERROR: Could not execute \"%s\"!\n", $systemcall);
 	}
 	else
 	{
-		$infoline = "Success: Executed \"$systemcall\" successfully!\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("Success: Executed \"%s\" successfully!\n", $systemcall);
 	}
 	
 	$sumoutput =~ s/\s+$filename\s$//;
@@ -290,18 +279,15 @@ sub include_tar_into_script
 	my $systemcall = "cat $temporary_tarfile >> $scriptfile && rm $temporary_tarfile";
 	my $returnvalue = system($systemcall);
 
-	my $infoline = "Systemcall: $systemcall\n";
-	push( @installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf("Systemcall: %s\n", $systemcall);
 		
 	if ($returnvalue)
 	{
-		$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("ERROR: Could not execute \"%s\"!\n", $systemcall);
 	}
 	else
 	{
-		$infoline = "Success: Executed \"$systemcall\" successfully!\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("Success: Executed \"%s\" successfully!\n", $systemcall);
 	}
 	return $returnvalue;
 }
@@ -321,18 +307,15 @@ sub tar_package
 	
 	my $returnvalue = system($systemcall);
 
-	my $infoline = "Systemcall: $systemcall\n";
-	push( @installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf("Systemcall: %s\n", $systemcall);
 		
 	if ($returnvalue)
 	{
-		$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("ERROR: Could not execute \"%s\"!\n", $systemcall);
 	}
 	else
 	{
-		$infoline = "Success: Executed \"$systemcall\" successfully!\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("Success: Executed \"\" successfully!\n", $systemcall);
 	}
 	
 	my $localcall = "chmod 775 $tarfilename \>\/dev\/null 2\>\&1";
@@ -349,7 +332,6 @@ sub create_tar_gz_file_from_package
 {
 	my ($installdir, $getuidlibrary) = @_;
 
-	my $infoline = "";
 	my $alldirs = installer::systemactions::get_all_directories($installdir);
 	my $onedir = ${$alldirs}[0];
 	$installdir = $onedir;
@@ -362,18 +344,15 @@ sub create_tar_gz_file_from_package
 		my $systemcall = "cd $installdir; rm $onefile";
 		my $returnvalue = system($systemcall);
 
-		$infoline = "Systemcall: $systemcall\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("Systemcall: %s\n", $systemcall);
 		
 		if ($returnvalue)
 		{
-			$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-			push( @installer::globals::logfileinfo, $infoline);
+            $installer::logger::Lang->printf("ERROR: Could not execute \"%s\"!\n", $systemcall);
 		}
 		else
 		{
-			$infoline = "Success: Executed \"$systemcall\" successfully!\n";
-			push( @installer::globals::logfileinfo, $infoline);
+            $installer::logger::Lang->printf("Success: Executed \"%s\" successfully!\n", $systemcall);
 		}
 	}
 
@@ -394,18 +373,15 @@ sub create_tar_gz_file_from_package
 
 	my $returnvalue = system($systemcall);
 
-	$infoline = "Systemcall: $systemcall\n";
-	push( @installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf("Systemcall: %s\n", $systemcall);
 		
 	if ($returnvalue)
 	{
-		$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("ERROR: Could not execute \"%s\"!\n", $systemcall);
 	}
 	else
 	{
-		$infoline = "Success: Executed \"$systemcall\" successfully!\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("Success: Executed \"%s\" successfully!\n", $systemcall);
 	}
 }
 
@@ -761,24 +737,20 @@ sub get_versionstring
 
 sub get_current_version
 {
-	my $infoline = "";
 	my $versionstring = "";
 	my $filename = "version.info";
 	# $filename = $installer::globals::ooouploaddir . $installer::globals::separator . $filename;
 	
 	if ( -f $filename )
 	{
-		$infoline = "File $filename exists. Trying to find current version.\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("File %s exists. Trying to find current version.\n", $filename);
 		my $versionfile = installer::files::read_file($filename);
 		$versionstring = get_versionstring($versionfile);
-		$infoline = "Setting version string: $versionstring\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("Setting version string: %s\n", $versionstring);
 	}
 	else
 	{
-		$infoline = "File $filename does not exist. No version setting in download file name.\n";
-		push( @installer::globals::logfileinfo, $infoline);	
+        $installer::logger::Lang->printf("File %s does not exist. No version setting in download file name.\n", $filename);
 	}
 
 	$installer::globals::oooversionstring = $versionstring;
@@ -826,8 +798,6 @@ sub create_tar_gz_file_from_directory
 {
 	my ($installdir, $getuidlibrary, $downloaddir, $downloadfilename) = @_;
 
-	my $infoline = "";
-
 	my $packdir = $installdir;
 	installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$packdir);
 	my $changedir = $installdir;
@@ -844,18 +814,15 @@ sub create_tar_gz_file_from_directory
 	
 	my $returnvalue = system($systemcall);
 
-	$infoline = "Systemcall: $systemcall\n";
-	push( @installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf("Systemcall: %s\n", $systemcall);
 		
 	if ($returnvalue)
 	{
-		$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("ERROR: Could not execute \"%s\"!\n", $systemcall);
 	}
 	else
 	{
-		$infoline = "Success: Executed \"$systemcall\" successfully!\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("Success: Executed \"%s\" successfully!\n", $systemcall);
 	}
 	
 	return $targzname;
@@ -912,8 +879,7 @@ sub replace_one_variable
 {
 	my ($templatefile, $placeholder, $value) = @_;
 
-	my $infoline = "Replacing $placeholder by $value in nsi file\n";
-	push( @installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf("Replacing %s by %s in nsi file\n", $placeholder, $value);
 
 	for ( my $i = 0; $i <= $#{$templatefile}; $i++ )
 	{
@@ -1309,11 +1275,10 @@ sub nsis_language_converter
 	elsif ( $language eq "vi" ) { $nsislanguage = "Vietnamese"; }
 	elsif ( $language eq "zh-CN" ) { $nsislanguage = "SimpChinese"; }
 	elsif ( $language eq "zh-TW" ) { $nsislanguage = "TradChinese"; }
-	else {
-		my $infoline = "NSIS language_converter : Could not find nsis language for $language!\n";
-		push( @installer::globals::logfileinfo, $infoline);
+	else
+    {
+        $installer::logger::Lang->printf("NSIS language_converter : Could not find nsis language for %s!\n", $language);
 		$nsislanguage = "English";
-		# installer::exiter::exit_program("ERROR: Could not find nsis language for $language!", "nsis_language_converter");  
 	}
 
 	return $nsislanguage;
@@ -1472,8 +1437,11 @@ sub replace_identifier_in_nshfile
 		{
 			my $oldstring = $1;
 			${$nshfile}[$i] =~ s/\Q$oldstring\E/$newstring/;
-			my $infoline = "NSIS replacement in $nshfilename ($onelanguage): $oldstring \-\> $newstring\n";
-			push( @installer::globals::logfileinfo, $infoline);
+            $installer::logger::Lang->printf("NSIS replacement in %s (%s):  \-\> %s\n",
+                $nshfilename,
+                $onelanguage,
+                $oldstring,
+                $newstring);
 		}
 	}
 }
@@ -1497,8 +1465,11 @@ sub replace_identifier_in_nlffile
 			my $oldstring = ${$nlffile}[$next];
 			${$nlffile}[$next] = $newstring . "\n";
 			$oldstring =~ s/\s*$//;
-			my $infoline = "NSIS replacement in $nlffilename ($onelanguage): $oldstring \-\> $newstring\n";
-			push( @installer::globals::logfileinfo, $infoline);
+            $installer::logger::Lang->printf("NSIS replacement in %s (%s): %s \-\> %s\n",
+                $nlffilename,
+                $onelanguage,
+                $oldstring,
+                $newstring);
 		}
 	}	
 }
@@ -1620,8 +1591,6 @@ sub copy_and_translate_nsis_language_fil
 	my $nlffilepath = $nsispath . $installer::globals::separator . "Contrib" . $installer::globals::separator . "Language\ files" . $installer::globals::separator;
 	my $nshfilepath = $nsispath . $installer::globals::separator . "Contrib" . $installer::globals::separator . "Modern\ UI" . $installer::globals::separator . "Language files" . $installer::globals::separator;
 
-	my $infoline = "";
-
 	for ( my $i = 0; $i <= $#{$languagesarrayref}; $i++ )
 	{
 		my $onelanguage = ${$languagesarrayref}[$i];
@@ -1656,8 +1625,7 @@ sub copy_and_translate_nsis_language_fil
 		
 		if ( $installer::globals::unicodensis )
 		{
-			$infoline = "This is Unicode NSIS!\n";
-			push( @installer::globals::logfileinfo, $infoline);
+            $installer::logger::Lang->printf("This is Unicode NSIS!\n");
 			convert_utf16_to_utf8($nshfilename);
 			convert_utf16_to_utf8($nlffilename);
 			$nshfile = installer::files::read_file($nshfilename);	# read nsh file again
@@ -1776,8 +1744,9 @@ sub get_path_to_nsis_sdk
 
 	if ( $nsispath eq "" )
 	{
-		installer::logger::print_message( "... no Environment variable \"SOLARROOT\", \"NSIS_PATH\" or \"NSISSDK_SOURCE\" found and NSIS not found in path!", "get_path_to_nsis_sdk");
-	} elsif ( ! -d $nsispath )
+        $installer::logger::Info->print("... no Environment variable \"SOLARROOT\", \"NSIS_PATH\" or \"NSISSDK_SOURCE\" found and NSIS not found in path!\n");
+	}
+    elsif ( ! -d $nsispath )
 	{
 		installer::exiter::exit_program("ERROR: NSIS path $nsispath does not exist!", "get_path_to_nsis_sdk");
 	}
@@ -1795,14 +1764,13 @@ sub call_nsis
 	
 	my $makensisexe = $nsispath . $installer::globals::separator . "makensis.exe";
 
-	installer::logger::print_message( "... starting $makensisexe ... \n" );
+    $installer::logger::Info->printf("... starting %s ... \n", $makensisexe);
 
 	if( $^O =~ /cygwin/i ) { $nsifile =~ s/\\/\//g;	}
 
 	my $systemcall = "$makensisexe $nsifile |";
 
-	my $infoline = "Systemcall: $systemcall\n";
-	push( @installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf("Systemcall: %s\n", $systemcall);
 
 	my @nsisoutput = ();
 
@@ -1814,17 +1782,17 @@ sub call_nsis
 
 	if ($returnvalue)
 	{
-		$infoline = "ERROR: $systemcall !\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("ERROR: %s !\n", $systemcall);
 	}
 	else
 	{
-		$infoline = "Success: $systemcall\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("Success: %s\n", $systemcall);
 	}		
 
-	for ( my $i = 0; $i <= $#nsisoutput; $i++ ) { push( @installer::globals::logfileinfo, "$nsisoutput[$i]"); }
-
+	foreach my $line (@nsisoutput)
+    {
+        $installer::logger::Lang->print($line);
+    }
 }
 
 #################################################################################
@@ -1874,8 +1842,7 @@ sub get_translation_file
 	my $translationfile = installer::files::read_file($translationfilename);
 	replace_variables($translationfile, $allvariableshashref);
 
-	my $infoline = "Reading translation file: $translationfilename\n";
-	push( @installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf("Reading translation file: %s\n", $translationfilename);
 	
 	return $translationfile;
 }
@@ -1904,8 +1871,7 @@ sub create_link_tree
 	
 	if ( ! $installer::globals::ooouploaddir ) { installer::exiter::exit_program("ERROR: Directory for AOO upload not defined!", "create_link_tree"); }
 	my $versiondir = $installer::globals::ooouploaddir . $installer::globals::separator . $versionstring;
-	my $infoline = "Directory for the link: $versiondir\n";
-	push(@installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf("Directory for the link: %s\n", $versiondir);
 	
 	if ( ! -d $versiondir ) { installer::systemactions::create_directory_structure($versiondir); }
 	
@@ -1915,8 +1881,7 @@ sub create_link_tree
 	# If there is an older version of this file (link), it has to be removed
 	if ( -f $linkdestination ) { unlink($linkdestination); }
 
-	$infoline = "Creating hard link from $sourcedownloadfile to $linkdestination\n";
-	push(@installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf("Creating hard link from %s to %s\n", $sourcedownloadfile, $linkdestination);
 	installer::systemactions::hardlink_one_file($sourcedownloadfile, $linkdestination);	
 }
 
@@ -1948,12 +1913,10 @@ sub create_download_sets
 {
 	my ($installationdir, $includepatharrayref, $allvariableshashref, $downloadname, $languagestringref, $languagesarrayref) = @_;
 	
-	my $infoline = "";
-	
-	my $force = 1; # print this message even in 'quiet' mode
-	installer::logger::print_message( "\n******************************************\n" );
-	installer::logger::print_message( "... creating download installation set ...\n", $force );
-	installer::logger::print_message( "******************************************\n" );
+    $installer::logger::Info->print("\n");
+    $installer::logger::Info->print("******************************************\n");
+    $installer::logger::Info->print("... creating download installation set ...\n", 1);
+    $installer::logger::Info->print("******************************************\n");
 
 	installer::logger::include_header_into_logfile("Creating download installation sets:");
 
@@ -2030,8 +1993,7 @@ sub create_download_sets
 			if ($$scriptref eq "") { installer::exiter::exit_program("ERROR: Could not find script file $scriptfilename!", "create_download_sets"); }
 			my $scriptfile = installer::files::read_file($$scriptref);
 
-			$infoline = "Found  script file $scriptfilename: $$scriptref \n";
-			push( @installer::globals::logfileinfo, $infoline);
+            $installer::logger::Lang->printf("Found  script file %s: %s \n", $scriptfilename, $$scriptref);
 	
 			# add product name into script template
 			put_productname_into_script($scriptfile, $allvariableshashref);
@@ -2054,7 +2016,7 @@ sub create_download_sets
 			my $newscriptfilename = determine_scriptfile_name($downloadname);
 			$newscriptfilename = save_script_file($downloaddir, $newscriptfilename, $scriptfile);
 
-			installer::logger::print_message( "... including installation set into $newscriptfilename ... \n" );
+            $installer::logger::Info->printf("... including installation set into %s ... \n", $newscriptfilename);
             # Append tar file to script
 			include_tar_into_script($newscriptfilename, $temporary_tarfile_name); 
 		}
@@ -2070,9 +2032,9 @@ sub create_download_sets
 		if ( $nsispath eq "" ) {
 			# If nsis is not found just skip the rest of this function
 			# and do not create the NSIS file.
-			$infoline = "\nNo NSIS SDK found. Skipping the generation of NSIS file.\n";
-			push(@installer::globals::logfileinfo, $infoline);
-			installer::logger::print_message( "... no NSIS SDK found. Skipping the generation of NSIS file ... \n" );
+            $installer::logger::Lang->print("\n");
+            $installer::logger::Lang->printf("No NSIS SDK found. Skipping the generation of NSIS file.\n");
+            $installer::logger::Info->print("... no NSIS SDK found. Skipping the generation of NSIS file ... \n");
 			return $downloaddir;
 		}
 
@@ -2114,8 +2076,8 @@ sub create_download_sets
 		put_version_specific_code_into_template($templatefile);
 	
 		my $nsifilename = save_script_file($localnsisdir, $templatefilename, $templatefile);
-		
-		installer::logger::print_message( "... created NSIS file $nsifilename ... \n" );
+
+        $installer::logger::Info->printf("... created NSIS file %s ... \n", $nsifilename);
 		
 		# starting the NSIS SDK to create the download file
 		call_nsis($nsispath, $nsifilename);		
@@ -2132,14 +2094,14 @@ sub create_download_link_tree
 {
 	my ($downloaddir, $languagestringref, $allvariableshashref) = @_;
 
-	my $infoline;
-
-	installer::logger::print_message( "\n******************************************\n" );
-	installer::logger::print_message( "... creating download hard link ...\n" );
-	installer::logger::print_message( "******************************************\n" );
+    $installer::logger::Info->print("\n");
+    $installer::logger::Info->print("******************************************\n"); # 
+    $installer::logger::Info->print("... creating download hard link ...\n");
+    $installer::logger::Info->print("******************************************\n");
 
 	installer::logger::include_header_into_logfile("Creating download hard link:");
-	installer::logger::include_timestamp_into_logfile("\nPerformance Info: Creating hard link, start");
+	$installer::logger::Lang->print("\n");
+	$installer::logger::Lang->add_timestamp("Performance Info: Creating hard link, start");
 
 	if ( is_supported_platform() )
 	{
@@ -2151,8 +2113,7 @@ sub create_download_link_tree
 		
 		# Is $versionstring empty? If yes, there is nothing to do now. 
 
-		$infoline = "Version string is set to: $versionstring\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("Version string is set to: %s\n", $versionstring);
 		
 		if ( $versionstring )
 		{
@@ -2164,14 +2125,12 @@ sub create_download_link_tree
 			if ( $destdownloadfilename )
 			{
 				$destdownloadfilename = $destdownloadfilename . $installer::globals::downloadfileextension;
-				
-				$infoline = "Setting destination download file name: $destdownloadfilename\n";
-				push( @installer::globals::logfileinfo, $infoline);
+
+                $installer::logger::Lang->printf("Setting destination download file name: %s\n", $destdownloadfilename);
 
 				my $sourcedownloadfile = $downloaddir . $installer::globals::separator . $installer::globals::downloadfilename;
 
-				$infoline = "Setting source download file name: $sourcedownloadfile\n";
-				push( @installer::globals::logfileinfo, $infoline);
+                $installer::logger::Lang->printf("Setting source download file name: %s\n", $sourcedownloadfile);
 
 				create_link_tree($sourcedownloadfile, $destdownloadfilename, $versionstring);
 				# my $md5sumoutput = call_md5sum($downloadfile);
@@ -2181,17 +2140,15 @@ sub create_download_link_tree
 		}
 		else
 		{
-			$infoline = "Version string is empty. Nothing to do!\n";
-			push( @installer::globals::logfileinfo, $infoline);		
-		}
+            $installer::logger::Lang->printf("Version string is empty. Nothing to do!\n");
+        }
 	}	
 	else
 	{
-		$infoline = "Platform not used for hard linking. Nothing to do!\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("Platform not used for hard linking. Nothing to do!\n");
 	}
 
-	installer::logger::include_timestamp_into_logfile("Performance Info: Creating hard link, stop");
+	$installer::logger::Lang->add_timestamp("Performance Info: Creating hard link, stop");
 }
 
 1;

Modified: openoffice/branches/capstone2013/main/solenv/bin/modules/installer/downloadsigner.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/solenv/bin/modules/installer/downloadsigner.pm?rev=1538719&r1=1538718&r2=1538719&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/solenv/bin/modules/installer/downloadsigner.pm (original)
+++ openoffice/branches/capstone2013/main/solenv/bin/modules/installer/downloadsigner.pm Mon Nov  4 19:00:37 2013
@@ -87,8 +87,6 @@ Ende
 
 sub getparameter
 {
-	# installer::logger::print_message("Checking parameter");
-
 	while ( $#ARGV >= 0 )
 	{
 		my $param = shift(@ARGV);
@@ -192,8 +190,9 @@ sub set_temp_path
 		usage();
 		exit(-1);
 	}
-	
-	installer::logger::print_message( "\n... using output path: $temppath ...\n" );
+
+	$installer::logger::Info->print("\n");
+	$installer::logger::Info->printf("\n... using output path: %s ...\n", $temppath);
 	
 	push(@installer::globals::removedirs, $temppath);
 	
@@ -226,8 +225,9 @@ sub set_output_pathes_to_temp
 sub set_minor_into_pathes
 {
 	my ($followmeinfohash, $temppath) = @_;
-	
-	installer::logger::print_message( "\n... forcing into minor: $installer::globals::lastminor ...\n" );
+
+    $installer::logger::Info->print("\n");
+    $installer::logger::Info->printf("... forcing into minor: %s ...\n", $installer::globals::lastminor);
 	
 	my @pathnames = ("bin", "doc", "inc", "lib", "pck", "res", "xml");
 	my $sourcename = "src";
@@ -235,7 +235,8 @@ sub set_minor_into_pathes
 	
 	if ( $installer::globals::minor ne "" )
 	{
-		installer::logger::print_message( "\n... already defined minor: $installer::globals::minor -> ignoring parameter \"-useminor\" ...\n" );
+        $installer::logger::Info->print("\n");
+        $installer::logger::Info->printf("... already defined minor: %s -> ignoring parameter \"-useminor\" ...\n" , $installer::globals::minor);
 		return;
 	}
 
@@ -247,19 +248,16 @@ sub set_minor_into_pathes
 	# $installer::globals::idtlanguagepath
 
 	installer::logger::include_header_into_logfile("Changing saved pathes to add the minor");
-	my $infoline = "Old pathes:\n";
-	push( @installer::globals::logfileinfo, $infoline);
-	$infoline = "\$followmeinfohash->{'installlogdir'}: $followmeinfohash->{'installlogdir'}\n";
-	push( @installer::globals::logfileinfo, $infoline);
-	$infoline = "\$installer::globals::unpackpath: $installer::globals::unpackpath\n";
-	push( @installer::globals::logfileinfo, $infoline);
-	$infoline = "\$installer::globals::idttemplatepath: $installer::globals::idttemplatepath\n";
-	push( @installer::globals::logfileinfo, $infoline);
-	$infoline = "\$installer::globals::idtlanguagepath: $installer::globals::idtlanguagepath\n";
-	push( @installer::globals::logfileinfo, $infoline);
-	$infoline = "Include pathes:\n";
-	push( @installer::globals::logfileinfo, $infoline);
-	foreach my $path ( @{$followmeinfohash->{'includepatharray'}} ) { push( @installer::globals::logfileinfo, $path); }
+    $installer::logger::Lang->print("Old pathes:\n");
+    $installer::logger::Lang->printf("\$followmeinfohash->{'installlogdir'}: %s\n", $followmeinfohash->{'installlogdir'});
+    $installer::logger::Lang->printf("\$installer::globals::unpackpath: %s\n", $installer::globals::unpackpath);
+    $installer::logger::Lang->printf("\$installer::globals::idttemplatepath: %s\n", $installer::globals::idttemplatepath);
+    $installer::logger::Lang->printf("\$installer::globals::idtlanguagepath: %s\n", $installer::globals::idtlanguagepath);
+    $installer::logger::Lang->printf("Include pathes:\n");
+	foreach my $path ( @{$followmeinfohash->{'includepatharray'}} )
+    {
+        $installer::logger::Lang->print($path);
+    }
 	
 	foreach $onepath ( @pathnames )
 	{
@@ -302,19 +300,17 @@ sub set_minor_into_pathes
 	if ( $installer::globals::idtlanguagepath =~ /\Q$srcpath\E/ ) { $installer::globals::idtlanguagepath =~ s/\Q$srcpath\E/$newsrcpath/; }
 	foreach my $path ( @{$followmeinfohash->{'includepatharray'}} ) { if ( $path =~ /\Q$srcpath\E/ ) { $path =~ s/\Q$srcpath\E/$newsrcpath/; } }
 
-	$infoline = "\nNew pathes:\n";
-	push( @installer::globals::logfileinfo, $infoline);
-	$infoline = "\$followmeinfohash->{'installlogdir'}: $followmeinfohash->{'installlogdir'}\n";
-	push( @installer::globals::logfileinfo, $infoline);
-	$infoline = "\$installer::globals::unpackpath: $installer::globals::unpackpath\n";
-	push( @installer::globals::logfileinfo, $infoline);
-	$infoline = "\$installer::globals::idttemplatepath: $installer::globals::idttemplatepath\n";
-	push( @installer::globals::logfileinfo, $infoline);
-	$infoline = "\$installer::globals::idtlanguagepath: $installer::globals::idtlanguagepath\n";
-	push( @installer::globals::logfileinfo, $infoline);
-	$infoline = "Include pathes:\n";
-	push( @installer::globals::logfileinfo, $infoline);
-	foreach my $path ( @{$followmeinfohash->{'includepatharray'}} ) { push( @installer::globals::logfileinfo, $path); }
+    $installer::logger::Lang->print("\n");
+    $installer::logger::Lang->print("New pathes:\n");
+    $installer::logger::Lang->printf("\$followmeinfohash->{'installlogdir'}: %s\n", $followmeinfohash->{'installlogdir'});
+    $installer::logger::Lang->printf("\$installer::globals::unpackpath: %s\n", $installer::globals::unpackpath);
+    $installer::logger::Lang->printf("\$installer::globals::idttemplatepath: %s\n", $installer::globals::idttemplatepath);
+    $installer::logger::Lang->printf("\$installer::globals::idtlanguagepath: %s\n", $installer::globals::idtlanguagepath);
+    $installer::logger::Lang->printf("Include pathes:\n");
+	foreach my $path ( @{$followmeinfohash->{'includepatharray'}} )
+    {
+        $installer::logger::Lang->print($path);
+    }
 }
 
 #############################################
@@ -380,16 +376,17 @@ sub publishproductlist
 {
 	my ($infofilelist) = @_;
 
-	installer::logger::print_message( "\n... found products: ...\n" );
+    $installer::logger::Info->print("\n");
+    $installer::logger::Info->printf("... found products: ...\n");
 
 	for ( my $i = 0; $i <= $#{$infofilelist}; $i++ )
 	{
 		my $onefile = ${$infofilelist}[$i];
 		installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$onefile);
-		installer::logger::print_message( "...... $onefile ...\n" );	
+        $installer::logger::Info->printf("...... $onefile ...\n");
 	}
 
-	installer::logger::print_message( "\n" );
+    $installer::logger::Info->printf("\n");
 }
 
 #########################################################
@@ -469,7 +466,8 @@ sub createproductlist
 	}
 	elsif ( -d $installer::globals::followmeinfofilename )
 	{
-		installer::logger::print_message( "\n... reading directory: $installer::globals::followmeinfofilename ...\n" );
+        $installer::logger::Info->printf("\n");
+        $installer::logger::Info->printf("... reading directory: %s ...\n", $installer::globals::followmeinfofilename);
 		$installer::globals::followmeinfofilename =~ s/$installer::globals::separator\s*$//;
 		my $allfollowmefiles = installer::systemactions::find_file_with_file_extension("log", $installer::globals::followmeinfofilename);
 
@@ -546,14 +544,26 @@ sub logfollowmeinfohash
 {
 	my ( $followmehash ) = @_;
 
-	print "\n*****************************************\n";
-	print "Content of follow-me info file:\n";
-	print "finalinstalldir: $followmehash->{'finalinstalldir'}\n";
-	print "downloadname: $followmehash->{'downloadname'}\n";
-	print "languagestring: $followmehash->{'languagestring'}\n";
-	foreach my $lang ( @{$followmehash->{'languagesarray'}} ) { print "languagesarray: $lang\n"; }
-	foreach my $path ( @{$followmehash->{'includepatharray'}} ) { print "includepatharray: $path"; }
-	foreach my $key ( sort keys %{$followmehash->{'allvariableshash'}} ) { print "allvariableshash: $key : $followmehash->{'allvariableshash'}->{$key}\n"; }
+    $installer::logger::Info->printf("\n");
+    $installer::logger::Info->printf("*****************************************\n");
+    $installer::logger::Info->printf("Content of follow-me info file:\n");
+    $installer::logger::Info->printf("finalinstalldir: %s\n", $followmehash->{'finalinstalldir'});
+    $installer::logger::Info->printf("downloadname: %s\n", $followmehash->{'downloadname'});
+    $installer::logger::Info->printf("languagestring: %s\n", $followmehash->{'languagestring'});
+	foreach my $lang ( @{$followmehash->{'languagesarray'}} )
+    {
+        $installer::logger::Info->printf("languagesarray: %s\n", $lang);
+    }
+	foreach my $path ( @{$followmehash->{'includepatharray'}} )
+    {
+        $installer::logger::Info->printf("includepatharray: %s\n", $path);
+    }
+	foreach my $key ( sort keys %{$followmehash->{'allvariableshash'}} )
+    {
+        $installer::logger::Info->printf("allvariableshash: %s : %s\n",
+            $key,
+            $followmehash->{'allvariableshash'}->{$key});
+    }
 }
 
 ########################################################################
@@ -574,7 +584,11 @@ sub rename_followme_infofile
 	if ( $filename ne $newfilename )
 	{
 		my $returnvalue = rename($filename, $newfilename);
-		if ( $returnvalue ) { installer::logger::print_message( "\n... renamed file \"$filename\" to \"$newfilename\" ...\n" ); }
+		if ( $returnvalue )
+        {
+            $installer::logger::Info->printf("\n");
+            $installer::logger::Info->printf("... renamed file \"%s\" to \"%s\" ...\n", $filename, $newfilename);
+        }
 	}
 }
 

Modified: openoffice/branches/capstone2013/main/solenv/bin/modules/installer/environment.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/solenv/bin/modules/installer/environment.pm?rev=1538719&r1=1538718&r2=1538719&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/solenv/bin/modules/installer/environment.pm (original)
+++ openoffice/branches/capstone2013/main/solenv/bin/modules/installer/environment.pm Mon Nov  4 19:00:37 2013
@@ -83,14 +83,12 @@ sub check_tilde_in_directory
 		my $home = $ENV{'HOME'};
 		$home =~ s/\Q$installer::globals::separator\E\s*$//;
 		$installer::globals::localinstalldir =~ s/~/$home/;
-		my $infoline = "Info: Changing LOCALINSTALLDIR to $installer::globals::localinstalldir\n";
-		push(@installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("Info: Changing LOCALINSTALLDIR to %s\n", $installer::globals::localinstalldir);
 	}
 	else
 	{
-		# exit, because "~" is not allowed, if HOME is not set			
-		my $infoline = "ERROR: If \"~\" is used in \"LOCALINSTALLDIR\", environment variable \"HOME\" needs to be defined!\n";
-		push(@installer::globals::logfileinfo, $infoline);
+		# exit, because "~" is not allowed, if HOME is not set
+        $installer::logger::Lang->printf("ERROR: If \"~\" is used in \"LOCALINSTALLDIR\", environment variable \"HOME\" needs to be defined!\n");
 		installer::exiter::exit_program("ERROR: If \"~\" is used in \"LOCALINSTALLDIR\", environment variable \"HOME\" needs to be defined!", "check_tilde_in_directory");
 	}	
 }

Modified: openoffice/branches/capstone2013/main/solenv/bin/modules/installer/epmfile.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/solenv/bin/modules/installer/epmfile.pm?rev=1538719&r1=1538718&r2=1538719&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/solenv/bin/modules/installer/epmfile.pm (original)
+++ openoffice/branches/capstone2013/main/solenv/bin/modules/installer/epmfile.pm Mon Nov  4 19:00:37 2013
@@ -36,7 +36,7 @@ use installer::remover;
 use installer::scriptitems;
 use installer::systemactions;
 use installer::worker;
-use POSIX;
+use POSIX qw(uname);
 
 ############################################################################
 # Reading the package map to find Solaris package names for 
@@ -50,9 +50,10 @@ sub read_packagemap
 	my $packagemapname = "";
 	if ( $allvariables->{'PACKAGEMAP'} ) { $packagemapname = $allvariables->{'PACKAGEMAP'}; }
 	if ( $packagemapname eq "" ) { installer::exiter::exit_program("ERROR: Property PACKAGEMAP must be defined!", "read_packagemap"); }
-	
-	my $infoline = "\n\nCollected abbreviations and package names:\n";
-	push(@installer::globals::logfileinfo, $infoline);
+
+    $installer::logger::Lang->printf("\n");
+    $installer::logger::Lang->printf("\n");
+    $installer::logger::Lang->printf("nCollected abbreviations and package names:\n");
 
 	# Can be a comma separated list. All files have to be found in include pathes
 	my $allpackagemapnames = installer::converter::convert_stringlist_into_hash(\$packagemapname, ",");
@@ -90,8 +91,10 @@ sub read_packagemap
 						$local_packagename =~ s/\%LANGUAGESTRING/$onelang/g;
 
                         # Logging all abbreviations and packagenames
-                        $infoline = "$onelang : $local_abbreviation : $local_packagename\n";
-                        push(@installer::globals::logfileinfo, $infoline);
+                        $installer::logger::Lang->printf("%s : %s : %s\n",
+                            $onelang,
+                            $local_abbreviation,
+                            $local_packagename);
 
 						if ( exists($installer::globals::dependfilenames{$local_abbreviation}) )
 						{
@@ -106,8 +109,7 @@ sub read_packagemap
 				else
 				{
                     # Logging all abbreviations and packagenames
-                    $infoline = "$abbreviation : $packagename\n";
-                    push(@installer::globals::logfileinfo, $infoline);
+                    $installer::logger::Lang->printf("%s : %s\n", $abbreviation, $packagename);
 
 					if ( exists($installer::globals::dependfilenames{$abbreviation}) )
 					{
@@ -126,10 +128,9 @@ sub read_packagemap
 			}
 		}
 	}
-	
-	$infoline = "\n\n";
-	push(@installer::globals::logfileinfo, $infoline);
 
+    $installer::logger::Lang->print("\n");
+    $installer::logger::Lang->print("\n");
 }
 
 ############################################################################
@@ -481,8 +482,7 @@ sub create_epm_header
 			installer::files::save_file($$fileref, $copyrightfile);
 		}
 
-		$infoline = "Using license file: \"$$fileref\"!\n";
-		push(@installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("Using license file: \"%s\"!\n", $$fileref);
 
 		$foundlicensefile = 1;
 		$line = "%license" . " " . $$fileref . "\n";
@@ -824,8 +824,7 @@ sub find_epm_on_system
 		if (!($$epmfileref eq "")) { $epmname = $$epmfileref; }
 	}
 
-	my $infoline = "Using epmfile: $epmname\n";
-	push( @installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf("Using epmfile: %s\n", $epmname);
 	
 	return $epmname;	
 }
@@ -854,13 +853,15 @@ sub set_patch_state
 
 	if ( $installer::globals::is_special_epm )
 	{
-		$infoline = "\nPatch state: This is a patched version of epm!\n\n";
-		push( @installer::globals::logfileinfo, $infoline);		
+        $installer::logger::Lang->print("\n");
+        $installer::logger::Lang->print("Patch state: This is a patched version of epm!\n");
+        $installer::logger::Lang->print("\n");
 	}
 	else	
 	{
-		$infoline = "\nPatch state: This is an unpatched version of epm!\n\n";
-		push( @installer::globals::logfileinfo, $infoline);		
+        $installer::logger::Lang->print("\n");
+        $installer::logger::Lang->print("Patch state: This is an unpatched version of epm!\n");
+        $installer::logger::Lang->print("\n");
 	}
 
 	if ( ( $installer::globals::is_special_epm ) && (($installer::globals::islinuxrpmbuild) || ($installer::globals::issolarispkgbuild)) )
@@ -927,7 +928,7 @@ sub call_epm
 	
 	my $systemcall = $ldpreloadstring . $epmname . " -f " . $packageformat . " " . $extraflags . " " . $localpackagename . " " . $epmlistfilename . $outdirstring . " " . $verboseflag . " " . " 2\>\&1 |";
 
-	installer::logger::print_message( "... $systemcall ...\n" );
+    $installer::logger::Info->printf("... %s ...\n", $systemcall);
 
 	my $maxepmcalls = 3;
 
@@ -941,26 +942,23 @@ sub call_epm
 
 		my $returnvalue = $?;	# $? contains the return value of the systemcall
 
-		my $infoline = "Systemcall  (Try $i): $systemcall\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("Systemcall  (Try %d): \n", $i, $systemcall);
 
 		for ( my $j = 0; $j <= $#epmoutput; $j++ )
 		{
 			if ( $i < $maxepmcalls ) { $epmoutput[$j] =~ s/\bERROR\b/PROBLEM/ig; }
-			push( @installer::globals::logfileinfo, "$epmoutput[$j]");
+            $installer::logger::Lang->print($epmoutput[$j]);
 		}
 	
 		if ($returnvalue)
 		{
-			$infoline = "Try $i : Could not execute \"$systemcall\"!\n";
-			push( @installer::globals::logfileinfo, $infoline);
+            $installer::logger::Lang->printf("Try %d : Could not execute \"%s\"!\n", $i, $systemcall);
 			if ( $i == $maxepmcalls ) { installer::exiter::exit_program("ERROR: \"$systemcall\"!", "call_epm"); }
 		}
 		else
 		{
-			installer::logger::print_message( "Success (Try $i): \"$systemcall\"\n" );
-			$infoline = "Success: Executed \"$systemcall\" successfully!\n";
-			push( @installer::globals::logfileinfo, $infoline);
+            $installer::logger::Info->printf("Success: Executed (Try %d): \"%s\" successfully\n", $i, $systemcall);
+            $installer::logger::Lang->printf("Success: Executed (Try %d): \"%s\" successfully\n", $i, $systemcall);
 			last;
 		}	
 	}
@@ -1000,8 +998,7 @@ sub add_one_line_into_file
 	}
 
 	$insertline =~ s/\s*$//;	# removing line end for correct logging
-	my $infoline = "Success: Added line $insertline into file $filename!\n";
-	push( @installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf("Success: Added line %s into file !\n", $insertline, $filename);
 }
 
 #####################################################################
@@ -1035,8 +1032,10 @@ sub set_revision_in_pkginfo
 			my $oldstring = $1;
 			my $newstring = $oldstring . $revisionstring;	# also adding the date string
 			${$file}[$i] =~ s/$oldstring/$newstring/;
-			my $infoline = "Info: Changed in $filename file: \"$oldstring\" to \"$newstring\"!\n";
-			push( @installer::globals::logfileinfo, $infoline);
+            $installer::logger::Lang->printf("Info: Changed in %s file: \"%s\" to \"\"!\n",
+                $filename,
+                $oldstring,
+                $newstring);
 			last;
 		}	
 	}
@@ -1091,8 +1090,7 @@ sub set_revision_in_pkginfo
 					${$file}[$i] = $newstring;
 					$oldstring =~ s/\s*$//;
 					$newstring =~ s/\s*$//;
-					my $infoline = "Info: Changed in $filename file: \"$oldstring\" to \"$newstring\"!\n";
-					push( @installer::globals::logfileinfo, $infoline);
+                    $installer::logger::Lang->printf("Info: Changed in %s file: \"%s\" to \"\"!\n", $filename, $oldstring, $newstring);
 					last;
 				}
 			}	
@@ -1324,8 +1322,7 @@ sub set_topdir_in_specfile
 			my $removeline = ${$changefile}[$i];
 			$removeline =~ s/\s*$//;
 			splice(@{$changefile},$i,1);
-			my $infoline = "Info: Removed line \"$removeline\" from file $filename!\n";
-			push( @installer::globals::logfileinfo, $infoline);
+            $installer::logger::Lang->printf("Info: Removed line \"%s\" from file %s!\n", $removeline, $filename);
 			last;
 		}	
 	}
@@ -1343,8 +1340,7 @@ sub set_topdir_in_specfile
 			splice(@{$changefile},$i+1,0,$topdirline);
 			$inserted_line = 1;
 			$topdirline =~ s/\s*$//;
-			my $infoline = "Success: Added line $topdirline into file $filename!\n";
-			push( @installer::globals::logfileinfo, $infoline);
+            $installer::logger::Lang->printf("Success: Added line %s into file %s!\n", $topdirline, $filename);
 		}	
 	}
 		
@@ -1369,8 +1365,9 @@ sub set_packager_in_specfile
 		{
 			my $oldstring = $1;
 			${$changefile}[$i] =~ s/\Q$oldstring\E/$packager/;
-			my $infoline = "Info: Changed Packager in spec file from $oldstring to $packager!\n";
-			push( @installer::globals::logfileinfo, $infoline);			
+            $installer::logger::Lang->printf("Info: Changed Packager in spec file from %s to %s!\n",
+                $oldstring,
+                $packager);
 			last;			
 		}	
 	}
@@ -1393,8 +1390,9 @@ sub set_prereq_in_specfile
 		{
 			my $oldstring = ${$changefile}[$i];
 			${$changefile}[$i] =~ s/Requires:/$prereq/;
-			my $infoline = "Info: Changed requirements in spec file from $oldstring to ${$changefile}[$i]!\n";
-			push( @installer::globals::logfileinfo, $infoline);			
+            $installer::logger::Lang->printf("Info: Changed requirements in spec file from %s to %s!\n",
+                $oldstring,
+                ${$changefile}[$i]);
 		}	
 	}
 }
@@ -1427,9 +1425,7 @@ sub set_autoprovreq_in_specfile
 		{
 			splice(@{$changefile},$i+1,0,$autoreqprovline);
 			$autoreqprovline =~ s/\s*$//;
-            $infoline = "Success: Added line $autoreqprovline into spec file!\n";
-			push( @installer::globals::logfileinfo, $infoline);
-			
+            $installer::logger::Lang->printf("Success: Added line %s into spec file!\n", $autoreqprovline);
 			last;
         }
     }
@@ -1451,8 +1447,7 @@ sub set_license_in_specfile
 		if ( ${$changefile}[$i] =~ /^\s*Copyright\s*:\s*(.+?)\s*$/ )
 		{
 			${$changefile}[$i] = "License: $license\n";
-			my $infoline = "Info: Replaced Copyright with License: $license !\n";
-			push( @installer::globals::logfileinfo, $infoline);			
+            $installer::logger::Lang->printf("Info: Replaced Copyright with License: %s !\n", $license);
 			last;			
 		}	
 	}
@@ -1491,8 +1486,7 @@ sub make_prototypefile_relocatable
 			my $line = ${$prototypefile}[$i];
 			splice(@{$prototypefile},$i,1);	# removing the line
 			$line =~ s/\s*$//;
-			my $infoline = "Info: Removed line \"$line\" from prototype file!\n";
-			push( @installer::globals::logfileinfo, $infoline);
+            $installer::logger::Lang->printf("Info: Removed line \"%s\" from prototype file!\n", $line);
 			last;
 		}
 	}
@@ -1504,8 +1498,7 @@ sub make_prototypefile_relocatable
 		if ( ${$prototypefile}[$i] =~ /\\\$/ )
 		{
 			${$prototypefile}[$i] =~ s/\\\$/\$/g;
-			my $infoline2 = "Info: Changed line in prototype file: ${$prototypefile}[$i] !\n";
-			push( @installer::globals::logfileinfo, $infoline2);		
+            $installer::logger::Lang->printf("Info: Changed line in prototype file: %s !\n", ${$prototypefile}[$i]);
 		}
 	}
 }
@@ -1541,8 +1534,10 @@ sub set_volatilefile_into_prototypefile
 					my $newline = ${$prototypefile}[$j];
 					$oldline =~ s/\s*$//;
 					$newline =~ s/\s*$//;
-					my $infoline = "Volatile file: Changing content from \"$oldline\" to \"$newline\" .\n";
-					push(@installer::globals::logfileinfo, $infoline);
+                    $installer::logger::Lang->printf(
+                        "Volatile file: Changing content from \"%s\" to \"%s\" .\n",
+                        $oldline,
+                        $newline);
 					last;
 				}
 			}
@@ -1566,8 +1561,8 @@ sub replace_variables_in_shellscripts_fo
 			my $oldline = ${$scriptfile}[$i];
 			if (( $oldstring eq "PRODUCTDIRECTORYNAME" ) && ( $newstring eq "" )) { $oldstring = $oldstring . "/"; }
 			${$scriptfile}[$i] =~ s/\Q$oldstring\E/$newstring/g;
-			my $infoline = "Info: Substituting in $scriptfilename $oldstring by $newstring\n";
-			push(@installer::globals::logfileinfo, $infoline);
+            $installer::logger::Lang->printf("Info: Substituting in %s %s by %s\n",
+                $scriptfilename, $oldstring, $newstring);
 		}
 	}	
 }
@@ -1594,15 +1589,15 @@ sub replace_variables_in_shellscripts
 		{
 			my $oldline = ${$scriptfile}[$i];
 			${$scriptfile}[$i] =~ s/\Q$oldstring\E/$newstring/g;
-			${$scriptfile}[$i] =~ s/\/\//\//g;	# replacing "//" by "/" , if path $newstring is empty!			
-			my $infoline = "Info: Substituting in $scriptfilename $oldstring by $newstring\n";
-			push(@installer::globals::logfileinfo, $infoline);
+			${$scriptfile}[$i] =~ s/\/\//\//g;	# replacing "//" by "/" , if path $newstring is empty!
+            $installer::logger::Lang->printf("Info: Substituting in %s %s by %s\n",
+                $scriptfilename,
+                $oldstring,
+                $newstring);
 			if ( $debug )
 			{
-				$infoline = "Old Line: $oldline";
-				push(@installer::globals::logfileinfo, $infoline);			
-				$infoline = "New Line: ${$scriptfile}[$i]";
-				push(@installer::globals::logfileinfo, $infoline);			
+                $installer::logger::Lang->printf("Old Line: %s", $oldline);
+                $installer::logger::Lang->printf("New Line: %s", ${$scriptfile}[$i]);
 			}
 		}
 	}
@@ -1626,8 +1621,7 @@ sub determine_installdir_ooo
 
 	$dirname =~ s/\s*$//;
 
-	my $infoline = "Info: Directory created by epm: $dirname\n";
-	push(@installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf("Info: Directory created by epm: %s\n", $dirname);
 	
 	return $dirname;
 }
@@ -1663,8 +1657,8 @@ sub set_tab_into_datafile
 						$oldline =~ s/\s*$//;
 						$newline =~ s/\s*$//;
 
-						my $infoline = "TAB: Changing content from \"$oldline\" to \"$newline\" .\n";
-						push(@installer::globals::logfileinfo, $infoline);
+                        $installer::logger::Lang->printf("TAB: Changing content from \"%s\" to \"%s\" .\n",
+                            $oldline, $newline);
 
 						# collecting all new classes
 						if (! installer::existence::exists_in_array($onefile->{'SolarisClass'}, \@newclasses))
@@ -1705,8 +1699,8 @@ sub set_tab_into_datafile
 						$oldline =~ s/\s*$//;
 						$newline =~ s/\s*$//;
 
-						my $infoline = "TAB: Changing content from \"$oldline\" to \"$newline\" .\n";
-						push(@installer::globals::logfileinfo, $infoline);
+                        $installer::logger::Lang->printf(
+                            "TAB: Changing content from \"%s\" to \"%s\" .\n", $oldline, $newline);
 
 						last;
 					}				
@@ -1736,8 +1730,8 @@ sub include_classes_into_pkginfo
 			my $newline = ${$changefile}[$i];
 			$newline =~ s/\s*$//;
 
-			my $infoline = "pkginfo file: Changing content from \"$oldline\" to \"$newline\" .\n";
-			push(@installer::globals::logfileinfo, $infoline);
+            $installer::logger::Lang->printf("pkginfo file: Changing content from \"%s\" to \"%s\" .\n",
+                $oldline, $newline);
 		}
 	}
 }
@@ -2196,8 +2190,8 @@ sub check_requirements_in_specfile
 
 			$oldline =~ s/\s*$//;
 			$newline =~ s/\s*$//;
-			my $infoline = "Spec File: Changing content from \"$oldline\" to \"$newline\".\n";
-			push(@installer::globals::logfileinfo, $infoline);	
+            $installer::logger::Lang->printf("Spec File: Changing content from \"%s\" to \"%s\".\n",
+                $oldline, $newline);
 		}
 	}
 }
@@ -2261,13 +2255,16 @@ sub determine_rpm_version
 	{
 		$rpmout =~ s/\s*$//g;
 
-		my $infoline = "Systemcall: $systemcall\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("Systemcall: %s\n", $systemcall);
 
-		if ( $rpmout eq "" ) { $infoline = "ERROR: Could not find file \"rpm\" !\n"; }
-		else { $infoline = "Success: rpm version: $rpmout\n"; }
-
-		push( @installer::globals::logfileinfo, $infoline);
+		if ( $rpmout eq "" )
+        {
+            $installer::logger::Lang->printf("ERROR: Could not find file \"rpm\" !\n");
+        }
+		else
+        {
+            $installer::logger::Lang->printf("Success: rpm version: %s\n", $rpmout);
+        }
 	
 		if ( $rpmout =~ /(\d+)\.(\d+)\.(\d+)/ ) { $rpmversion = $1; }
 		elsif ( $rpmout =~ /(\d+)\.(\d+)/ ) { $rpmversion = $1; }
@@ -2287,8 +2284,9 @@ sub log_rpm_info
 	my $systemcall = "";
 	my $infoline = "";
 
-	$infoline = "\nLogging rpmrc content using --showrc\n\n";
-	push( @installer::globals::logfileinfo, $infoline);		
+    $installer::logger::Lang->printf("\n");
+    $installer::logger::Lang->printf("Logging rpmrc content using --showrc\n");
+    $installer::logger::Lang->printf("\n");
 
 	if ( $installer::globals::rpm ne "" )
 	{
@@ -2314,17 +2312,16 @@ sub log_rpm_info
 
 			$infoline = "$rpmout\n";
 			$infoline =~ s/error/e_r_r_o_r/gi;  # avoiding log problems
-			push( @installer::globals::logfileinfo, $infoline);
+            $installer::logger::Lang->printf($infoline);
 		}
 	}
 	else
 	{
-		$infoline = "Problem in systemcall: $systemcall : No return value\n";
-		push( @installer::globals::logfileinfo, $infoline);		
+        $installer::logger::Lang->printf("Problem in systemcall: %s : No return value\n", $systemcall);
 	}	
-	
-	$infoline = "End of logging rpmrc\n\n";
-	push( @installer::globals::logfileinfo, $infoline);		
+
+    $installer::logger::Lang->printf("End of logging rpmrc\n");
+    $installer::logger::Lang->print("\n");
 }
 
 #################################################
@@ -2350,7 +2347,7 @@ sub create_packages_without_epm
 		
 		# my $systemcall = "pkgmk -o -f $prototypefile -d $destinationdir \> /dev/null 2\>\&1";
 		my $systemcall = "pkgmk -l 1073741824 -o -f $prototypefile -d $destinationdir 2\>\&1 |";
-		installer::logger::print_message( "... $systemcall ...\n" );
+        $installer::logger::Info->printf("... %s ...\n", $systemcall);
 
 		my $maxpkgmkcalls = 3;
 
@@ -2364,26 +2361,26 @@ sub create_packages_without_epm
 
 			my $returnvalue = $?;	# $? contains the return value of the systemcall
 
-			my $infoline = "Systemcall (Try $i): $systemcall\n";
-			push( @installer::globals::logfileinfo, $infoline);
+            $installer::logger::Lang->printf("Systemcall (Try %d): %s\n", $i, $systemcall);
 
 			for ( my $j = 0; $j <= $#pkgmkoutput; $j++ )
 			{
 				if ( $i < $maxpkgmkcalls ) { $pkgmkoutput[$j] =~ s/\bERROR\b/PROBLEM/ig; }
-				push( @installer::globals::logfileinfo, "$pkgmkoutput[$j]");
+                $installer::logger::Lang->print($pkgmkoutput[$j]);
 			}
 		
 			if ($returnvalue)
 			{
-				$infoline = "Try $i : Could not execute \"$systemcall\"!\n";
-				push( @installer::globals::logfileinfo, $infoline);
+                $installer::logger::Lang->printf("Try %s : Could not execute \"%s\"!\n",
+                    $i, $systemcall);
 				if ( $i == $maxpkgmkcalls ) { installer::exiter::exit_program("ERROR: \"$systemcall\"!", "create_packages_without_epm"); }
 			}
 			else
 			{
-				installer::logger::print_message( "Success (Try $i): \"$systemcall\"\n" );
-				$infoline = "Success: Executed \"$systemcall\" successfully!\n";
-				push( @installer::globals::logfileinfo, $infoline);
+                $installer::logger::Info->printf("Success: (Try %d): Executed \"%s\" successfully\n",
+                    $i, $systemcall);
+                $installer::logger::Lang->printf("Success: (Try %d): Executed \"%s\" successfully\n",
+                    $i, $systemcall);
 				last;
 			}
 		}
@@ -2410,28 +2407,25 @@ sub create_packages_without_epm
 
 				$systemcall = "cd $destinationdir; cp -p -R $packagename $installer::globals::saved_packages_path;";
 			 	make_systemcall($systemcall);
-				installer::logger::print_message( "... $systemcall ...\n" );
+                $installer::logger::Info->printf("... %s ...\n", $systemcall);
 
 				# Setting unix rights to "775" for all created directories inside the package,
 				# that is saved in temp directory		
 
 				$systemcall = "cd $packagestempdir; find $packagename -type d -exec chmod 775 \{\} \\\;";
-				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->printf("Systemcall: %s\n", $systemcall);
 		
 				if ($returnvalue)
 				{
-					$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-					push( @installer::globals::logfileinfo, $infoline);
+                    $installer::logger::Lang->printf("ERROR: Could not execute \"%s\"!\n", $systemcall);
 				}
 				else
 				{
-					$infoline = "Success: Executed \"$systemcall\" successfully!\n";
-					push( @installer::globals::logfileinfo, $infoline);
+                    $installer::logger::Lang->printf("Success: Executed \"%s\" successfully!\n", $systemcall);
 				}
 			}
 		}
@@ -2452,11 +2446,10 @@ sub create_packages_without_epm
 			 	make_systemcall($systemcall);
 			
 				$faspac = $$compressorref;
-				$infoline = "Found compressor: $faspac\n";
-				push( @installer::globals::logfileinfo, $infoline);
+                $installer::logger::Lang->printf("Found compressor: %s\n", $faspac);
 
-				installer::logger::print_message( "... $faspac ...\n" );
-				installer::logger::include_timestamp_into_logfile("Starting $faspac");
+                $installer::logger::Info->printf("... %s ...\n", $faspac);
+				$installer::logger::Lang->add_timestamp("Starting $faspac");
 
 			 	$systemcall = "/bin/sh $faspac -a -q -d $destinationdir $packagename";	 # $faspac has to be the absolute path!
 			 	make_systemcall($systemcall);
@@ -2467,83 +2460,31 @@ sub create_packages_without_epm
 			 	make_systemcall($systemcall);
 				if ( -f $pkginfotmp ) { unlink($pkginfotmp); }
 			
-				installer::logger::include_timestamp_into_logfile("End of $faspac");
+				$installer::logger::Lang->add_timestamp("End of $faspac");
 			}
 			else
 			{
-				$infoline = "Not found: $faspac\n";
-				push( @installer::globals::logfileinfo, $infoline);
+                $installer::logger::Lang->printf("Not found: %s\n", $faspac);
 			}
 		}
 
 		# Setting unix rights to "775" for all created directories inside the package
 		
 		$systemcall = "cd $destinationdir; find $packagename -type d -exec chmod 775 \{\} \\\;";
-		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->printf("Systemcall: %s\n", $systemcall);
 		
 		if ($returnvalue)
 		{
-			$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-			push( @installer::globals::logfileinfo, $infoline);
+            $installer::logger::Lang->printf("ERROR: Could not execute \"%s\"!\n", $systemcall);
 		}
 		else
 		{
-			$infoline = "Success: Executed \"$systemcall\" successfully!\n";
-			push( @installer::globals::logfileinfo, $infoline);
+            $installer::logger::Lang->printf("Success: Executed \"%s\" successfully!\n", $systemcall);
 		}
-
-		######################
-		# making pkg files
-		######################
-		
-		# my $streamname = $packagename . ".pkg";
-		# $systemcall = "pkgtrans $destinationdir $streamname $packagename";
-		# print "... $systemcall ...\n";
-
-		# $returnvalue = system($systemcall);
-
-		# $infoline = "Systemcall: $systemcall\n";
-		# push( @installer::globals::logfileinfo, $infoline);
-		
-		# if ($returnvalue)
-		# {
-		# 	$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-		# 	push( @installer::globals::logfileinfo, $infoline);
-		# }
-		# else
-		# {
-		# 	$infoline = "Success: Executed \"$systemcall\" successfully!\n";
-		# 	push( @installer::globals::logfileinfo, $infoline);
-		# }		
-
-		#########################
-		# making tar.gz files
-		#########################
-
-		# my $targzname = $packagename . ".tar.gz";
-		# $systemcall = "cd $destinationdir; tar -cf - $packagename | gzip > $targzname";
-		# print "... $systemcall ...\n";
-
-		# $returnvalue = system($systemcall);
-
-		# $infoline = "Systemcall: $systemcall\n";
-		# push( @installer::globals::logfileinfo, $infoline);
-		
-		# if ($returnvalue)
-		# {
-		#	$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-		#	push( @installer::globals::logfileinfo, $infoline);
-		# }
-		# else
-		# {
-		#	$infoline = "Success: Executed \"$systemcall\" successfully!\n";
-		#	push( @installer::globals::logfileinfo, $infoline);
-		# }
 	}
 
 	# Linux: rpm -bb so8m35.spec	( -> dependency check abklemmen? )
@@ -2587,7 +2528,7 @@ sub create_packages_without_epm
 
 		my $systemcall = "$rpmcommand -bb --define \"_unpackaged_files_terminate_build  0\" $specfilename --target $target $buildrootstring 2\>\&1 |";
 
-		installer::logger::print_message( "... $systemcall ...\n" );
+        $installer::logger::Info->printf("... %s ...\n", $systemcall);
 
 		my $maxrpmcalls = 3;
 		my $rpm_failed = 0;
@@ -2602,27 +2543,24 @@ sub create_packages_without_epm
 
 			my $returnvalue = $?;	# $? contains the return value of the systemcall
 
-			my $infoline = "Systemcall (Try $i): $systemcall\n";
-			push( @installer::globals::logfileinfo, $infoline);
+            $installer::logger::Lang->printf("Systemcall (Try %d): %s\n", $i, $systemcall);
 
 			for ( my $j = 0; $j <= $#rpmoutput; $j++ )
 			{
 				# if ( $i < $maxrpmcalls ) { $rpmoutput[$j] =~ s/\bERROR\b/PROBLEM/ig; }
 				$rpmoutput[$j] =~ s/\bERROR\b/PROBLEM/ig;
-				push( @installer::globals::logfileinfo, "$rpmoutput[$j]");
+                $installer::logger::Lang->print($rpmoutput[$j]);
 			}
 			
 			if ($returnvalue)
 			{
-				$infoline = "Try $i : Could not execute \"$systemcall\"!\n";
-				push( @installer::globals::logfileinfo, $infoline);
+                $installer::logger::Lang->printf("Try %d : Could not execute \"%s\"!\n", $i, $systemcall);
 				$rpm_failed = 1;
 			}
 			else
 			{
-				installer::logger::print_message( "Success (Try $i): \"$systemcall\"\n" );
-				$infoline = "Success: Executed \"$systemcall\" successfully!\n";
-				push( @installer::globals::logfileinfo, $infoline);
+                $installer::logger::Info->printf("Success (Try %d): Executed \"%s\" successfully!\n", $i, $systemcall);
+                $installer::logger::Lang->printf("Success (Try %d): Executed \"%s\" successfully!\n", $i, $systemcall);
 				$rpm_failed = 0;
 				last;
 			}
@@ -2637,7 +2575,7 @@ sub create_packages_without_epm
 			
 			if ( $rpmprog ne "" )
 			{
-				installer::logger::print_message( "... $rpmprog ...\n" );
+                $installer::logger::Info->printf("... %s ...\n", $rpmprog);
 
 				my $helpersystemcall = "$rpmprog -bb $specfilename --target $target $buildrootstring 2\>\&1 |";
 
@@ -2649,24 +2587,26 @@ sub create_packages_without_epm
 
 				my $helperreturnvalue = $?;	# $? contains the return value of the systemcall
 
-				$infoline = "\nLast try: Using $rpmprog directly (problem with LD_LIBARY_PATH)\n";
-				push( @installer::globals::logfileinfo, $infoline);
-
-				$infoline = "\nSystemcall: $helpersystemcall\n";
-				push( @installer::globals::logfileinfo, $infoline);
-
-				for ( my $j = 0; $j <= $#helperrpmoutput; $j++ ) { push( @installer::globals::logfileinfo, "$helperrpmoutput[$j]"); }
+                $installer::logger::Lang->printf("\n");
+                $installer::logger::Lang->printf("Last try: Using %s directly (problem with LD_LIBARY_PATH)\n",
+                    $rpmprog);
+
+                $installer::logger::Lang->printf("\n");
+                $installer::logger::Lang->printf("Systemcall: %s\n", $helpersystemcall);
+
+                foreach my $line (@helperrpmoutput)
+                {
+                    $installer::logger::Lang->print($helperrpmoutput[$j]);
+                }
 			
 				if ($helperreturnvalue)
 				{
-					$infoline = "Could not execute \"$helpersystemcall\"!\n";
-					push( @installer::globals::logfileinfo, $infoline);
+                    $installer::logger::Lang->printf("Could not execute \"%s\"!\n", $helpersystemcall);
 				}
 				else
 				{
-					installer::logger::print_message( "Success: \"$helpersystemcall\"\n" );
-					$infoline = "Success: Executed \"$helpersystemcall\" successfully!\n";
-					push( @installer::globals::logfileinfo, $infoline);
+                    $installer::logger::Lang->printf("Success: Executed \"%s\" successfully!\n", $helpersystemcall);
+                    $installer::logger::Info->printf("Success: Executed \"%s\" successfully!\n", $helpersystemcall);
 					$rpm_failed = 0;
 				}
 			}
@@ -2707,33 +2647,8 @@ sub remove_temporary_epm_files
 
 			my $systemcall = "mv -f $removefile $destfile";
 			system($systemcall);	 # ignoring the return value
-			$infoline = "Systemcall: $systemcall\n";
-			push( @installer::globals::logfileinfo, $infoline);
+            $installer::logger::Lang->printf("Systemcall: %s\n", $systemcall);
 		}
-
-		# removing the package
-	
-#		my $removedir = $epmdir . $packagename;
-#	
-#		my $systemcall = "rm -rf $removedir";
-#		
-#		print "... $systemcall ...\n";
-#
-#		my $returnvalue = system($systemcall);
-#
-#		my $infoline = "Systemcall: $systemcall\n";
-#		push( @installer::globals::logfileinfo, $infoline);
-#		
-#		if ($returnvalue)
-#		{
-#			$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-#			push( @installer::globals::logfileinfo, $infoline);
-#		}
-#		else
-#		{
-#			$infoline = "Success: Executed \"$systemcall\" successfully!\n";
-#			push( @installer::globals::logfileinfo, $infoline);
-#		}
 	}
 
 	if ( $installer::globals::islinuxrpmbuild )
@@ -2745,41 +2660,36 @@ sub remove_temporary_epm_files
 
 		my $systemcall = "mv -f $removefile $destfile";
 		system($systemcall);	 # ignoring the return value
-		$infoline = "Systemcall: $systemcall\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("Systemcall: %s\n", $systemcall);
 
 		# removing the directory "buildroot"
 	
 		my $removedir = $epmdir . "buildroot";
 	
 		$systemcall = "rm -rf $removedir";
-		
-		installer::logger::print_message( "... $systemcall ...\n" );
 
+        $installer::logger::Info->printf("... %s ...\n", $systemcall);
+        
 		my $returnvalue = system($systemcall);
 
 		$removedir = $epmdir . "BUILD";
 	
 		$systemcall = "rm -rf $removedir";
-		
-		installer::logger::print_message( "... $systemcall ...\n" );
 
-		$returnvalue = system($systemcall);
+        $installer::logger::Info->printf("... %s ...\n", $systemcall);
 
+		$returnvalue = system($systemcall);
 
-		my $infoline = "Systemcall: $systemcall\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("Systemcall: %s\n", $systemcall);
 		
-		if ($returnvalue)
-		{
-			$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-			push( @installer::globals::logfileinfo, $infoline);
-		}
-		else
-		{
-			$infoline = "Success: Executed \"$systemcall\" successfully!\n";
-			push( @installer::globals::logfileinfo, $infoline);
-		}
+        if ($returnvalue)
+        {
+            $installer::logger::Lang->printf("ERROR: Could not execute \"%s\"!\n", $systemcall);
+        }
+        else
+        {
+            $installer::logger::Lang->printf("Success: Executed \"%s\" successfully!\n", $systemcall);
+        }
 	}	
 }
 
@@ -2793,18 +2703,15 @@ sub make_systemcall
 
 	my $returnvalue = system($systemcall);
 
-	my $infoline = "Systemcall: $systemcall\n";
-	push( @installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf("Systemcall: %s\n", $systemcall);
 		
 	if ($returnvalue)
 	{
-		$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("ERROR: Could not execute \"%s\"!\n", $systemcall);
 	}
 	else
 	{
-		$infoline = "Success: Executed \"$systemcall\" successfully!\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("Success: Executed \"%s\" successfully!\n", $systemcall);
 	}
 }	
 
@@ -2835,18 +2742,17 @@ sub create_new_directory_structure
 
 		my $returnvalue = system($systemcall);
 
-		my $infoline = "Systemcall: $systemcall\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("Systemcall: %s\n", $systemcall);
 		
 		if ($returnvalue)
 		{
-			$infoline = "ERROR: Could not move content of \"$rpmdir\" to \"$newdir\"!\n";
-			push( @installer::globals::logfileinfo, $infoline);
+            $installer::logger::Lang->printf("ERROR: Could not move content of \"%s\" to \"%s\"!\n",
+                $rpmdir,$newdir);
 		}
 		else
 		{
-			$infoline = "Success: Moved content of \"$rpmdir\" to \"$newdir\"!\n";
-			push( @installer::globals::logfileinfo, $infoline);
+            $installer::logger::Lang->printf("Success: Moved content of \"%s\" to \"%s\"!\n",
+                $rpmdir, $newdir);
 		}
 
 		# and removing the empty directory
@@ -2867,18 +2773,15 @@ sub create_new_directory_structure
 	my $localcall = "chmod 775 $newdir \>\/dev\/null 2\>\&1";
 	my $callreturnvalue = system($localcall);
 
-	my $callinfoline = "Systemcall: $localcall\n";
-	push( @installer::globals::logfileinfo, $callinfoline);
+    $installer::logger::Lang->printf("Systemcall: %s\n", $localcall);
 		
 	if ($callreturnvalue)
 	{
-		$callinfoline = "ERROR: Could not execute \"$localcall\"!\n";
-		push( @installer::globals::logfileinfo, $callinfoline);
+        $installer::logger::Lang->printf("ERROR: Could not execute \"%s\"!\n", $localcall);
 	}
 	else
 	{
-		$callinfoline = "Success: Executed \"$localcall\" successfully!\n";
-		push( @installer::globals::logfileinfo, $callinfoline);
+        $installer::logger::Lang->printf("Success: Executed \"%s\" successfully!\n", $localcall);
 	}
 }
 
@@ -3139,8 +3042,7 @@ sub put_systemintegration_into_installse
 		my $onemodule = ${$allmodules}[$i];
 		my $packagetarfilename = $onemodule->{'PackageName'};
 
-		my $infoline = "Including into installation set: $packagetarfilename\n";
-		push( @installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->printf("Including into installation set: %s\n", $packagetarfilename);
 
 		my $sourcepathref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$packagetarfilename, $includepatharrayref, 1);
 		if ( $$sourcepathref eq "" ) { installer::exiter::exit_program("ERROR: Source path not found for $packagetarfilename!", "copy_systemintegration_files"); }
@@ -3259,9 +3161,9 @@ sub put_installsetfiles_into_installset
 		if ( $installer::globals::addjavainstaller ) { $destfile = $onefile->{'Name'}; }
 		else { $destfile = $destdir . $installer::globals::separator . $onefile->{'Name'}; }
 		installer::systemactions::copy_one_file($sourcefile, $destfile);
-		
-		my $infoline = "Adding to installation set \"$destfile\" from source \"$sourcefile\".\n";
-		push( @installer::globals::logfileinfo, $infoline);
+
+        $installer::logger::Lang->printf("Adding to installation set \"%s\" from source \"%s\".\n",
+            $destfile, $sourcefile);
 	}
 }
 
@@ -3375,8 +3277,7 @@ sub finalize_linux_patch
 	if ($$scriptref eq "") { installer::exiter::exit_program("ERROR: Could not find patch script template $scriptfilename!", "finalize_linux_patch"); }
 	my $scriptfile = installer::files::read_file($$scriptref);
 
-	my $infoline = "Found  script file $scriptfilename: $$scriptref \n";
-	push( @installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf("Found  script file %s: %s \n", $scriptfilename, $$scriptref);
 
 	# Collecting all RPMs in the patch directory
 
@@ -3426,8 +3327,7 @@ sub finalize_linux_patch
 	$productname = lc($productname);
 	$productname =~ s/ /_/g;	# abc office -> abc_office
 
-	$infoline = "Adding productname $productname into Linux patch script\n";
-	push( @installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf("Adding productname %s into Linux patch script\n", $productname);
 
 	for ( my $j = 0; $j <= $#{$scriptfile}; $j++ ) { ${$scriptfile}[$j] =~ s/PRODUCTNAMEPLACEHOLDER/$productname/; }
 
@@ -3436,8 +3336,7 @@ sub finalize_linux_patch
 	my $newscriptfilename = "setup"; # $newepmdir . $installer::globals::separator . "setup";
 	installer::files::save_file($newscriptfilename, $scriptfile);	
 
-	$infoline = "Saved Linux patch setup $newscriptfilename \n";
-	push( @installer::globals::logfileinfo, $infoline);
+    $installer::logger::Lang->printf("Saved Linux patch setup %s\n", $newscriptfilename);
 
 	# Setting unix rights 755
 	my $localcall = "chmod 775 $newscriptfilename \>\/dev\/null 2\>\&1";

Modified: openoffice/branches/capstone2013/main/solenv/bin/modules/installer/exiter.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/solenv/bin/modules/installer/exiter.pm?rev=1538719&r1=1538718&r2=1538719&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/solenv/bin/modules/installer/exiter.pm (original)
+++ openoffice/branches/capstone2013/main/solenv/bin/modules/installer/exiter.pm Mon Nov  4 19:00:37 2013
@@ -60,38 +60,26 @@ sub exit_program
 
 	if ( $#installer::globals::logfileinfo > -1 )
 	{
-		$infoline = "\n***************************************************************\n";
-		push(@installer::globals::logfileinfo, $infoline);
-	
-		$infoline = "$message\n";
-		push(@installer::globals::logfileinfo, $infoline);
-
-		$infoline = "in function: $function\n";
-		push(@installer::globals::logfileinfo, $infoline);
-
-		$infoline = "***************************************************************\n";
-		push(@installer::globals::logfileinfo, $infoline);
+        $installer::logger::Lang->print("\n");
+        $installer::logger::Lang->print("***************************************************************\n");
+        $installer::logger::Lang->print($message."\n");
+        $installer::logger::Lang->printf("in function: %s\n", $function);
+        $installer::logger::Lang->printf("***************************************************************\n");
 
-		installer::files::save_file($installer::globals::logfilename ,\@installer::globals::logfileinfo);	
+#		installer::files::save_file($installer::globals::logfilename ,\@installer::globals::logfileinfo);	
 	}
 	else
 	{
-		$infoline = "\n***************************************************************\n";
-		push(@installer::globals::globallogfileinfo, $infoline);
-	
-		$infoline = "$message\n";
-		push(@installer::globals::globallogfileinfo, $infoline);
-
-		$infoline = "in function: $function\n";
-		push(@installer::globals::globallogfileinfo, $infoline);
-
-		$infoline = "***************************************************************\n";
-		push(@installer::globals::globallogfileinfo, $infoline);		
+        $installer::logger::Global->print("\n");
+        $installer::logger::Global->print("***************************************************************\n");
+        $installer::logger::Global->print($message."\n");
+        $installer::logger::Global->printf("in function: %s\n", $function);
+        $installer::logger::Global->printf("***************************************************************\n");
 
-		installer::files::save_file($installer::globals::logfilename ,\@installer::globals::globallogfileinfo);
+#		installer::files::save_file($installer::globals::logfilename ,\@installer::globals::globallogfileinfo);
 	}
 	installer::logger::print_error("$message\nin function: $function");
-	installer::logger::print_error("Saved logfile: $installer::globals::logfilename\n");
+#	installer::logger::print_error("Saved logfile: $installer::globals::logfilename\n");
 
 	# Saving the debug info
 

Modified: openoffice/branches/capstone2013/main/solenv/bin/modules/installer/files.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/solenv/bin/modules/installer/files.pm?rev=1538719&r1=1538718&r2=1538719&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/solenv/bin/modules/installer/files.pm (original)
+++ openoffice/branches/capstone2013/main/solenv/bin/modules/installer/files.pm Mon Nov  4 19:00:37 2013
@@ -84,9 +84,9 @@ sub save_file
 		
 		if ( $savefile =~ /\.log/ )
 		{
-			print "\n*************************************************\n";
+			print "*************************************************\n";
 			print "ERROR: Cannot write log file: $savefile"; 
-			print "\n*************************************************\n";
+			print "*************************************************\n";
 			exit(-1);	# exiting the program to avoid endless loops
 		}
 		

Modified: openoffice/branches/capstone2013/main/solenv/bin/modules/installer/followme.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/solenv/bin/modules/installer/followme.pm?rev=1538719&r1=1538718&r2=1538719&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/solenv/bin/modules/installer/followme.pm (original)
+++ openoffice/branches/capstone2013/main/solenv/bin/modules/installer/followme.pm Mon Nov  4 19:00:37 2013
@@ -93,7 +93,7 @@ sub save_followme_info
 
 	# Saving file
 	installer::files::save_file($downloadinfodir . $installer::globals::separator . $downloadinfofilename, \@filecontent);
-	installer::logger::print_message( "... creating \"follow me\" info file $downloadinfofilename.\n" );
+    $installer::logger::Info->printf("... creating \"follow me\" info file %s.\n", $downloadinfofilename);
 }
 
 ####################################################
@@ -107,7 +107,8 @@ sub read_followme_info
 
 	if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find file: $filename", "read_download_info"); }
 
-	installer::logger::print_message( "\n... reading \"follow me\" info file $filename\n" );
+    $installer::logger::Info->print("\n");
+    $installer::logger::Info->printf("... reading \"follow me\" info file %s\n", $filename);
 
 	my %contenthash = ();
 	

Modified: openoffice/branches/capstone2013/main/solenv/bin/modules/installer/globals.pm
URL: http://svn.apache.org/viewvc/openoffice/branches/capstone2013/main/solenv/bin/modules/installer/globals.pm?rev=1538719&r1=1538718&r2=1538719&view=diff
==============================================================================
--- openoffice/branches/capstone2013/main/solenv/bin/modules/installer/globals.pm (original)
+++ openoffice/branches/capstone2013/main/solenv/bin/modules/installer/globals.pm Mon Nov  4 19:00:37 2013
@@ -245,9 +245,9 @@ BEGIN
 	$globallogging = 0;
 	$globalloggingform21 = 1;
 	$logfilename = "logfile.log";	# the default logfile name for global errors
-	@logfileinfo = ();
-	@errorlogfileinfo = ();
-	@globallogfileinfo = ();
+#	@logfileinfo = ();
+#	@errorlogfileinfo = ();
+#	@globallogfileinfo = ();
 	$ignore_error_in_logfile = 0;
 	$exitlog = "";
 	$globalinfo_copied = 0;
@@ -508,7 +508,7 @@ BEGIN
 		$libextension = "\.dll";
 		$isunix = 0;
 		$iswin = 1;
-                $archiveformat = ".zip";
+        $archiveformat = ".zip";
 		%savedmapping = ();
 		%savedrevmapping = ();
 		%savedrev83mapping = ();
@@ -526,7 +526,7 @@ BEGIN
 		$isunix = 0;
 		$iswin = 0;
 		$isos2 = 1;
-                $archiveformat = ".zip";
+        $archiveformat = ".zip";
 	}
 	else
 	{ 



Mime
View raw message