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 [4/6] - in /openoffice/trunk/main/solenv/bin: ./
modules/installer/ modules/installer/windows/
Modified: openoffice/trunk/main/solenv/bin/modules/installer/scriptitems.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/scriptitems.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/scriptitems.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/scriptitems.pm Thu Oct 31 10:37:56 2013
@@ -103,8 +103,8 @@ sub resolve_all_directory_names
if ($parentvalue eq "")
{
$directoryhashref->{$key} = "FAILURE";
- my $infoline = "WARNING: No hostname for $parentid with \"$key\". Needed by child directory $gid !\n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->printf("WARNING: No hostname for %s with \"%s\". Needed by child directory %s !\n",
+ $parentid, $key, $gid);
}
else
{
@@ -206,8 +206,8 @@ sub remove_notinsuite_files_from_product
}
else
{
- my $infoline = "INFO: Flag NOT_IN_SUITE \-\> Removing $oneitem->{'gid'} from file list.\n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->printf("INFO: Flag NOT_IN_SUITE \-\> Removing %s from file list.\n",
+ $oneitem->{'gid'});
}
}
@@ -240,8 +240,9 @@ sub remove_office_start_language_files
}
else
{
- my $infoline = "INFO: Flag SET_OFFICE_LANGUAGE \-\> Removing $oneitem->{'gid'} from file list.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf(
+ "INFO: Flag SET_OFFICE_LANGUAGE \-\> Removing %s from file list.\n",
+ $oneitem->{'gid'});
}
}
@@ -436,8 +437,7 @@ sub remove_not_required_spellcheckerlang
}
else
{
- $infoline = "Spellchecker selection: Removing module $module->{'gid'}\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Spellchecker selection: Removing module %s\n", $module->{'gid'});
# Collecting all files at modules that are removed
@@ -481,8 +481,8 @@ sub remove_not_required_spellcheckerlang
my $onefile = ${$filesarrayref}[$i];
if ( exists($installer::globals::spellcheckerfilehash{$onefile->{'gid'}}) )
{
- $infoline = "Spellchecker selection: Removing file $onefile->{'gid'}\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Spellchecker selection: Removing file %s\n",
+ $onefile->{'gid'});
next;
}
push(@filesarray, $onefile);
@@ -541,13 +541,12 @@ sub add_bundled_extension_blobs
# file:// extensions are added as pre-registered in add_bundled_prereg_extension().
}
- installer::logger::print_message(
- sprintf("preparing %d extension blob%s for language%s %s:\n",
- $#bundle_files + 1,
- $#bundle_files!=0 ? "s" : "",
- $#installer::globals::languageproducts!=0 ? "s" : "",
- join(" ", @installer::globals::languageproducts),
- join("\n ", @bundle_files)));
+ $installer::logger::Info->printf(
+ "preparing %d extension blob%s for language%s %s:\n",
+ $#bundle_files + 1,
+ $#bundle_files!=0 ? "s" : "",
+ $#installer::globals::languageproducts!=0 ? "s" : "",
+ join(" ", @installer::globals::languageproducts));
foreach my $filename ( @bundle_files)
{
@@ -562,9 +561,9 @@ sub add_bundled_extension_blobs
'gid' => "gid_File_Extension_".$basename
};
push( @filelist, $onefile);
- push( @installer::globals::logfileinfo, "\tbundling \"$filename\" extension\n");
+ $installer::logger::Lang->printf("\tbundling \"%s\" extension\n", $filename);
- installer::logger::print_message(" " . $basename . "\n");
+ $installer::logger::Info->printf(" %s\n", $basename);
}
return \@filelist;
@@ -609,14 +608,17 @@ sub add_bundled_prereg_extensions
}
}
- installer::logger::print_message(
- sprintf("preparing %d bundled extension%s for language%s %s:\n %s\n",
- $#bundle_files + 1,
- $#bundle_files!=0 ? "s" : "",
- $#installer::globals::languageproducts!=0 ? "s" : "",
- join(" ", @installer::globals::languageproducts),
- join("\n ", @bundle_files)));
-
+ $installer::logger::Info->printf(
+ "preparing %d bundled extension%s for language%s %s:\n",
+ $#bundle_files + 1,
+ $#bundle_files!=0 ? "s" : "",
+ $#installer::globals::languageproducts!=0 ? "s" : "",
+ join(" ", @installer::globals::languageproducts));
+ foreach my $filename (@bundle_files)
+ {
+ $installer::logger::Info->printf(" %s\n", $filename);
+ }
+
# Find the prereg directory entry so that we can create a new sub-directory.
my $parentdir_gid = "gid_Brand_Dir_Share_Prereg_Bundled";
my $parentdir = undef;
@@ -659,7 +661,7 @@ sub add_bundled_prereg_extensions
'gid' => "gid_File_Extension_".$basename
};
push( @filelist, $onefile);
- push( @installer::globals::logfileinfo, "\tbundling \"$filename\" extension\n");
+ $installer::logger::Lang->printf("\tbundling \"%s\" extension\n", $filename);
}
return (\@filelist, $dirsref);
@@ -1088,8 +1090,9 @@ sub remove_non_existent_languages_in_pro
if ($itemtoberemoved)
{
- $infoline = "WARNING: Language $$languagestringref: No $itemtype packed for $oneitem->{'gid'}!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("WARNING: Language %s: No $itemtype packed for %s!\n",
+ $$languagestringref,
+ $oneitem->{'gid'});
}
else
{
@@ -1097,8 +1100,7 @@ sub remove_non_existent_languages_in_pro
}
}
- $infoline = "\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
return \@allexistentitems;
}
@@ -1261,15 +1263,16 @@ sub get_sourcepath_from_filename_and_inc
$infoline = "ERROR: Source for $$searchfilenameref not found!\n"; # Important message in log file
}
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf($infoline);
}
}
else
{
if ( $write_logfile)
{
- $infoline = "SUCCESS: Source for $$searchfilenameref: $onefile\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("SUCCESS: Source for %s: %s\n",
+ $$searchfilenameref,
+ $onefile);
}
}
@@ -1339,7 +1342,7 @@ sub get_sourcepath_from_filename_and_inc
$infoline = "ERROR: Source for $$searchfilenameref not found!\n"; # Important message in log file
}
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf($infoline);
}
}
else
@@ -1354,7 +1357,7 @@ sub get_sourcepath_from_filename_and_inc
{
$infoline = "SUCCESS/WARNING: Special handling for $$searchfilenameref: $onefile\n";
}
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf($infoline);
}
}
@@ -1445,9 +1448,8 @@ sub get_Source_Directory_For_Files_From_
if ($onefile->{'sourcepath'}) # defaulting to english was successful
{
- $infoline = "WARNING: Using $onefilename instead of $oldname\n";
- push( @installer::globals::logfileinfo, $infoline);
- print " $infoline";
+ $installer::logger::Lang->printf("WARNING: Using %s instead of %s\n", $onefilename, $oldname);
+ $installer::logger::Info->printf("WARNING: Using %s instead of %s\n", $onefilename, $oldname);
# if ( $onefile->{'destination'} ) { $onefile->{'destination'} =~ s/\Q$oldname\E/$onefile->{'Name'}/; }
# If the directory, in which the new file is installed, is not language dependent,
@@ -1463,23 +1465,25 @@ sub get_Source_Directory_For_Files_From_
if ( ! $islanguagedependent )
{
$onefile->{'Styles'} =~ s/\bARCHIVE\b/ARCHIVE, RENAME_TO_LANGUAGE/; # Setting new flag RENAME_TO_LANGUAGE
- $infoline = "Setting flag RENAME_TO_LANGUAGE: File $onefile->{'Name'} in directory: $directorygid\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf(
+ "Setting flag RENAME_TO_LANGUAGE: File %s in directory: %s\n",
+ $onefile->{'Name'},
+ $directorygid);
}
}
}
else
{
- $infoline = "WARNING: Using $onefile->{'Name'} instead of $oldname was not successful\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("WARNING: Using %s instead of %s was not successful\n",
+ $onefile->{'Name'}, $oldname);
$onefile->{'Name'} = $oldname; # Switching back to old file name
}
}
}
}
- $infoline = "\n"; # empty line after listing of all files
- push( @installer::globals::logfileinfo, $infoline);
+ # empty line after listing of all files
+ $installer::logger::Lang->printf("\n");
}
#################################################################################
@@ -1507,8 +1511,8 @@ sub remove_Files_For_Languagepacks
if (( $gid eq "gid_File_Extra_Fontunxpsprint" ) ||
( $gid eq "gid_File_Extra_Migration_Lang" ))
{
- $infoline = "ATTENTION: Removing item $oneitem->{'gid'} from the installation set.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("ATTENTION: Removing item %s from the installation set.\n",
+ $oneitem->{'gid'},);
next;
}
@@ -1549,8 +1553,8 @@ sub remove_Files_Without_Sourcedirectory
if ( ! $installer::globals::languagepack )
{
- $infoline = "ERROR: No sourcepath -> Removing file $filename from file list.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("ERROR: No sourcepath -> Removing file %s from file list.\n",
+ $filename);
push(@missingfiles, "ERROR: File not found: $filename\n");
$error_occured = 1;
@@ -1561,8 +1565,7 @@ sub remove_Files_Without_Sourcedirectory
{
if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))
{
- $infoline = "ERROR: Removing file $filename from file list.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("ERROR: Removing file %s from file list.\n", $filename);
push(@missingfiles, "ERROR: File not found: $filename\n");
$error_occured = 1;
@@ -1571,10 +1574,11 @@ sub remove_Files_Without_Sourcedirectory
}
else
{
- $infoline = "INFO: Removing file $filename from file list. It is not language dependent.\n";
- push( @installer::globals::logfileinfo, $infoline);
- $infoline = "INFO: It is not language dependent and can be ignored in language packs.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf(
+ "INFO: Removing file %s from file list. It is not language dependent.\n",
+ $filename);
+ $installer::logger::Lang->printf(
+ "INFO: It is not language dependent and can be ignored in language packs.\n");
next; # removing this file from list, if sourcepath is empty
}
@@ -1584,8 +1588,7 @@ sub remove_Files_Without_Sourcedirectory
push(@newfilesarray, $onefile);
}
- $infoline = "\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("\n");
if ( $error_occured )
{
@@ -1717,20 +1720,24 @@ sub add_License_Files_into_Installdir
push(@newfilesarray, $newfile);
- $infoline = "New files: Adding file $newfilename for the installation root to the file list. Language: $defaultlanguage\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf(
+ "New files: Adding file %s for the installation root to the file list. Language: %s\n",
+ $newfilename,
+ $defaultlanguage);
if ( defined $newfile->{'InstallName'} )
{
- $infoline = "New files: Using installation name: $newfile->{'InstallName'}\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf(
+ "New files: Using installation name: %s\n", $newfile->{'InstallName'});
}
# Collecting license and readme file for the installation set
push(@installer::globals::installsetfiles, $newfile);
- $infoline = "New files: Adding file $newfilename to the file collector for the installation set. Language: $defaultlanguage\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf(
+ "New files: Adding file %s to the file collector for the installation set. Language: %s\n",
+ $newfilename,
+ $defaultlanguage);
}
push(@newfilesarray, $onefile);
@@ -1760,13 +1767,12 @@ sub remove_onlyasialanguage_files_from_p
my $containsasianlanguage = installer::languages::detect_asian_language($installer::globals::alllanguagesinproductarrayref);
my $alllangstring = installer::converter::convert_array_to_comma_separated_string($installer::globals::alllanguagesinproductarrayref);
- $infoline = "\nLanguages in complete product: $alllangstring\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("\n");
+ $installer::logger::Lang->printf("Languages in complete product: %s\n", $alllangstring);
if ( ! $containsasianlanguage )
{
- $infoline = "Product does not contain asian language -> removing files\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Product does not contain asian language -> removing files\n");
for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
{
@@ -1775,8 +1781,9 @@ sub remove_onlyasialanguage_files_from_p
if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
if ( $styles =~ /\bONLY_ASIA_LANGUAGE\b/ )
{
- $infoline = "Flag ONLY_ASIA_LANGUAGE: Removing file $onefile->{'Name'} from files collector!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf(
+ "Flag ONLY_ASIA_LANGUAGE: Removing file %s from files collector!\n",
+ $onefile->{'Name'});
next;
}
@@ -1789,9 +1796,7 @@ sub remove_onlyasialanguage_files_from_p
{
$returnfilesarrayref = $filesarrayref;
- $infoline = "Product contains asian language -> Nothing to do\n";
- push( @installer::globals::logfileinfo, $infoline);
-
+ $installer::logger::Lang->printf("Product contains asian language -> Nothing to do\n");
}
return $returnfilesarrayref;
@@ -1818,13 +1823,12 @@ sub remove_onlywesternlanguage_files_fro
my $containswesternlanguage = installer::languages::detect_western_language($installer::globals::alllanguagesinproductarrayref);
my $alllangstring = installer::converter::convert_array_to_comma_separated_string($installer::globals::alllanguagesinproductarrayref);
- $infoline = "\nLanguages in complete product: $alllangstring\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("\n");
+ $installer::logger::Lang->printf("Languages in complete product: %s\n", $alllangstring);
if ( ! $containswesternlanguage )
{
- $infoline = "Product does not contain western language -> removing files\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Product does not contain western language -> removing files\n");
for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
{
@@ -1833,8 +1837,9 @@ sub remove_onlywesternlanguage_files_fro
if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
if ( $styles =~ /\bONLY_WESTERN_LANGUAGE\b/ )
{
- $infoline = "Flag ONLY_WESTERN_LANGUAGE: Removing file $onefile->{'Name'} from files collector!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf(
+ "Flag ONLY_WESTERN_LANGUAGE: Removing file %s from files collector!\n",
+ $onefile->{'Name'});
next;
}
@@ -1847,9 +1852,7 @@ sub remove_onlywesternlanguage_files_fro
{
$returnfilesarrayref = $filesarrayref;
- $infoline = "Product contains western language -> Nothing to do\n";
- push( @installer::globals::logfileinfo, $infoline);
-
+ $installer::logger::Lang->printf("Product contains western language -> Nothing to do\n");
}
return $returnfilesarrayref;
@@ -1894,13 +1897,11 @@ sub make_filename_language_specific
$onefile->{'Name'} =~ s/\Q$fileextension\E\s*$/_$language$fileextension/;
$onefile->{'destination'} =~ s/\Q$fileextension\E\s*$/_$language$fileextension/;
}
-
- $infoline = "Flag MAKE_LANG_SPECIFIC:\n";
- push( @installer::globals::logfileinfo, $infoline);
- $infoline = "Changing name from $oldname to $onefile->{'Name'} !\n";
- push( @installer::globals::logfileinfo, $infoline);
- $infoline = "Changing destination from $olddestination to $onefile->{'destination'} !\n";
- push( @installer::globals::logfileinfo, $infoline);
+
+ $installer::logger::Lang->printf("Flag MAKE_LANG_SPECIFIC:\n");
+ $installer::logger::Lang->printf("Changing name from %s to %s !\n", $oldname, $onefile->{'Name'});
+ $installer::logger::Lang->printf("Changing destination from %s to %s !\n",
+ $olddestination, $onefile->{'destination'});
}
}
}
@@ -1930,8 +1931,9 @@ sub remove_scpactions_without_name
if ( $name eq "" )
{
- $infoline = "ATTENTION: Removing scpaction $oneitem->{'gid'} from the installation set.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf(
+ "ATTENTION: Removing scpaction %s from the installation set.\n",
+ $oneitem->{'gid'});
next;
}
@@ -2009,8 +2011,9 @@ sub remove_Xpdonly_Items
if ( $styles =~ /\bXPD_ONLY\b/ )
{
- $infoline = "Removing \"xpd only\" item $oneitem->{'gid'} from the installation set.\n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->printf(
+ "Removing \"xpd only\" item %s from the installation set.\n",
+ $oneitem->{'gid'});
next;
}
@@ -2018,8 +2021,7 @@ sub remove_Xpdonly_Items
push(@newitemsarray, $oneitem);
}
- $infoline = "\n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->print("\n");
return \@newitemsarray;
}
@@ -2047,8 +2049,9 @@ sub remove_Languagepacklibraries_from_In
if ( $styles =~ /\bLANGUAGEPACK\b/ )
{
- $infoline = "Removing language pack file $oneitem->{'gid'} from the installation set.\n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->printf(
+ "Removing language pack file %s from the installation set.\n",
+ $oneitem->{'gid'});
next;
}
@@ -2056,8 +2059,7 @@ sub remove_Languagepacklibraries_from_In
push(@newitemsarray, $oneitem);
}
- $infoline = "\n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->print("\n");
return \@newitemsarray;
}
@@ -2085,8 +2087,9 @@ sub remove_patchonlyfiles_from_Installse
if ( $styles =~ /\bPATCH_ONLY\b/ )
{
- $infoline = "Removing file with flag PATCH_ONLY $oneitem->{'gid'} from the installation set.\n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->printf(
+ "Removing file with flag PATCH_ONLY %s from the installation set.\n",
+ $oneitem->{'gid'});
next;
}
@@ -2094,8 +2097,7 @@ sub remove_patchonlyfiles_from_Installse
push(@newitemsarray, $oneitem);
}
- $infoline = "\n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->print("\n");
return \@newitemsarray;
}
@@ -2123,8 +2125,9 @@ sub remove_tabonlyfiles_from_Installset
if ( $styles =~ /\bTAB_ONLY\b/ )
{
- $infoline = "Removing tab only file $oneitem->{'gid'} from the installation set.\n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->printf(
+ "Removing tab only file %s from the installation set.\n",
+ $oneitem->{'gid'});
next;
}
@@ -2132,8 +2135,7 @@ sub remove_tabonlyfiles_from_Installset
push(@newitemsarray, $oneitem);
}
- $infoline = "\n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->print("\n");
return \@newitemsarray;
}
@@ -2161,16 +2163,16 @@ sub remove_installedproductonlyfiles_fro
if ( $styles =~ /\bONLY_INSTALLED_PRODUCT\b/ )
{
- $infoline = "Removing file $oneitem->{'gid'} from the installation set. This file is only required for PKGFORMAT archive or installed).\n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->printf(
+ "Removing file from the installation set. This file is only required for PKGFORMAT archive or installed).\n",
+ $oneitem->{'gid'});
next;
}
push(@newitemsarray, $oneitem);
}
- $infoline = "\n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->print("\n");
return \@newitemsarray;
}
@@ -2202,16 +2204,15 @@ sub quoting_illegal_filenames
# sourcepath and destination have to be quoted for epm list file
- # $filename =~ s/\$/\$\$/g;
$destpath =~ s/\$/\$\$/g;
$sourcepath =~ s/\$/\$\$/g;
- # my $infoline = "ATTENTION: Files: Renaming $onefile->{'Name'} to $filename\n";
- # push( @installer::globals::logfileinfo, $infoline);
- my $infoline = "ATTENTION: Files: Quoting sourcepath $onefile->{'sourcepath'} to $sourcepath\n";
- push( @installer::globals::logfileinfo, $infoline);
- $infoline = "ATTENTION: Files: Quoting destination path $onefile->{'destination'} to $destpath\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("ATTENTION: Files: Quoting sourcepath %s to %s\n",
+ $onefile->{'sourcepath'},
+ $sourcepath);
+ $installer::logger::Lang->printf("ATTENTION: Files: Quoting destination path %s to %s\n",
+ $onefile->{'destination'},
+ $destpath);
# $onefile->{'Name'} = $filename;
$onefile->{'sourcepath'} = $sourcepath;
@@ -2514,14 +2515,14 @@ sub get_destination_file_path_for_links
if (!($foundfile))
{
- $infoline = "Warning: FileID $fileid for Link $onelink->{'gid'} not found!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Warning: FileID %s for Link %s not found!\n",
+ $fileid,
+ $onelink->{'gid'});
}
}
}
- $infoline = "\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("\n");
}
#################################################
@@ -2561,14 +2562,14 @@ sub get_destination_link_path_for_links
if (!($foundlink))
{
- $infoline = "Warning: ShortcutID $shortcutid for Link $onelink->{'gid'} not found!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Warning: ShortcutID %s for Link %s not found!\n",
+ $shortcutid,
+ $onelink->{'gid'});
}
}
}
- $infoline = "\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("\n");
}
###################################################################################
@@ -2786,14 +2787,14 @@ sub assigning_modules_to_items
if (( $oneitem->{'ismultilingual'} ) && ( ! $oneitem->{'haslanguagemodule'} ))
{
$infoline = "Error: \"$oneitem->{'gid'}\" is multi lingual, but not in language pack (Assigned module: $modulegids)!\n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->print($infoline);
push( @languageassignmenterrors, $infoline );
$languageassignmenterror = 1;
}
if (( $oneitem->{'haslanguagemodule'} ) && ( ! $oneitem->{'ismultilingual'} ))
{
$infoline = "Error: \"$oneitem->{'gid'}\" is in language pack, but not multi lingual (Assigned module: $modulegids)!\n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->print($infoline);
push( @languageassignmenterrors, $infoline );
$languageassignmenterror = 1;
}
@@ -2918,8 +2919,7 @@ sub collect_all_parent_feature
if ( $found_root_module ) { installer::exiter::exit_program("ERROR: Only one module without ParentID or with empty ParentID allowed ($installer::globals::rootmodulegid, $onefeature->{'gid'}).", "collect_all_parent_feature"); }
$installer::globals::rootmodulegid = $onefeature->{'gid'};
$found_root_module = 1;
- $infoline = "Setting Root Module: $installer::globals::rootmodulegid\n";
- push( @installer::globals::globallogfileinfo, $infoline);
+ $installer::logger::Global->printf("Setting Root Module: %s\n", $installer::globals::rootmodulegid);
}
if ( ! $found_root_module ) { installer::exiter::exit_program("ERROR: Could not define root module. No module without ParentID or with empty ParentID exists.", "collect_all_parent_feature"); }
Modified: openoffice/trunk/main/solenv/bin/modules/installer/setupscript.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/setupscript.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/setupscript.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/setupscript.pm Thu Oct 31 10:37:56 2013
@@ -285,10 +285,14 @@ sub replace_all_setupscriptvariables_in_
$num++;
if ( $check =~ /^.*\%\w+.*$/ )
{
- if (( $check =~ /%1/ ) || ( $check =~ /%2/ ) || ( $check =~ /%verify/ )) { next; }
- my $infoline = "WARNING: mis-named or un-known '%' variable in setup script at line $num:\n$check\n";
- push( @installer::globals::globallogfileinfo, $infoline);
- # print STDERR "Warning: mis-named or un-known '%' variable at line $num:\n$check\n";
+ if (( $check =~ /%1/ ) || ( $check =~ /%2/ ) || ( $check =~ /%verify/ ))
+ {
+ next;
+ }
+ $installer::logger::Global->printf(
+ "WARNING: mis-named or un-known '%s' variable in setup script at line %s:\n",
+ "%", $num);
+ $installer::logger::Global->printf("%s\n", $check);
}
}
Modified: openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/simplepackage.pm Thu Oct 31 10:37:56 2013
@@ -86,7 +86,7 @@ sub register_extensions
if ( $preregdir eq "" )
{
$infoline = "ERROR: Failed to determine directory \"prereg\" for extension registration! Please check your installation set.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
installer::exiter::exit_program($infoline, "register_extensions");
}
@@ -104,31 +104,31 @@ sub register_extensions
{
$unopkgexists = 0;
$infoline = "Language packs do not contain unopkg!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
if ( ! -f $unopkgfile )
{
$unopkgexists = 0;
$infoline = "Info: File $unopkgfile does not exist! Extensions cannot be registered.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
if ( $unopkgexists )
{
my $currentdir = cwd();
- print "... current dir: $currentdir ...\n";
+ $installer::logger::Info->printf("... current dir: %s ...\n", $currentdir);
$infoline = "Current dir: $currentdir\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ( ! -f $unopkgfile ) { installer::exiter::exit_program("ERROR: $unopkgfile not found!", "register_extensions"); }
my $systemcall = $unopkgfile . " sync --verbose" . " -env:UNO_JAVA_JFW_ENV_JREHOME=true 2\>\&1 |";
- print "... $systemcall ...\n";
+ $installer::logger::Info->printf("... %s ...\n", $systemcall);
$infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my @unopkgoutput = ();
@@ -147,16 +147,19 @@ sub register_extensions
# Writing content of @unopkgoutput only in the error case into the log file. Sometimes it
# contains strings like "Error" even in the case of success. This causes a packaging error
# when the log file is analyzed at the end, even if there is no real error.
- for ( my $j = 0; $j <= $#unopkgoutput; $j++ ) { push( @installer::globals::logfileinfo, "$unopkgoutput[$j]"); }
+ foreach my $line (@unopkgoutput)
+ {
+ $installer::logger::Lang->printf($line);
+ }
$infoline = "ERROR: Could not execute \"$systemcall\"!\nExitcode: '$returnvalue'\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
installer::exiter::exit_program("ERROR: $systemcall failed!", "register_extensions");
}
else
{
$infoline = "Success: Executed \"$systemcall\" successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -177,7 +180,7 @@ sub get_mac_translation_file
my $translationfile = installer::files::read_file($translationfilename);
my $infoline = "Reading translation file: $translationfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
return $translationfile;
}
@@ -352,7 +355,7 @@ sub create_package
{
my ( $installdir, $archivedir, $packagename, $allvariables, $includepatharrayref, $languagestringref, $format ) = @_;
- installer::logger::print_message( "... creating $installer::globals::packageformat file ...\n" );
+ $installer::logger::Info->printf("... creating %s file ...\n", $installer::globals::packageformat);
installer::logger::include_header_into_logfile("Creating $installer::globals::packageformat file:");
# moving dir into temporary directory
@@ -448,20 +451,20 @@ sub create_package
$systemcall = "tar -cjf $tarballname Contents/";
- print "... $systemcall ...\n";
+ $installer::logger::Info->printf("... %s ...\n", $systemcall);
my $localreturnvalue = system($systemcall);
$infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ($localreturnvalue)
{
$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 $sourcefile = $appfolder . "/" . $tarballname;
@@ -563,26 +566,26 @@ sub create_package
if ( $makesystemcall )
{
- print "... $systemcall ...\n";
+ $installer::logger::Info->printf("... %s ...\n", $systemcall);
my $returnvalue = system($systemcall);
my $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ($returnvalue)
{
$infoline = "ERROR: Could not execute \"$systemcall\"!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "Success: Executed \"$systemcall\" successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
if ( $return_to_start ) { chdir($from); }
- print "... removing $tempdir ...\n";
+ $installer::logger::Info->printf("... removing %s ...\n", $tempdir);
installer::systemactions::remove_complete_directory($tempdir);
}
@@ -600,7 +603,7 @@ sub create_simple_package
my $current_install_number = "";
my $infoline = "";
- installer::logger::print_message( "... creating installation directory ...\n" );
+ $installer::logger::Info->print( "... creating installation directory ...\n" );
installer::logger::include_header_into_logfile("Creating installation directory");
$installer::globals::csp_installdir = installer::worker::create_installation_directory($shipinstalldir, $languagestringref, \$current_install_number);
@@ -653,7 +656,7 @@ sub create_simple_package
# Create directories, copy files and ScpActions
- installer::logger::print_message( "... creating directories ...\n" );
+ $installer::logger::Info->print("... creating directories ...\n");
installer::logger::include_header_into_logfile("Creating directories:");
for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
@@ -668,8 +671,7 @@ sub create_simple_package
{
if ( $^O =~ /cygwin/i || $^O =~ /os2/i ) # Cygwin performance check
{
- $infoline = "Try to create directory $destdir\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Try to create directory %s\n", $destdir);
# Directories in $dirsref are sorted and all parents were added -> "mkdir" works without parent creation!
if ( ! ( -d $destdir )) { mkdir($destdir, 0775); }
}
@@ -685,7 +687,7 @@ sub create_simple_package
if (( $installer::globals::strip ) && ( ! $installer::globals::iswindowsbuild ) && ( ! $installer::globals::isos2 )) { installer::strip::strip_libraries($filesref, $languagestringref); }
# copy Files
- installer::logger::print_message( "... copying files ...\n" );
+ $installer::logger::Info->print("... copying files ...\n");
installer::logger::include_header_into_logfile("Copying files:");
for ( my $i = 0; $i <= $#{$filesref}; $i++ )
@@ -711,16 +713,14 @@ sub create_simple_package
if ($copyreturn)
{
- $infoline = "Copy: $source to $destination\n";
+ $installer::logger::Lang->printf("Copy: $source to %s\n", $destination);
$returnvalue = 1;
}
else
{
- $infoline = "ERROR: Could not copy $source to $destination\n";
+ $installer::logger::Lang->printf("ERROR: Could not copy %s to %s\n", $source, $destination);
$returnvalue = 0;
}
-
- push(@installer::globals::logfileinfo, $infoline);
}
else
{
@@ -743,7 +743,7 @@ sub create_simple_package
# creating Links
- installer::logger::print_message( "... creating links ...\n" );
+ $installer::logger::Info->print("... creating links ...\n");
installer::logger::include_header_into_logfile("Creating links:");
for ( my $i = 0; $i <= $#{$linksref}; $i++ )
@@ -759,8 +759,9 @@ sub create_simple_package
my $localcall = "ln -sf \'$destinationfile\' \'$destination\' \>\/dev\/null 2\>\&1";
system($localcall);
- $infoline = "Creating link: \"ln -sf $destinationfile $destination\"\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Creating link: \"ln -sf %s %s\"\n",
+ $destinationfile,
+ $destination);
}
for ( my $i = 0; $i <= $#{$unixlinksref}; $i++ )
@@ -775,22 +776,23 @@ sub create_simple_package
my $localcall = "ln -sf \'$target\' \'$destination\' \>\/dev\/null 2\>\&1";
system($localcall);
- $infoline = "Creating Unix link: \"ln -sf $target $destination\"\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Creating Unix link: \"ln -sf %s %s\"\n",
+ $target,
+ $destination);
}
# Setting privileges for cygwin globally
if ( $^O =~ /cygwin/i )
{
- installer::logger::print_message( "... changing privileges in $subfolderdir ...\n" );
+ $installer::logger::Lang->print( "... changing privileges in $subfolderdir ...\n" );
installer::logger::include_header_into_logfile("Changing privileges in $subfolderdir:");
my $localcall = "chmod -R 755 " . "\"" . $subfolderdir . "\"";
system($localcall);
}
- installer::logger::print_message( "... removing superfluous directories ...\n" );
+ $installer::logger::Lang->print( "... removing superfluous directories ...\n" );
installer::logger::include_header_into_logfile("Removing superfluous directories:");
my ( $extensionfolder, $preregdir ) = get_extensions_dir($subfolderdir);
@@ -798,7 +800,7 @@ sub create_simple_package
# Registering the extensions
- installer::logger::print_message( "... registering extensions ...\n" );
+ $installer::logger::Lang->print( "... registering extensions ...\n" );
installer::logger::include_header_into_logfile("Registering extensions:");
register_extensions($subfolderdir, $languagestringref, $preregdir);
Modified: openoffice/trunk/main/solenv/bin/modules/installer/strip.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/strip.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/strip.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/strip.pm Thu Oct 31 10:37:56 2013
@@ -64,17 +64,17 @@ sub do_strip
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 strip $filename!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "SUCCESS: Stripped library $filename!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -105,7 +105,7 @@ sub strip_libraries
installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$shortfilename);
$infoline = "Strip: $shortfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# copy file into directory for stripped libraries
Modified: openoffice/trunk/main/solenv/bin/modules/installer/substfilenamefiles.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/substfilenamefiles.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/substfilenamefiles.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/substfilenamefiles.pm Thu Oct 31 10:37:56 2013
@@ -155,8 +155,7 @@ sub resolving_subst_filename_flag
}
}
- my $infoline = "\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("\n");
}
1;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/systemactions.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/systemactions.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/systemactions.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/systemactions.pm Thu Oct 31 10:37:56 2013
@@ -48,8 +48,8 @@ sub create_directory
if ($returnvalue)
{
- $infoline = "\nCreated directory: $directory\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf("Created directory: %s\n", $directory);
my $localcall = "chmod 0775 $directory \>\/dev\/null 2\>\&1";
system($localcall);
@@ -64,8 +64,10 @@ sub create_directory
# was not created in this process. There is only an important error, if the directory does not
# exist now.
- $infoline = "\nDid not succeed in creating directory: \"$directory\". Further attempts will follow.\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf(
+ "Did not succeed in creating directory: \"%s\". Further attempts will follow.\n",
+ $directory);
if (!(-d $directory))
{
@@ -79,8 +81,10 @@ sub create_directory
if ($returnvalue)
{
- $infoline = "\nAttention: Successfully created parent directory (should already be created before): $parentdir\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf(
+ "Attention: Successfully created parent directory (should already be created before): %s\n",
+ $parentdir);
my $localcall = "chmod 775 $parentdir \>\/dev\/null 2\>\&1";
system($localcall);
@@ -88,11 +92,13 @@ sub create_directory
else
{
$infoline = "\Error: \"$directory\" could not be created. Even the parent directory \"$parentdir\" does not exist and could not be created.\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ( -d $parentdir )
{
- $infoline = "\nAttention: Finally the parent directory \"$parentdir\" exists, but I could not create it.\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf(
+ "Attention: Finally the parent directory \"%s\" exists, but I could not create it.\n",
+ $parentdir);
}
else
{
@@ -109,8 +115,10 @@ sub create_directory
if ($returnvalue)
{
- $infoline = "\nAttention: Created directory \"$directory\" in the second try.\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf(
+ "Attention: Created directory \"\" in the second try.\n",
+ $directory);;
my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
system($localcall);
@@ -119,8 +127,10 @@ sub create_directory
{
if ( -d $directory )
{
- $infoline = "\nAttention: Finally the directory \"$directory\" exists, but I could not create it.\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf(
+ "Attention: Finally the directory \"%s\" exists, but I could not create it.\n",
+ $directory);
}
else
{
@@ -131,15 +141,16 @@ sub create_directory
}
else
{
- $infoline = "\nAnother process created this directory in exactly this moment :-) : $directory\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf(
+ "Another process created this directory in exactly this moment :-) : %s\n",
+ $directory);;
}
}
}
else
{
- $infoline = "\nAlready existing directory, did not create: $directory\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Already existing directory, did not create: %s\n", $directory);
}
}
@@ -161,8 +172,8 @@ sub create_directory_with_privileges
if ($returnvalue)
{
- $infoline = "\nCreated directory: $directory\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf("Created directory: %s\n", $directory);
my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
system($localcall);
@@ -173,8 +184,10 @@ sub create_directory_with_privileges
# was not created in this process. There is only an important error, if the directory does not
# exist now.
- $infoline = "\nDid not succeed in creating directory: \"$directory\". Further attempts will follow.\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf(
+ "Did not succeed in creating directory: \"%s\". Further attempts will follow.\n",
+ $directory);
if (!(-d $directory))
{
@@ -188,8 +201,10 @@ sub create_directory_with_privileges
if ($returnvalue)
{
- $infoline = "\nAttention: Successfully created parent directory (should already be created before): $parentdir\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf(
+ "Attention: Successfully created parent directory (should already be created before): %s\n",
+ $parentdir);
my $localcall = "chmod $privileges $parentdir \>\/dev\/null 2\>\&1";
system($localcall);
@@ -197,11 +212,13 @@ sub create_directory_with_privileges
else
{
$infoline = "\Error: \"$directory\" could not be created. Even the parent directory \"$parentdir\" does not exist and could not be created.\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ( -d $parentdir )
{
- $infoline = "\nAttention: Finally the parent directory \"$parentdir\" exists, but I could not create it.\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf(
+ "Attention: Finally the parent directory \"%s\" exists, but I could not create it.\n",
+ $parentdir);
}
else
{
@@ -218,8 +235,9 @@ sub create_directory_with_privileges
if ($returnvalue)
{
- $infoline = "\nAttention: Created directory \"$directory\" in the second try.\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf("Attention: Created directory \"%s\" in the second try.\n",
+ $directory);
my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
system($localcall);
@@ -228,8 +246,10 @@ sub create_directory_with_privileges
{
if ( -d $directory )
{
- $infoline = "\nAttention: Finally the directory \"$directory\" exists, but I could not create it.\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf(
+ "Attention: Finally the directory \"\" exists, but I could not create it.\n",
+ $directory);
}
else
{
@@ -240,21 +260,54 @@ sub create_directory_with_privileges
}
else
{
- $infoline = "\nAnother process created this directory in exactly this moment :-) : $directory\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf(
+ "Another process created this directory in exactly this moment :-) : %s\n",
+ $directory);
}
}
}
else
{
- $infoline = "\nAlready existing directory, did not create: $directory\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf("Already existing directory, did not create: %s\n", $directory);
my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
system($localcall);
}
}
+
+
+
+=item is_directory_empty ($path)
+ Return
+ 1 if there are no files in the directory pointed to by $path
+ 0 if there are files
+ -1 if there is an error accessing the directory.
+=cut
+sub is_directory_empty ($)
+{
+ my ($path) = @_;
+
+ opendir my $dir, $path or return -1;
+
+ my $result = 1;
+ while (my $entry = readdir($dir))
+ {
+ if ($entry !~ /^\.+$/)
+ {
+ $result = 0;
+ last;
+ }
+ }
+
+ return $result;
+}
+
+
+
+
######################################################
# Removing a new direcotory
######################################################
@@ -266,24 +319,29 @@ sub remove_empty_directory
my $returnvalue = 1;
if (-d $directory)
- {
- my $systemcall = "rmdir $directory";
-
- $returnvalue = system($systemcall);
-
- my $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
-
- if ($returnvalue)
- {
- $infoline = "ERROR: Could not remove \"$directory\"!\n";
- push( @installer::globals::logfileinfo, $infoline);
- }
- else
- {
- $infoline = "Success: Removed \"$directory\"!\n";
- push( @installer::globals::logfileinfo, $infoline);
- }
+ {
+ if ( ! is_directory_empty($directory))
+ {
+ $installer::logger::Lang->printf("directory '%s' is not empty and can not be removed\n", $directory);
+ return;
+ }
+ else
+ {
+ my $systemcall = "rmdir $directory";
+
+ $returnvalue = system($systemcall);
+
+ $installer::logger::Lang->printf("Systemcall: %s\n", $systemcall);
+
+ if ($returnvalue)
+ {
+ $installer::logger::Lang->printf("ERROR: Could not remove \"%s\"!\n", $directory);
+ }
+ else
+ {
+ $installer::logger::Lang->printf("Success: Removed \"%s\"!\n", $directory);
+ }
+ }
}
}
@@ -348,7 +406,7 @@ sub create_directories
}
$infoline = "create_directories: Using $path for $newdirectory !\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ($newdirectory eq "unzip" ) # special handling for common directory
{
@@ -445,7 +503,7 @@ sub copy_one_file
$returnvalue = 0;
}
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ( !$returnvalue ) {
return $returnvalue;
@@ -467,7 +525,7 @@ sub copy_one_file
$returnvalue = 0;
}
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
return $returnvalue;
@@ -496,7 +554,7 @@ sub hardlink_one_file
$returnvalue = 0;
}
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
return $returnvalue;
}
@@ -524,7 +582,7 @@ sub softlink_one_file
$returnvalue = 0;
}
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
return $returnvalue;
}
@@ -552,7 +610,7 @@ sub rename_one_file
$returnvalue = 0;
}
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
return $returnvalue;
}
@@ -572,9 +630,9 @@ sub copy_directory
$destdir =~ s/\Q$installer::globals::separator\E\s*$//;
my $infoline = "\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Copying files from directory $sourcedir to directory $destdir\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
opendir(DIR, $sourcedir);
@sourcefiles = readdir(DIR);
@@ -644,9 +702,9 @@ sub hardlink_complete_directory
if ( ! -d $destdir ) { create_directory($destdir); }
my $infoline = "\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Creating hard links for all files from directory $sourcedir to directory $destdir\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
opendir(DIR, $sourcedir);
@sourcefiles = readdir(DIR);
@@ -688,9 +746,9 @@ sub softlink_complete_directory
if ( ! -d $destdir ) { create_directory($destdir); }
my $infoline = "\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Creating soft links for all files from directory $sourcedir to directory $destdir\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
opendir(DIR, $sourcedir);
@sourcefiles = readdir(DIR);
@@ -735,9 +793,9 @@ sub copy_complete_directory
if ( ! -d $destdir ) { create_directory($destdir); }
my $infoline = "\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Copying files from directory $sourcedir to directory $destdir\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
opendir(DIR, $sourcedir);
@sourcefiles = readdir(DIR);
@@ -782,9 +840,9 @@ sub copy_complete_directory_without_cvs
if ( ! -d $destdir ) { create_directory($destdir); }
my $infoline = "\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Copying files from directory $sourcedir to directory $destdir (without CVS)\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
opendir(DIR, $sourcedir);
@sourcefiles = readdir(DIR);
@@ -825,9 +883,9 @@ sub copy_directory_with_fileextension
$destdir =~ s/\Q$installer::globals::separator\E\s*$//;
$infoline = "\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Copying files with extension $extension from directory $sourcedir to directory $destdir\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
opendir(DIR, $sourcedir);
@sourcefiles = readdir(DIR);
@@ -867,9 +925,9 @@ sub copy_directory_except_fileextension
$destdir =~ s/\Q$installer::globals::separator\E\s*$//;
$infoline = "\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Copying files without extension $extension from directory $sourcedir to directory $destdir\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
opendir(DIR, $sourcedir);
@sourcefiles = readdir(DIR);
@@ -909,9 +967,9 @@ sub rename_files_with_fileextension
$dir =~ s/\Q$installer::globals::separator\E\s*$//;
my $infoline = "\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Renaming files with extension \"$extension\" in the directory $dir\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
opendir(DIR, $dir);
@sourcefiles = readdir(DIR);
@@ -951,9 +1009,9 @@ sub find_file_with_file_extension
$dir =~ s/\Q$installer::globals::separator\E\s*$//;
my $infoline = "\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Searching files with extension \"$extension\" in the directory $dir\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
opendir(DIR, $dir);
@sourcefiles = sort readdir(DIR);
@@ -1010,14 +1068,16 @@ sub make_numbered_dir
if ( move($olddir, $newdir) )
{
- $infoline = "\nMoved directory from $olddir to $newdir\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf("Moved directory from %s to %s\n", $olddir, $newdir);
$returndir = $newdir;
}
else
{
- $infoline = "\nATTENTION: Could not move directory from $olddir to $newdir, \"make_numbered_dir\"\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf("ATTENTION: Could not move directory from %s to %s, \"make_numbered_dir\"\n",
+ $olddir,
+ $newdir);
$returndir = $olddir;
}
@@ -1131,13 +1191,15 @@ sub rename_string_in_directory
if ( move($olddir, $newdir) )
{
- $infoline = "\nMoved directory from $olddir to $newdir\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf("Moved directory from $olddir to %s\n", $newdir);
}
else
{
- $infoline = "\nATTENTION: Could not move directory from $olddir to $newdir, \"rename_string_in_directory\"\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf(
+ "ATTENTION: Could not move directory from %s to %s, \"rename_string_in_directory\"\n",
+ $olddir, $newdir);
}
return $newdir;
@@ -1194,14 +1256,12 @@ sub rename_directory
sleep(2);
if ( move($olddir, $newdir) )
{
- $infoline = "\nMoved directory from $olddir to $newdir\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf("Moved directory from $olddir to %s\n", $newdir);
}
else
{
installer::exiter::exit_program("ERROR: Could not move directory from $olddir to $newdir", "rename_directory");
- # $infoline = "\nATTENTION: Could not move directory from $olddir to $newdir, \"rename_directory\"\n";
- # push(@installer::globals::logfileinfo, $infoline);
}
return $newdir;
@@ -1435,8 +1495,8 @@ sub try_to_create_directory
if ($returnvalue)
{
$created_directory = 1;
- $infoline = "\nCreated directory: $directory\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf("Created directory: %s\n", $directory);
my $localcall = "chmod 0775 $directory \>\/dev\/null 2\>\&1";
system($localcall);
@@ -1471,10 +1531,8 @@ sub create_directory_structure
my $parentdir = $directory;
installer::pathanalyzer::get_path_from_fullqualifiedname(\$parentdir);
- my $infoline = "INFO: Did not create directory $directory\n";
- push(@installer::globals::logfileinfo, $infoline);
- $infoline = "Now trying to create parent directory $parentdir\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("INFO: Did not create directory %s\n", $directory);
+ $installer::logger::Lang->printf("Now trying to create parent directory %s\n", $parentdir);
create_directory_structure($parentdir); # recursive
}
@@ -1499,10 +1557,8 @@ sub remove_complete_directory
{
if ( $start )
{
- $infoline = "\n";
- push(@installer::globals::logfileinfo, $infoline);
- $infoline = "Removing directory $directory\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf("Removing directory %s\n", $directory);
}
opendir(DIR, $directory);
@@ -1530,13 +1586,16 @@ sub remove_complete_directory
}
# try to remove empty directory
-
+
+ if ( ! -d $directory)
+ {
+ $installer::logger::Info->printf("trying to remove directory that doesn't exist: %s\n", $directory);
+ }
my $returnvalue = rmdir $directory;
if ( ! $returnvalue )
{
- $infoline = "Warning: Problem with removing empty dir $directory\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Warning: Problem with removing empty dir %s\n", $directory);
}
# try a little bit harder (sometimes there is a performance problem)
@@ -1546,20 +1605,19 @@ sub remove_complete_directory
{
if ( -d $directory )
{
- $infoline = "\n";
- push(@installer::globals::logfileinfo, $infoline);
- $infoline = "Warning (Try $j): Problems with removing directory $directory\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf("Warning (Try %d): Problems with removing directory %s\n",
+ $j, $directory);
$returnvalue = rmdir $directory;
if ( $returnvalue )
{
- $infoline = "Successfully removed empty dir $directory\n";
- push(@installer::globals::logfileinfo, $infoline);
- } else {
- $infoline = "Warning: rmdir $directory failed.\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Successfully removed empty dir %s\n", $directory);
+ }
+ else
+ {
+ $installer::logger::Lang->printf("Warning: rmdir %s failed.\n", $directory);
}
}
}
@@ -1727,13 +1785,13 @@ sub remove_empty_dirs_in_folder
}
}
- # try to remove empty directory
+ # try to remove empty directory
+ $installer::logger::Info->printf("remove_empty_dirs_in_folder %s\n", $dir);
my $returnvalue = rmdir $dir;
if ( $returnvalue )
{
- $infoline = "Successfully removed empty dir $dir\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Successfully removed empty dir %s\n", $dir);
}
}
Modified: openoffice/trunk/main/solenv/bin/modules/installer/upx.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/upx.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/upx.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/upx.pm Thu Oct 31 10:37:56 2013
@@ -68,17 +68,17 @@ sub do_upx
my $returnvalue = system($systemcall);
my $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ($returnvalue)
{
$infoline = "WARNING: Could not successfully upx $filename! Using original file.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
$infoline = "SUCCESS: upx $filename!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
return $returnvalue;
@@ -97,13 +97,15 @@ sub upx_on_libraries
if ( ! $installer::globals::upx_in_path )
{
- $infoline = "\n\nWarning: This is an UPX product, but upx was not found in PATH!\n\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->print("Warning: This is an UPX product, but upx was not found in PATH!\n");
+ $installer::logger::Lang->print("\n");
}
else
{
$infoline = "Using upx: $installer::globals::upxfile\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $upxdirbase = installer::systemactions::create_directories("upx", $languagestringref);
@@ -121,8 +123,8 @@ sub upx_on_libraries
my $shortfilename = $sourcefilename;
installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$shortfilename);
- $infoline = "\nUpx: $shortfilename";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf("Upx: %s", $shortfilename);
# copy file into directory for stripped libraries
my $onelanguage = ${$filelist}[$i]->{'specificlanguage'};
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/admin.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/admin.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/admin.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/admin.pm Thu Oct 31 10:37:56 2013
@@ -41,7 +41,7 @@ sub unpack_cabinet_file
my ($cabfilename, $unpackdir) = @_;
my $infoline = "Unpacking cabinet file: $cabfilename\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
my $expandfile = "expand.exe"; # Has to be in the path
@@ -84,18 +84,18 @@ sub unpack_cabinet_file
my $returnvalue = system($systemcall);
$infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ($returnvalue)
{
$infoline = "ERROR: Could not execute $systemcall !\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
installer::exiter::exit_program("ERROR: Could not extract cabinet file: $mergemodulehash->{'cabinetfile'} !", "change_file_table");
}
else
{
$infoline = "Success: Executed $systemcall successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -139,18 +139,18 @@ sub include_tables_into_pcpfile
$returnvalue = system($systemcall);
$infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ($returnvalue)
{
$infoline = "ERROR: Could not execute $systemcall !\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
installer::exiter::exit_program("ERROR: Could not include tables into msi database: $fullmsidatabasepath !", "include_tables_into_pcpfile");
}
else
{
$infoline = "Success: Executed $systemcall successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -197,18 +197,18 @@ sub extract_tables_from_pcpfile
$returnvalue = system($systemcall);
$infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
if ($returnvalue)
{
$infoline = "ERROR: Could not execute $systemcall !\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
installer::exiter::exit_program("ERROR: Could not exclude tables from pcp file: $localfullmsidatabasepath !", "extract_tables_from_pcpfile");
}
else
{
$infoline = "Success: Executed $systemcall successfully!\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -480,7 +480,7 @@ sub copy_files_into_directory_structure
{
my $infoline = "ERROR: Could not copy $sourcefile to $destfile (insufficient disc space for $destfile ?)\n";
$returnvalue = 0;
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
installer::exiter::exit_program($infoline, "copy_files_into_directory_structure");
}
@@ -540,7 +540,8 @@ sub remove_properties_from_registry_tabl
{
my ($registryhash, $componentkeypathhash, $registryfilecontent) = @_;
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: Start remove_properties_from_registry_table");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: Start remove_properties_from_registry_table");
my @registrytable = ();
@@ -623,7 +624,7 @@ sub remove_properties_from_registry_tabl
delete($registryhash->{$regitem});
$removecounter++;
$infoline = "Removing registry item: $regitem : $value\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
else
{
@@ -651,16 +652,16 @@ sub remove_properties_from_registry_tabl
$infoline = "Changing registry item: $regitem\n";
$infoline = "Old: $oldkey : $oldname : $oldvalue\n";
$infoline = "New: $registryhash->{$regitem}->{'Key'} : $registryhash->{$regitem}->{'Name'} : $registryhash->{$regitem}->{'Value'}\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
}
}
$infoline = "Number of removed registry items: $removecounter\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Number of changed registry items: $renamecounter\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
# Creating the new content of Registry table
# First three lines from $registryfilecontent
@@ -689,9 +690,10 @@ sub remove_properties_from_registry_tabl
}
$infoline = "Number of registry items: $newitemcounter. Old value: $olditemcounter.\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: End remove_properties_from_registry_table");
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->add_timestamp("Performance Info: End remove_properties_from_registry_table");
return (\@registrytable);
}
@@ -733,13 +735,13 @@ sub write_sis_info
}
$systemcall = $msiinfo . " " . "\"" . $localmsidatabase . "\"" . " -w " . $wordcount . " -s " . "\"" . $lastprinted . "\"" . " -l $lastsavedby";
- push(@installer::globals::logfileinfo, $systemcall);
+ $installer::logger::Lang->printf($systemcall);
$returnvalue = system($systemcall);
if ($returnvalue)
{
$infoline = "ERROR: Could not execute $systemcall !\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
installer::exiter::exit_program($infoline, "write_sis_info");
}
}
@@ -816,7 +818,9 @@ sub make_admin_install
# Create helper directory
- installer::logger::print_message( "... installing $databasepath in directory $targetdir ...\n" );
+ $installer::logger::Info->printf("... installing %s in directory %s ...\n",
+ $databasepath,
+ $targetdir);
my $helperdir = $targetdir . $installer::globals::separator . "installhelper";
installer::systemactions::create_directory($helperdir);
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/assembly.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/assembly.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/assembly.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/assembly.pm Thu Oct 31 10:37:56 2013
@@ -217,7 +217,7 @@ sub create_msiassembly_table
my $msiassemblytablename = $basedir . $installer::globals::separator . "MsiAssem.idt";
installer::files::save_file($msiassemblytablename ,\@msiassemblytable);
my $infoline = "Created idt file: $msiassemblytablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
####################################################################################
@@ -299,7 +299,7 @@ sub create_msiassemblyname_table
my $msiassemblynametablename = $basedir . $installer::globals::separator . "MsiAsseN.idt";
installer::files::save_file($msiassemblynametablename ,\@msiassemblynametable);
my $infoline = "Created idt file: $msiassemblynametablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
@@ -346,9 +346,9 @@ sub add_assembly_condition_into_componen
${$componenttable}[$j] = $oneline;
$changed = 1;
$infoline = "Changing $componenttablename :\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = $oneline;
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
last;
}
}
@@ -360,8 +360,8 @@ sub add_assembly_condition_into_componen
# Saving the file
installer::files::save_file($componenttablename ,$componenttable);
$infoline = "Saved idt file: $componenttablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
-1;
\ No newline at end of file
+1;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/binary.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/binary.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/binary.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/binary.pm Thu Oct 31 10:37:56 2013
@@ -66,8 +66,7 @@ sub update_binary_table
# Saving the file
installer::files::save_file($binaryidttablename ,$binaryidttable);
- my $infoline = "Updated idt file: $binaryidttablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Updated idt file: %s\n", $binaryidttablename);
}
1;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/component.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/component.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/component.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/component.pm Thu Oct 31 10:37:56 2013
@@ -361,7 +361,7 @@ sub get_component_keypath
{
# Warning: This keypath was changed because of info from old database
$infoline = "WARNING: The KeyPath for component \"$componentname\" was changed from \"$oneitem->{'uniquename'}\" to \"$keypath\" because of information from update database";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -438,7 +438,7 @@ sub create_component_table
my $componenttablename = $basedir . $installer::globals::separator . "Componen.idt";
installer::files::save_file($componenttablename ,\@componenttable);
$infoline = "Created idt file: $componenttablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
####################################################################################
@@ -501,14 +501,14 @@ sub set_component_in_environment_table
if ( $componentname ) # only do something if a component could be found
{
$infoline = "Updated Environment table:\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$infoline = "Old line: ${$environmentfile}[$i]\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
${$environmentfile}[$i] =~ s/$modulegid/$componentname/;
$infoline = "New line: ${$environmentfile}[$i]\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -518,9 +518,9 @@ sub set_component_in_environment_table
installer::files::save_file($environmentfilename ,$environmentfile);
$infoline = "Updated idt file: $environmentfilename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
-1;
\ No newline at end of file
+1;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/createfolder.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/createfolder.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/createfolder.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/createfolder.pm Thu Oct 31 10:37:56 2013
@@ -141,9 +141,7 @@ sub create_createfolder_table
my $createfoldertablename = $basedir . $installer::globals::separator . "CreateFo.idt";
installer::files::save_file($createfoldertablename ,\@createfoldertable);
- $infoline = "Created idt file: $createfoldertablename\n";
- push(@installer::globals::logfileinfo, $infoline);
-
+ $installer::logger::Lang->printf("Created idt file: %s\n", $createfoldertablename);
}
-1;
\ No newline at end of file
+1;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/directory.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/directory.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/directory.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/directory.pm Thu Oct 31 10:37:56 2013
@@ -563,7 +563,7 @@ sub create_directory_table
# Before ":" : [sourcedir]:[destdir] (not programmed yet)
# After ":" : 8+3 and not 8+3 the destination directory name
- installer::logger::include_timestamp_into_logfile("Performance Info: Directory Table start");
+ $installer::logger::Lang->add_timestamp("Performance Info: Directory Table start");
my @directorytable = ();
my $infoline;
@@ -584,11 +584,9 @@ sub create_directory_table
my $directorytablename = $basedir . $installer::globals::separator . "Director.idt";
installer::files::save_file($directorytablename ,\@directorytable);
- $infoline = "Created idt file: $directorytablename\n";
- push(@installer::globals::logfileinfo, $infoline);
-
- installer::logger::include_timestamp_into_logfile("Performance Info: Directory Table end");
+ $installer::logger::Lang->printf("Created idt file: %s\n", $directorytablename);
+ $installer::logger::Lang->add_timestamp("Performance Info: Directory Table end");
}
1;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/feature.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/feature.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/feature.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/feature.pm Thu Oct 31 10:37:56 2013
@@ -329,8 +329,9 @@ sub sort_feature
{
if ( $sorted{$modulekey} == 0 )
{
- my $infoline = "Warning: Module \"$modulekey\" could not be sorted. Added to the end of the module array.\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf(
+ "Warning: Module \"%s\" could not be sorted. Added to the end of the module array.\n",
+ $modulekey);
push(@feature, ${$modulesref}[$directaccess{$modulekey}]);
}
}
@@ -432,10 +433,8 @@ sub create_feature_table
my $featuretablename = $basedir . $installer::globals::separator . "Feature.idt" . "." . $onelanguage;
installer::files::save_file($featuretablename ,\@featuretable);
- $infoline = "Created idt file: $featuretablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Created idt file: %s\n", $featuretablename);
}
-
}
1;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/featurecomponent.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/featurecomponent.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/featurecomponent.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/featurecomponent.pm Thu Oct 31 10:37:56 2013
@@ -162,8 +162,8 @@ sub check_number_of_components_at_featur
{
my ($featurecomponenttable) = @_;
- my $infoline = "\nChecking number of components at features. Maximum is 817 (for Win 98 and Win Me)\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->print("Checking number of components at features. Maximum is 817 (for Win 98 and Win Me)\n");
my $allfeature = collect_all_feature($featurecomponenttable);
@@ -184,12 +184,10 @@ sub check_number_of_components_at_featur
# Logging the result
- $infoline = "Number of components at feature $onefeature : $featurecomponents\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("Number of components at feature $onefeature : %s\n", $featurecomponents);
}
- $infoline = "\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
}
#################################################################################
@@ -232,9 +230,7 @@ sub create_featurecomponent_table
my $featurecomponenttablename = $basedir . $installer::globals::separator . "FeatureC.idt";
installer::files::save_file($featurecomponenttablename ,\@featurecomponenttable);
- $infoline = "Created idt file: $featurecomponenttablename\n";
- push(@installer::globals::logfileinfo, $infoline);
-
+ $installer::logger::Lang->printf("Created idt file: %s\n", $featurecomponenttablename);
}
-1;
\ No newline at end of file
+1;
Modified: openoffice/trunk/main/solenv/bin/modules/installer/windows/file.pm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/windows/file.pm?rev=1537433&r1=1537432&r2=1537433&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/windows/file.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/windows/file.pm Thu Oct 31 10:37:56 2013
@@ -70,13 +70,13 @@ sub assign_cab_to_files
# logging the number of files in each cabinet file
- $infoline = "\nCabinet file content:\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->print("Cabinet file content:\n");
my $cabfile;
foreach $cabfile ( sort keys %installer::globals::cabfilecounter )
{
$infoline = "$cabfile : $installer::globals::cabfilecounter{$cabfile} files\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
# assigning startsequencenumbers for each cab file
@@ -93,22 +93,22 @@ sub assign_cab_to_files
# logging the start sequence numbers
- $infoline = "\nCabinet file start sequences:\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->print("Cabinet file start sequences:\n");
foreach $cabfile ( sort keys %installer::globals::cabfilecounter )
{
$infoline = "$cabfile : $installer::globals::cabfilecounter{$cabfile}\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
# logging the last sequence numbers
- $infoline = "\nCabinet file last sequences:\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->print("Cabinet file last sequences:\n");
foreach $cabfile ( sort keys %installer::globals::lastsequence )
{
$infoline = "$cabfile : $installer::globals::lastsequence{$cabfile}\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -594,7 +594,7 @@ sub get_sequence_for_file
if ( $pffcomponentname eq $allupdatecomponentshashref->{$onefile->{'uniquename'}} )
{
$infoline = "Warning: Special handling for component \"$pffcomponentname\". This file was added after the final, but before this ServicePack.\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
$onefile->{'componentname'} = $pffcomponentname; # pff for "post final file"
$fileentry->{'Component_'} = $onefile->{'componentname'};
if ( ! exists($allfilecomponents->{$fileentry->{'Component_'}}) ) { $allfilecomponents->{$fileentry->{'Component_'}} = 1; }
@@ -746,7 +746,7 @@ sub check_file_sequences
}
$infoline = "ERROR: Files are removed compared with update database.\nThe following files are missing:\n$errorstring";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
installer::exiter::exit_program($infoline, "check_file_sequences");
}
@@ -760,18 +760,20 @@ sub check_file_sequences
$counter++;
if ( $counter == 1 )
{
- $infoline = "\nNew files compared to the update database:\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->print("New files compared to the update database:\n");
}
- $infoline = "$onefile->{'Name'} ($onefile->{'gid'}) Sequence: $onefile->{'assignedsequencenumber'}\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->printf("%s (%s) Sequence: %s\n",
+ $onefile->{'Name'},
+ $onefile->{'gid'},
+ $onefile->{'assignedsequencenumber'});
}
if ( $counter == 0 )
{
$infoline = "Info: No new file compared with update database!\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print($infoline);
}
}
@@ -844,7 +846,7 @@ sub create_files_table
{
my ($filesref, $allfilecomponentsref, $basedir, $allvariables, $uniquefilenamehashref, $allupdatesequenceshashref, $allupdatecomponentshashref, $allupdatefileorderhashref) = @_;
- installer::logger::include_timestamp_into_logfile("Performance Info: File Table start");
+ $installer::logger::Lang->add_timestamp("Performance Info: File Table start");
# Structure of the files table:
# File Component_ FileName FileSize Version Language Attributes Sequence
@@ -1040,15 +1042,15 @@ sub create_files_table
my $filetablename = $basedir . $installer::globals::separator . "File.idt";
installer::files::save_file($filetablename ,\@filetable);
- $infoline = "\nCreated idt file: $filetablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf("Created idt file: %s\n", $filetablename);
- installer::logger::include_timestamp_into_logfile("Performance Info: File Table end");
+ $installer::logger::Lang->add_timestamp("Performance Info: File Table end");
my $filehashtablename = $basedir . $installer::globals::separator . "MsiFileHash.idt";
installer::files::save_file($filehashtablename ,\@filehashtable);
- $infoline = "\nCreated idt file: $filehashtablename\n";
- push(@installer::globals::logfileinfo, $infoline);
+ $installer::logger::Lang->print("\n");
+ $installer::logger::Lang->printf("Created idt file: %s\n", $filehashtablename);
# Now the new files can be added to the files collector (only in update packaging processes)
if ( $installer::globals::newfilesexist )