[Libreoffice-commits] .: solenv/bin
Sebastian Spaeth
spaetz at kemper.freedesktop.org
Mon Nov 8 23:41:13 PST 2010
solenv/bin/modules/installer/archivefiles.pm | 7
solenv/bin/modules/installer/configuration.pm | 7
solenv/bin/modules/installer/control.pm | 7
solenv/bin/modules/installer/download.pm | 29 ---
solenv/bin/modules/installer/downloadsigner.pm | 3
solenv/bin/modules/installer/environment.pm | 2
solenv/bin/modules/installer/epmfile.pm | 186 ---------------------
solenv/bin/modules/installer/globals.pm | 1
solenv/bin/modules/installer/javainstaller.pm | 14 -
solenv/bin/modules/installer/languagepack.pm | 44 ----
solenv/bin/modules/installer/languages.pm | 39 ----
solenv/bin/modules/installer/packagelist.pm | 16 -
solenv/bin/modules/installer/regmerge.pm | 1
solenv/bin/modules/installer/scppatchsoname.pm | 5
solenv/bin/modules/installer/scpzipfiles.pm | 4
solenv/bin/modules/installer/scriptitems.pm | 14 -
solenv/bin/modules/installer/servicesfile.pm | 14 -
solenv/bin/modules/installer/setupscript.pm | 11 -
solenv/bin/modules/installer/simplepackage.pm | 6
solenv/bin/modules/installer/substfilenamefiles.pm | 1
solenv/bin/modules/installer/systemactions.pm | 3
solenv/bin/modules/installer/worker.pm | 56 ------
solenv/bin/modules/installer/xpdinstaller.pm | 12 -
solenv/bin/modules/installer/ziplist.pm | 1
24 files changed, 1 insertion(+), 482 deletions(-)
New commits:
commit 4e7555bf001050752e7380c54dd804fa9566d7ad
Author: Jordan Ayers <jordan.ayers at gmail.com>
Date: Mon Nov 8 22:09:11 2010 -0600
Perl Installer: Remove commented out code.
diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm
index b7636ca..351f58a 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -241,9 +241,6 @@ sub resolving_archive_flag
my $unzipdir;
- # if ($iscommonfile) { $unzipdir = $commonunzipdirbase . $installer::globals::separator . $onelanguage . $installer::globals::separator; }
- # else { $unzipdir = $platformunzipdirbase . $installer::globals::separator . $onelanguage . $installer::globals::separator; }
-
$unzipdir = $platformunzipdirbase . $installer::globals::separator . $onelanguage . $installer::globals::separator;
installer::systemactions::create_directory($unzipdir); # creating language specific subdirectories
@@ -411,13 +408,9 @@ sub resolving_archive_flag
$newfile{'Styles'} =~ s/\,\s*\,/\,/;
$newfile{'Styles'} =~ s/\(\s*\,/\(/;
$newfile{'Styles'} =~ s/\,\s*\)/\)/;
- # $infoline = "Removing PATCH flag from: $zipname\n";
- # push( @installer::globals::logfileinfo, $infoline);
}
else
{
- # $infoline = "Keeping PATCH flag at: $zipname\n";
- # push( @installer::globals::logfileinfo, $infoline);
push( @keptpatchflags, $zipname); # collecting all PATCH flags
}
}
diff --git a/solenv/bin/modules/installer/configuration.pm b/solenv/bin/modules/installer/configuration.pm
index b7d054b..6c9920d 100644
--- a/solenv/bin/modules/installer/configuration.pm
+++ b/solenv/bin/modules/installer/configuration.pm
@@ -482,7 +482,6 @@ sub insert_into_config_file
elsif ( $styles =~ /CFG_NUMERIC/ ) { $valuetype = "int"; }
elsif ( $styles =~ /CFG_BOOLEAN/ ) { $valuetype = "boolean"; }
elsif ( $styles =~ /CFG_STRINGLIST/ ) { $valuetype = "string-list"; }
-# elsif ( $styles =~ /CFG_STRINGLIST/ ) { $valuetype = "string-list oor:separator=\"\|\""; }
else
{
installer::exiter::exit_program("ERROR: Unknown configuration value type: $styles", "insert_into_config_file");
@@ -525,8 +524,6 @@ sub insert_into_config_file
if (( $styles =~ /\bCREATE\b/ ) && (!($isbracketnode)))
{
- # my $typepart = 'oor:type="xs:VALUETYPE"'; # VALUETYPE can be "string", "boolean", ...
-
my $localtypepart = $typepart;
$localtypepart =~ s/VALUETYPE/$valuetype/;
@@ -552,8 +549,6 @@ sub insert_into_config_file
# ToDo: Substituting the setup replace variables
- # replace_setting_variables();
-
$value =~ s/^\s*\<//;
$value =~ s/\>\s*$//;
@@ -577,14 +572,12 @@ sub insert_into_config_file
if (!($oneconfig->{'isisocode'} )) # this is the simpe case
{
- # my $valueline = '<value SEPARATORPART>VALUECONTENT</value>' . "\n";
$newvalueline = $valueline;
$newvalueline =~ s/VALUECONTENT/$value/g;
$newvalueline =~ s/SEPARATORPART/$separatorpart/;
}
else
{
- # my $langvalueline = '<value xml:lang="SAVEDLANGUAGE">VALUECONTENT</value>' . "\n";
$newvalueline = $langvalueline;
$newvalueline =~ s/VALUECONTENT/$value/;
my $savedlanguage = $oneconfig->{'Key'};
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 5f7c2ca..bd9c2d5 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -369,7 +369,6 @@ sub check_logfile
$line = "*********************************************************************\n";
push(@output, $line);
-# exit(-1);
}
else
{
@@ -415,7 +414,6 @@ sub determine_ship_directory
{
my $number_of_languages = installer::systemactions::get_number_of_langs($languagestring);
chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`);
- # $languagestring = $shorter;
my $id = substr($shorter, 0, 8); # taking only the first 8 digits
$languagestring = "lang_" . $number_of_languages . "_id_" . $id;
}
@@ -629,11 +627,6 @@ sub read_encodinglist
$installer::globals::msiencoding = \%msiencoding;
$installer::globals::msilanguage = \%msilanguage;
-
- # my $key;
- # foreach $key (keys %{$installer::globals::msiencoding}) { print "A Key: $key : Value: $installer::globals::msiencoding->{$key}\n"; }
- # foreach $key (keys %{$installer::globals::msilanguage}) { print "B Key: $key : Value: $installer::globals::msilanguage->{$key}\n"; }
-
}
#############################################################
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 7b30c43..91ccdfc 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -441,14 +441,6 @@ sub get_downloadname_language
$languages =~ s/_en-US//;
}
- # en-US is default language and can be removed therefore
- # for one-language installation sets
-
- # if ( $languages =~ /^\s*en-US\s*$/ )
- # {
- # $languages = "";
- # }
-
if ( length ($languages) > $installer::globals::max_lang_length )
{
$languages = 'multi';
@@ -590,7 +582,6 @@ sub get_download_platformname
}
else
{
- # $platformname = $installer::globals::packageformat;
$platformname = $installer::globals::compiler;
}
@@ -751,7 +742,6 @@ sub get_current_version
my $infoline = "";
my $versionstring = "";
my $filename = "version.info";
- # $filename = $installer::globals::ooouploaddir . $installer::globals::separator . $filename;
if ( -f $filename )
{
@@ -991,7 +981,6 @@ sub put_banner_bmp_into_template
{
my ($templatefile, $includepatharrayref, $allvariables) = @_;
- # my $filename = "downloadbanner.bmp";
if ( ! $allvariables->{'DOWNLOADBANNER'} ) { installer::exiter::exit_program("ERROR: DOWNLOADBANNER not defined in product definition!", "put_banner_bmp_into_template"); }
my $filename = $allvariables->{'DOWNLOADBANNER'};
@@ -1021,7 +1010,6 @@ sub put_welcome_bmp_into_template
{
my ($templatefile, $includepatharrayref, $allvariables) = @_;
- # my $filename = "downloadbitmap.bmp";
if ( ! $allvariables->{'DOWNLOADBITMAP'} ) { installer::exiter::exit_program("ERROR: DOWNLOADBITMAP not defined in product definition!", "put_welcome_bmp_into_template"); }
my $filename = $allvariables->{'DOWNLOADBITMAP'};
@@ -1051,7 +1039,6 @@ sub put_setup_ico_into_template
{
my ($templatefile, $includepatharrayref, $allvariables) = @_;
- # my $filename = "downloadsetup.ico";
if ( ! $allvariables->{'DOWNLOADSETUPICO'} ) { installer::exiter::exit_program("ERROR: DOWNLOADSETUPICO not defined in product definition!", "put_setup_ico_into_template"); }
my $filename = $allvariables->{'DOWNLOADSETUPICO'};
@@ -1140,7 +1127,6 @@ sub put_windows_productpath_into_template
if (length($locallangs) > $installer::globals::max_lang_length) { $locallangs = "multi lingual"; }
if ( ! $installer::globals::languagepack ) { $productpath = $productpath . " (" . sprintf('%x', time()) . ")"; }
- # if (( $installer::globals::languagepack ) && ( $installer::globals::unicodensis )) { $productpath = convert_textstring_to_utf16($productpath, $localnsisdir, "stringhelper.txt"); }
replace_one_variable($templatefile, "PRODUCTPATHPLACEHOLDER", $productpath);
}
@@ -1296,7 +1282,6 @@ sub nsis_language_converter
my $infoline = "NSIS language_converter : Could not find nsis language for $language!\n";
push( @installer::globals::logfileinfo, $infoline);
$nsislanguage = "English";
- # installer::exiter::exit_program("ERROR: Could not find nsis language for $language!", "nsis_language_converter");
}
return $nsislanguage;
@@ -1525,8 +1510,6 @@ sub convert_utf16_to_utf8
my $savfilename = $filename . "_before.utf16";
installer::systemactions::copy_one_file($filename, $savfilename);
-# open( IN, "<:utf16", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_utf16_to_utf8");
-# open( IN, "<:para:crlf:uni", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_utf16_to_utf8");
open( IN, "<:encoding(UTF16-LE)", $filename ) || installer::exiter::exit_program("ERROR: Cannot open file $filename for reading", "convert_utf16_to_utf8");
while ( $line = <IN> ) {
push @localfile, $line;
@@ -1751,12 +1734,6 @@ sub get_path_to_nsis_sdk
$nsispath = $ENV{'NSISSDK_SOURCE'}; # overriding the NSIS SDK with NSISSDK_SOURCE
}
-# if( ($^O =~ /cygwin/i) and $nsispath =~ /\\/ ) {
-# # We need a POSIX path for W32-4nt-cygwin-perl
-# $nsispath =~ s/\\/\\\\/g;
-# chomp( $nsispath = qx{cygpath -u "$nsispath"} );
-# }
-
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");
@@ -1871,9 +1848,6 @@ sub remove_english_for_nsis_installer
{
my ($languagestringref, $languagesarrayref) = @_;
- # $$languagestringref =~ s/en-US_//;
- # shift(@{$languagesarrayref});
-
@{$languagesarrayref} = ("en-US"); # only english for NSIS installer!
}
@@ -2151,9 +2125,6 @@ sub create_download_link_tree
push( @installer::globals::logfileinfo, $infoline);
create_link_tree($sourcedownloadfile, $destdownloadfilename, $versionstring);
- # my $md5sumoutput = call_md5sum($downloadfile);
- # my $md5sum = get_md5sum($md5sumoutput);
-
}
}
else
diff --git a/solenv/bin/modules/installer/downloadsigner.pm b/solenv/bin/modules/installer/downloadsigner.pm
index 746e171..6e6780f 100644
--- a/solenv/bin/modules/installer/downloadsigner.pm
+++ b/solenv/bin/modules/installer/downloadsigner.pm
@@ -91,8 +91,6 @@ Ende
sub getparameter
{
- # installer::logger::print_message("Checking parameter");
-
while ( $#ARGV >= 0 )
{
my $param = shift(@ARGV);
@@ -347,7 +345,6 @@ sub check_cws_build
my $iscws = 1;
if ( $filename =~ /follow_me_\d+_/ ) { $iscws = 0; }
- # if ( $filename =~ /log_\d+_/ ) { $iscws = 0; }
return $iscws;
}
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index 723dba2..822d830 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -47,7 +47,6 @@ sub create_pathvariables
$variables{'solarpath'} = $solarpath;
my $solarcommonpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . "common" . $installer::globals::productextension;
- # my $solarcommonpath = $environment->{'SOLARVERSION'} . $installer::globals::separator . $environment->{'COMMON_OUTDIR'} . $installer::globals::productextension;
$variables{'solarcommonpath'} = $solarcommonpath;
my $osdef = lc($environment->{'GUI'});
@@ -110,7 +109,6 @@ sub set_global_environment_variables
my ( $environment ) = @_;
$installer::globals::build = $environment->{'WORK_STAMP'};
- # $installer::globals::minor = $environment->{'UPDMINOR'};
$installer::globals::compiler = $environment->{'OUTPATH'};
if ( $ENV{'UPDMINOR'} ) { $installer::globals::minor = $ENV{'UPDMINOR'}; }
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 0e1b18a..b150133 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -228,14 +228,10 @@ sub put_directories_into_epmfile
if ( $onedir->{'Dir'} ) { $dir = $onedir->{'Dir'}; }
- # if (!($dir =~ /\bPREDEFINED_/ ))
if ((!($dir =~ /\bPREDEFINED_/ )) || ( $dir =~ /\bPREDEFINED_PROGDIR\b/ ))
{
my $hostname = $onedir->{'HostName'};
- # not including simple directory "/opt"
- # if (( $allvariables->{'SETSTATICPATH'} ) && ( $hostname eq $packagerootpath )) { next; }
-
my $line = "d 755 root $group $hostname -\n";
push(@{$epmfileref}, $line)
@@ -356,7 +352,6 @@ sub create_epm_header
# Determining the release version
# This release version has to be listed in the line %version : %version versionnumber releasenumber
- # if ( $variableshashref->{'PACKAGEVERSION'} ) { $installer::globals::packageversion = $variableshashref->{'PACKAGEVERSION'}; }
if ( ! $onepackage->{'packageversion'} ) { installer::exiter::exit_program("ERROR: No packageversion defined for package: $onepackage->{'module'}!", "create_epm_header"); }
$installer::globals::packageversion = $onepackage->{'packageversion'};
installer::packagelist::resolve_packagevariables(\$installer::globals::packageversion, $variableshashref, 0);
@@ -598,15 +593,9 @@ sub create_epm_header
$requires = "requires"; # the name in the packagelist
}
- # if ( $installer::globals::patch )
- # {
- # $onepackage->{$provides} = "";
my $isdict = 0;
if ( $onepackage->{'packagename'} =~ /-dict-/ ) { $isdict = 1; }
- # $onepackage->{$requires} = "";
- # }
-
if ( $onepackage->{$provides} )
{
my $providesstring = $onepackage->{$provides};
@@ -649,19 +638,6 @@ sub create_epm_header
$onerequires =~ s/\s*$//;
installer::packagelist::resolve_packagevariables2(\$onerequires, $variableshashref, 0, $isdict);
- # Special handling for Solaris. In depend files, the names of the packages are required, not
- # only the abbreviation. Therefore there is a special syntax for names in packagelist:
- # solarisrequires = "SUNWcar (Name="Package name of SUNWcar"),SUNWkvm (Name="Package name of SUNWcar"), ...
- # if ( $installer::globals::issolarispkgbuild )
- # {
- # if ( $onerequires =~ /^\s*(.*?)\s+\(\s*Name\s*=\s*\"(.*?)\"\s*\)\s*$/ )
- # {
- # $onerequires = $1;
- # $packagename = $2;
- # $installer::globals::dependfilenames{$onerequires} = $packagename;
- # }
- # }
-
$line = "%requires" . " " . $onerequires . "\n";
push(@epmheader, $line);
}
@@ -683,19 +659,6 @@ sub create_epm_header
$onerequires =~ s/\s*$//;
installer::packagelist::resolve_packagevariables(\$onerequires, $variableshashref, 0);
- # Special handling for Solaris. In depend files, the names of the packages are required, not
- # only the abbreviation. Therefore there is a special syntax for names in packagelist:
- # solarisrequires = "SUNWcar (Name="Package name of SUNWcar"),SUNWkvm (Name="Package name of SUNWcar"), ...
- # if ( $installer::globals::issolarispkgbuild )
- # {
- # if ( $onerequires =~ /^\s*(.*?)\s+\(\s*Name\s*=\s*\"(.*?)\"\s*\)\s*$/ )
- # {
- # $onerequires = $1;
- # $packagename = $2;
- # $installer::globals::dependfilenames{$onerequires} = $packagename;
- # }
- # }
-
$line = "%requires" . " " . $onerequires . "\n";
push(@epmheader, $line);
}
@@ -762,8 +725,6 @@ sub replace_many_variables_in_shellscripts
foreach $key (keys %{$variableshashref})
{
my $value = $variableshashref->{$key};
- # $value = lc($value); # lowercase !
- # if ( $installer::globals::issolarisbuild) { $value =~ s/\.org/org/g; } # openofficeorg instead of openoffice.org
replace_variable_in_shellscripts($scriptref, $value, $key);
}
}
@@ -776,8 +737,6 @@ sub adding_shellscripts_to_epm_file
{
my ($epmfileref, $shellscriptsfilename, $localrootpath, $allvariableshashref, $filesinpackage) = @_;
- # $installer::globals::shellscriptsfilename
-
push( @{$epmfileref}, "\n\n" );
my $shellscriptsfileref = installer::files::read_file($shellscriptsfilename);
@@ -1080,8 +1039,6 @@ sub set_revision_in_pkginfo
my $finalminor = $minor;
my $finalmicro = 0;
- # if (( $packagename =~ /-ure\s*$/ ) && ( $finalmajor == 1 )) { $finalminor = 4; }
-
$version = "$finalmajor.$finalminor.$finalmicro";
}
@@ -1318,7 +1275,6 @@ sub set_topdir_in_specfile
{
my ($changefile, $filename, $newepmdir) = @_;
- # $newepmdir =~ s/^\s*\.//; # removing leading "."
$newepmdir = cwd() . $installer::globals::separator . $newepmdir; # only absolute path allowed
# removing "%define _topdir", if existing
@@ -1919,11 +1875,6 @@ sub include_patchinfos_into_pkginfo
}
$newline = "SUNW_PATCH_PROPERTIES=\n";
add_one_line_into_file($changefile, $newline, $filename);
- # $newline = "SUNW_PKGTYPE=usr\n";
- # add_one_line_into_file($changefile, $newline, $filename);
-
- # $newline = "SUNW_PKGVERS=1.0\n";
- # add_one_line_into_file($changefile, $newline, $filename);
}
############################################################
@@ -2103,7 +2054,6 @@ sub prepare_packages
if ( $installer::globals::isrpmbuild )
{
- # if ( $localrelocatablepath =~ /^\s*$/ ) { $localrelocatablepath = "/"; }; # at least the "/"
$filename = $packagename . ".spec";
$newline = "Prefix\:\ " . $localrelocatablepath . "\n";
}
@@ -2118,9 +2068,6 @@ sub prepare_packages
installer::files::save_file($completefilename, $changefile);
}
- # my $newepmdir = $completefilename;
- # installer::pathanalyzer::get_path_from_fullqualifiedname(\$newepmdir);
-
# adding new "topdir" and removing old "topdir" in specfile
if ( $installer::globals::isrpmbuild )
@@ -2131,7 +2078,6 @@ sub prepare_packages
if ( is_extension_package($changefile) ) { set_prereq_in_specfile($changefile); }
set_license_in_specfile($changefile, $variableshashref);
set_tab_into_datafile($changefile, $filesref);
- # check_requirements_in_specfile($changefile);
installer::files::save_file($completefilename, $changefile);
if ( $installer::globals::patch ) { collect_patch_files($changefile, $packagename, $localrelocatablepath); }
}
@@ -2245,7 +2191,6 @@ sub determine_rpm_version
my $rpmout = "";
my $systemcall = "";
- # my $systemcall = "rpm --version |";
# "rpm --version" has problems since LD_LIBRARY_PATH was removed. Therefore the content of $RPM has to be called.
# "rpm --version" and "rpmbuild --version" have the same output. Therefore $RPM can be used. Its value
# is saved in $installer::globals::rpm
@@ -2354,7 +2299,6 @@ sub create_packages_without_epm
installer::pathanalyzer::get_path_from_fullqualifiedname(\$destinationdir);
$destinationdir =~ s/\/\s*$//; # removing ending slashes
- # 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" );
@@ -2502,54 +2446,6 @@ sub create_packages_without_epm
$infoline = "Success: Executed \"$systemcall\" successfully!\n";
push( @installer::globals::logfileinfo, $infoline);
}
-
- ######################
- # 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? )
@@ -2559,12 +2455,9 @@ sub create_packages_without_epm
my $specfilename = $epmdir . $packagename . ".spec";
if (! -f $specfilename) { installer::exiter::exit_program("ERROR: Did not find file: $specfilename", "create_packages_without_epm"); }
- # my $rpmcommand = "rpm";
my $rpmcommand = $installer::globals::rpm;
my $rpmversion = determine_rpm_version();
- # if ( $rpmversion >= 4 ) { $rpmcommand = "rpmbuild"; }
-
# saving globally for later usage
$installer::globals::rpmcommand = $rpmcommand;
$installer::globals::rpmquerycommand = "rpm";
@@ -2614,7 +2507,6 @@ sub create_packages_without_epm
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]");
}
@@ -2717,30 +2609,6 @@ sub remove_temporary_epm_files
$infoline = "Systemcall: $systemcall\n";
push( @installer::globals::logfileinfo, $infoline);
}
-
- # 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::isrpmbuild )
@@ -2748,8 +2616,6 @@ sub remove_temporary_epm_files
my $removefile = $epmdir . $packagename . ".spec";
my $destfile = $loggingdir . $packagename . ".spec.log";
- # if (! -f $removefile) { next; }
-
my $systemcall = "mv -f $removefile $destfile";
system($systemcall); # ignoring the return value
$infoline = "Systemcall: $systemcall\n";
@@ -3177,40 +3043,6 @@ sub analyze_rootpath
$rootpath =~ s/\/\s*$//; # removing ending slash
##############################################################
- # Version 1: "/opt" is variable and "openofficeorg20" fixed
- ##############################################################
-
- # my $staticpath = $rootpath;
- # installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$staticpath);
- # $$staticpathref = $staticpath; # will be "openofficeorg20"
-
- # my $relocatablepath = $rootpath;
- # installer::pathanalyzer::get_path_from_fullqualifiedname(\$relocatablepath);
- # $$relocatablepathref = $relocatablepath; # will be "/opt/"
-
- ##############################################################
- # Version 2: "/opt/openofficeorg20" is variable and "" fixed
- ##############################################################
-
- # if ( $$relocatablepathref eq "" ) # relocatablepath is not defined in package list
- # {
- # $$staticpathref = ""; # will be ""
- # $$relocatablepathref = $rootpath . "\/"; # relocatable path must end with "/", will be "/opt/openofficeorg20/"
- # # setting the static path to the hostname of the directory with style OFFICEDIRECTORY
- # if ( $allvariables->{'SETSTATICPATH'} ) { $$staticpathref = $installer::globals::officedirhostname; }
- #
- # }
- # else # relocatablepath is defined in package list
- # {
- # $$relocatablepathref =~ s/\/\s*$//; # removing ending slash
- # $$relocatablepathref = $$relocatablepathref . "\/"; # relocatable path must end with "/"
- # my $staticpath = $rootpath;
- # $staticpath =~ s/\Q$$relocatablepathref\E//;
- # $staticpath =~ s/\/\s*$//;
- # $$staticpathref = $staticpath;
- # }
-
- ##############################################################
# Version 3: "/" is variable and "/opt/openofficeorg20" fixed
##############################################################
@@ -3230,7 +3062,6 @@ sub analyze_rootpath
{
$$relocatablepathref = "";
# $$staticpathref is already "/opt/openoffice.org3", no additional $rootpath required.
- # $$staticpathref = $rootpath . $installer::globals::separator . $$staticpathref; # no relocatibility for Debian
}
}
@@ -3381,20 +3212,6 @@ sub finalize_linux_patch
if ( ! ( $#{$rpmfiles} > -1 )) { installer::exiter::exit_program("ERROR: Could not find rpm in directory $newepmdir!", "finalize_linux_patch"); }
for ( my $i = 0; $i <= $#{$rpmfiles}; $i++ ) { installer::pathanalyzer::make_absolute_filename_to_relative_filename(\${$rpmfiles}[$i]); }
-# my $installline = "";
-#
-# for ( my $i = 0; $i <= $#{$rpmfiles}; $i++ )
-# {
-# $installline = $installline . " rpm --prefix \$PRODUCTINSTALLLOCATION -U $newepmdir/${$rpmfiles}[$i]\n";
-# }
-#
-# $installline =~ s/\s*$//;
-#
-# for ( my $j = 0; $j <= $#{$scriptfile}; $j++ )
-# {
-# ${$scriptfile}[$j] =~ s/INSTALLLINES/$installline/;
-# }
-
# Searching packagename containing -core01
my $found_package = 0;
my $searchpackagename = "";
@@ -3421,7 +3238,6 @@ sub finalize_linux_patch
my $productname = $allvariables->{'PRODUCTNAME'};
$productname = lc($productname);
$productname =~ s/ /_/g; # abc office -> abc_office
-# $productname =~ s/\.//g; # openoffice.org -> openofficeorg
$infoline = "Adding productname $productname into Linux patch script\n";
push( @installer::globals::logfileinfo, $infoline);
@@ -3430,7 +3246,7 @@ sub finalize_linux_patch
# Saving the file
- my $newscriptfilename = "setup"; # $newepmdir . $installer::globals::separator . "setup";
+ my $newscriptfilename = "setup";
installer::files::save_file($newscriptfilename, $scriptfile);
$infoline = "Saved Linux patch setup $newscriptfilename \n";
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 7d85f73..441f3c0 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -306,7 +306,6 @@ BEGIN
$productxpdfile = "setup.xpd";
$xpd_files_prepared = 0;
$defaultlanguage = "";
- # @emptyxpdparents = ();
@createdxpdfiles = ();
@allxpdfiles = ();
$isxpdplatform = 0;
diff --git a/solenv/bin/modules/installer/javainstaller.pm b/solenv/bin/modules/installer/javainstaller.pm
index 0420158..49aedf4 100644
--- a/solenv/bin/modules/installer/javainstaller.pm
+++ b/solenv/bin/modules/installer/javainstaller.pm
@@ -260,7 +260,6 @@ sub translate_javafile
$newstring =~ s/\"/\\\"/g; # masquerading the "
$newstring =~ s/\\\\\"/\\\"/g; # unmasquerading if \" was converted to \\" (because " was already masked)
- # if (!( $newstring eq "" )) { ${$idtfile}[$i] =~ s/$oldstring/$newstring/; }
${$templatefile}[$i] =~ s/$oldstring/$newstring/; # always substitute, even if $newstring eq ""
}
}
@@ -861,15 +860,7 @@ sub prepare_language_pack_in_xmlfile
{
my ($xmlfile, $languagesarrayref) = @_;
- # if ( ! $installer::globals::is_unix_multi )
- # {
- # remove_languagepack_from_xmlfile($xmlfile);
- # }
- # else
- # {
duplicate_languagepack_in_xmlfile($xmlfile, $languagesarrayref);
- # }
-
}
#######################################################
@@ -1670,7 +1661,6 @@ sub create_java_installer
# creating the directory
my $javadir = installer::systemactions::create_directories("javainstaller", $languagestringref);
$javadir =~ s/\/\s*$//;
-# push(@installer::globals::removedirs, $javadir);
# copying the content from directory install_sdk into the java directory
@@ -1692,7 +1682,6 @@ sub create_java_installer
# determining the ulf language file
- # my $ulffilename = "installsdk.ulf";
my $ulffilename = "installsdk.jlf";
$ulffilename = $installer::globals::javalanguagepath . $installer::globals::separator . $ulffilename;
my $ulffile = installer::files::read_file($ulffilename);
@@ -1726,7 +1715,6 @@ sub create_java_installer
# setting the class name in the java file ( "MyResources_TEMPLATE" -> "MyResources_en" )
- # if ( $onelanguage =~ /^\s*(\w+)\-(\w+)\s*$/ ) { $onelanguage = $1; }
$onelanguage =~ s/en-US/en/; # java file name and class name contain only "_en"
$onelanguage =~ s/\-/\_/; # "pt-BR" -> "pt_BR"
my $classfilename = "MyResources_" . $onelanguage;
@@ -1748,8 +1736,6 @@ sub create_java_installer
my $baselanguage = installer::languages::get_default_language($languagesarrayref);
$baselanguage =~ s/\-/\_/; # "pt-BR" -> "pt_BR"
$baselanguage =~ s/en_US/en/; # java file name and class name contain only "_en"
- # if ( $baselanguage =~ /^\s*(\w+)\-(\w+)\s*$/ ) { $baselanguage = $1; } # java file name and class name contain only "_en"
- # $baselanguage =~ s/en-US/en/; # java file name and class name contain only "_en"
my $baselanguagefilename = $javadir . $installer::globals::separator . "locale/resources/MyResources_" . $baselanguage . "\.java";
my $basedestfilename = $javadir . $installer::globals::separator . "locale/resources/MyResources.java";
installer::systemactions::copy_one_file($baselanguagefilename, $basedestfilename);
diff --git a/solenv/bin/modules/installer/languagepack.pm b/solenv/bin/modules/installer/languagepack.pm
index 509dfac..af5e6e4 100644
--- a/solenv/bin/modules/installer/languagepack.pm
+++ b/solenv/bin/modules/installer/languagepack.pm
@@ -82,33 +82,6 @@ sub select_language_items
if ( $specificlanguage eq $onelanguage )
{
- # $oneitem->{'modules'} = $installer::globals::rootmodulegid; # all files in a language pack are root files
- # Using $installer::globals::languagemodulesbase (?)
-
-# # no more automatic change of module assignments
-# $oneitem->{'modules'} = $installer::globals::rootmodulegid . "_$locallang"; # all files in a language pack are root files
-#
-# if (( $installer::globals::islinuxbuild ) || ( $installer::globals::issolarispkgbuild ))
-# {
-# if ( $oneitem->{'Dir'} )
-# {
-# if ( $oneitem->{'Dir'} eq "gid_Dir_Fonts_Truetype" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Fonts_$locallang"; }
-# if ( $oneitem->{'Dir'} eq "gid_Dir_Resource" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Resource_$locallang"; }
-# if ( $oneitem->{'Dir'} eq "gid_Dir_Help_Isolanguage" ) { $oneitem->{'modules'} = "gid_Module_Langpack_Help_$locallang"; }
-# }
-# }
-
- # preparing different modules for Windows Installer language packs
- # my $underlinelanguage = $specificlanguage;
- # $underlinelanguage =~ s/-/_/;
- # if ( $installer::globals::iswindowsbuild ) { $oneitem->{'modules'} = $installer::globals::languagemodulesbase . $underlinelanguage; }
-
-# # no more collecting of language pack feature
-# if (! installer::existence::exists_in_array($oneitem->{'modules'}, \@installer::globals::languagepackfeature))
-# {
-# push(@installer::globals::languagepackfeature, $oneitem->{'modules'}); # Collecting all language pack feature
-# }
-
push(@itemsarray, $oneitem);
}
}
@@ -195,20 +168,6 @@ sub get_packagename_from_packagelist
{
my ( $alldirs, $allvariables, $languagestringref ) = @_;
- # my $packagename = "";
-
- # for ( my $i = 0; $i <= $#{$alldirs}; $i++ )
- # {
- # if ( ${$alldirs}[$i] =~ /-fonts/ ) { next; }
- # if ( ${$alldirs}[$i] =~ /-help/ ) { next; }
- # if ( ${$alldirs}[$i] =~ /-res/ ) { next; }
- #
- # $packagename = ${$alldirs}[$i];
- # last;
- # }
-
- # if ( $packagename eq "" ) { installer::exiter::exit_program("ERROR: Could not find base package in directory $installdir!", "get_packagename_from_packagelist"); }
-
my $localproductname = $allvariables->{'PRODUCTNAME'};
$localproductname = lc($localproductname);
$localproductname =~ s/ //g;
@@ -411,9 +370,6 @@ sub determine_scriptfile_name
my $scriptfilename = $packagename;
-# if ( $installer::globals::isrpmbuild ) { $scriptfilename =~ s/\.rpm\s*$/\.sh/; }
-# if ( $installer::globals::issolarisbuild ) { $scriptfilename =~ s/\.tar\.gz\s*$/\.sh/; }
-
$scriptfilename =~ s/\.tar\.gz\s*$/\.sh/;
my $infoline = "Setting language pack script file name to $scriptfilename\n";
diff --git a/solenv/bin/modules/installer/languages.pm b/solenv/bin/modules/installer/languages.pm
index 84828bf..591b6b2 100644
--- a/solenv/bin/modules/installer/languages.pm
+++ b/solenv/bin/modules/installer/languages.pm
@@ -331,45 +331,6 @@ sub get_java_language
{
my ( $language ) = @_;
- # my $javalanguage = "";
-
- # if ( $language eq "en-US" ) { $javalanguage = "en_US"; }
- # elsif ( $language eq "ar" ) { $javalanguage = "ar_AR"; }
- # elsif ( $language eq "bg" ) { $javalanguage = "bg_BG"; }
- # elsif ( $language eq "ca" ) { $javalanguage = "ca_CA"; }
- # elsif ( $language eq "cs" ) { $javalanguage = "cs_CS"; }
- # elsif ( $language eq "da" ) { $javalanguage = "da_DA"; }
- # elsif ( $language eq "de" ) { $javalanguage = "de"; }
- # elsif ( $language eq "de" ) { $javalanguage = "de_DE"; }
- # elsif ( $language eq "et" ) { $javalanguage = "et_ET"; }
- # elsif ( $language eq "el" ) { $javalanguage = "el_EL"; }
- # elsif ( $language eq "fi" ) { $javalanguage = "fi_FI"; }
- # elsif ( $language eq "fr" ) { $javalanguage = "fr_FR"; }
- # elsif ( $language eq "hu" ) { $javalanguage = "hu_HU"; }
- # elsif ( $language eq "he" ) { $javalanguage = "he_HE"; }
- # elsif ( $language eq "it" ) { $javalanguage = "it_IT"; }
- # elsif ( $language eq "nl" ) { $javalanguage = "nl_NL"; }
- # elsif ( $language eq "es" ) { $javalanguage = "es_ES"; }
- # elsif ( $language eq "sv" ) { $javalanguage = "sv_SV"; }
- # elsif ( $language eq "sk" ) { $javalanguage = "sk_SK"; }
- # elsif ( $language eq "pl" ) { $javalanguage = "pl_PL"; }
- # elsif ( $language eq "pt-BR" ) { $javalanguage = "pt_BR"; }
- # elsif ( $language eq "ru" ) { $javalanguage = "ru_RU"; }
- # elsif ( $language eq "tr" ) { $javalanguage = "tr_TR"; }
- # elsif ( $language eq "ja" ) { $javalanguage = "ja"; }
- # elsif ( $language eq "ja" ) { $javalanguage = "ja_JP"; }
- # elsif ( $language eq "ko" ) { $javalanguage = "ko_KR"; }
- # elsif ( $language eq "th" ) { $javalanguage = "th_TH"; }
- # elsif ( $language eq "zh-CN" ) { $javalanguage = "zh_CN"; }
- # elsif ( $language eq "zh-TW" ) { $javalanguage = "zh_TW"; }
-
- # languages not defined yet
- # if ( $javalanguage eq "" )
- # {
- # $javalanguage = $language;
- # $javalanguage =~ s/\-/\_/;
- # }
-
$javalanguage = $language;
$javalanguage =~ s/\-/\_/;
diff --git a/solenv/bin/modules/installer/packagelist.pm b/solenv/bin/modules/installer/packagelist.pm
index 64d890a..0079b6f 100644
--- a/solenv/bin/modules/installer/packagelist.pm
+++ b/solenv/bin/modules/installer/packagelist.pm
@@ -85,7 +85,6 @@ sub analyze_list
push(@allmodules, $onegid);
- # get_children($moduleslist, $onegid, \@allmodules);
get_children_with_hash($moduleshash, $onegid, \@allmodules);
$onepackage->{'allmodules'} = \@allmodules;
@@ -180,8 +179,6 @@ sub remove_multiple_modules_packages
my $onepackage = ${$allpackagemodules}[$i];
my $allmodules = $onepackage->{'allmodules'};
- # print "Modules below $onepackage->{'module'}: $#{$allmodules}\n";
-
# Comparing each package, with all following packages. If a
# gid for the module is part of more than one package, it is
# removed if the number of modules in the package is greater
@@ -240,14 +237,6 @@ sub remove_multiple_modules_packages
$onepackage->{'allmodules'} = \@optimizedpackage;
}
-
- # for ( my $i = 0; $i <= $#{$allpackagemodules}; $i++ )
- # {
- # my $onepackage = ${$allpackagemodules}[$i];
- # my $allmodules = $onepackage->{'allmodules'};
- # print "New: Modules below $onepackage->{'module'}: $#{$allmodules}\n";
- # }
-
}
#####################################################################
@@ -652,11 +641,6 @@ sub collectpackages
{
my $modulegid = $onemodule->{'gid'};
- # Only collecting modules with correct language for language packs
-# if ( $installer::globals::languagepack ) { if ( ! ( $modulegid =~ /_$onelanguage\s*$/ )) { next; } }
- # Resetting language, if this is no language pack
-# if ( ! $installer::globals::languagepack ) { $onelanguage = ""; }
-
my $styles = "";
if ( $onemodule->{'Styles'} ) { $styles = $onemodule->{'Styles'}; }
diff --git a/solenv/bin/modules/installer/regmerge.pm b/solenv/bin/modules/installer/regmerge.pm
index cdeb1f9..688fb9e 100644
--- a/solenv/bin/modules/installer/regmerge.pm
+++ b/solenv/bin/modules/installer/regmerge.pm
@@ -315,7 +315,6 @@ sub merge_registration_files
{
$databasegid = ${$databasegids}[$i];
- # my $databasedirname = "starregistryrdb"; <- not unique!
my $databasedirname = $databasegid . "_rdb"; # <- unique!
my $databasedir = installer::systemactions::create_directories($databasedirname, $languagestringref);
push(@installer::globals::removedirs, $databasedir);
diff --git a/solenv/bin/modules/installer/scppatchsoname.pm b/solenv/bin/modules/installer/scppatchsoname.pm
index f542de9..888cfeb 100644
--- a/solenv/bin/modules/installer/scppatchsoname.pm
+++ b/solenv/bin/modules/installer/scppatchsoname.pm
@@ -175,9 +175,6 @@ sub resolving_patchsoname_flag
my $destinationpath = $replacedir . $onefilename;
my $movepath = $destinationpath . ".orig";
- # if (!(-f $destinationpath)) # do nothing if the file already exists
- # {
-
my $copysuccess = installer::systemactions::copy_one_file($sourcepath, $movepath);
if ( $copysuccess )
@@ -197,8 +194,6 @@ sub resolving_patchsoname_flag
}
}
- # }
-
# Saving the original source, where the file was found
$onefile->{'originalsourcepath'} = $onefile->{'sourcepath'};
diff --git a/solenv/bin/modules/installer/scpzipfiles.pm b/solenv/bin/modules/installer/scpzipfiles.pm
index ee59b07..f4e500f 100644
--- a/solenv/bin/modules/installer/scpzipfiles.pm
+++ b/solenv/bin/modules/installer/scpzipfiles.pm
@@ -69,8 +69,6 @@ sub replace_all_ziplistvariables_in_rtffile
{
my ( $fileref, $variablesref, $onelanguage, $loggingdir ) = @_;
- # installer::files::save_file($loggingdir . "license_" . $onelanguage . "_before.rtf", $fileref);
-
for ( my $i = 0; $i <= $#{$fileref}; $i++ )
{
my $line = ${$fileref}[$i];
@@ -96,8 +94,6 @@ sub replace_all_ziplistvariables_in_rtffile
}
}
}
-
- # installer::files::save_file($loggingdir . "license_" . $onelanguage . "_after.rtf", $fileref);
}
#########################################################
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index ee5a8c6..b96b77b 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -809,7 +809,6 @@ sub replace_setup_variables
if ( $localminor =~ /^\s*\w(\d+)\w*\s*$/ ) { $localminor = $1; }
- # $updateid
my $updateid = $productname . "_" . $userdirproductversion . "_" . $$languagestringref;
$updateid =~ s/ /_/g;
@@ -1243,7 +1242,6 @@ sub get_Source_Directory_For_Files_From_Includepathlist
my $oldname = $onefile->{'Name'};
my $oldlanguage = $onefile->{'specificlanguage'};
my $newlanguage = "en-US";
- # $onefile->{'Name'} =~ s/$oldlanguage\./$newlanguage\./; # Example: tplwizfax_it.zip -> tplwizfax_en-US.zip
$onefilename = $onefile->{'Name'};
$onefilename =~ s/$oldlanguage\./$newlanguage\./; # Example: tplwizfax_it.zip -> tplwizfax_en-US.zip
$onefilename =~ s/^\s*\Q$installer::globals::separator\E//; # filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs
@@ -1255,7 +1253,6 @@ sub get_Source_Directory_For_Files_From_Includepathlist
$infoline = "WARNING: Using $onefilename instead of $oldname\n";
push( @installer::globals::logfileinfo, $infoline);
print " $infoline";
- # 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,
# the filename has to be changed to avoid installation conflicts
@@ -2013,18 +2010,14 @@ 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);
- # $onefile->{'Name'} = $filename;
$onefile->{'sourcepath'} = $sourcepath;
$onefile->{'destination'} = $destpath;
}
@@ -2089,7 +2082,6 @@ sub collect_directories_from_filesarray
$directoryhash{'specificlanguage'} = $onefile->{'specificlanguage'};
$directoryhash{'Dir'} = $onefile->{'Dir'};
$directoryhash{'modules'} = $onefile->{'modules'}; # NEW, saving modules
- # NEVER!!! if ( ! $installer::globals::iswindowsbuild ) { $directoryhash{'Styles'} = "(CREATE)"; } # this directories must be created
if ( $onefile->{'Dir'} eq "PREDEFINED_PROGDIR" ) { $predefinedprogdir_added = 1; }
@@ -2114,7 +2106,6 @@ sub collect_directories_from_filesarray
$directoryhash{'specificlanguage'} = $onefile->{'specificlanguage'};
$directoryhash{'Dir'} = $onefile->{'Dir'};
$directoryhash{'modules'} = $onefile->{'modules'}; # NEW, saving modules
- # NEVER!!! if ( ! $installer::globals::iswindowsbuild ) { $directoryhash{'Styles'} = "(CREATE)"; } # this directories must be created
$alldirectoryhash{$destinationpath} = \%directoryhash;
}
@@ -2199,7 +2190,6 @@ sub collect_directories_with_create_flag_from_directoryarray
my %directoryhash = ();
$directoryhash{'HostName'} = $directoryname;
$directoryhash{'specificlanguage'} = $onedir->{'specificlanguage'};
- # $directoryhash{'gid'} = $onedir->{'gid'};
$directoryhash{'Dir'} = $onedir->{'gid'};
$directoryhash{'Styles'} = $onedir->{'Styles'};
@@ -2472,7 +2462,6 @@ sub insert_for_item ($$$)
{
my ($hash, $item, $id) = @_;
- # print STDERR "insert '$id' for '$item'\n";
if (!defined $hash->{$item})
{
my @gids = ();
@@ -2526,7 +2515,6 @@ sub get_string_of_modulegids_for_itemgid
my $haslanguagemodule = 0;
my %foundmodules = ();
- # print STDERR "lookup '" . lc($itemgid) . "'\n";
my $gid_list = $module_lookup_table->{lc($itemgid)};
for my $gid (@{$gid_list})
@@ -2546,8 +2534,6 @@ sub get_string_of_modulegids_for_itemgid
if ( ! $isreallylanguagemodule ) { installer::exiter::exit_program("ERROR: \"$itemgid\" is assigned to modules with flag \"LANGUAGEMODULE\" and also to modules without this flag! Modules: $allmodules", "get_string_of_modulegids_for_itemgid"); }
}
- # print STDERR "get_string_for_itemgid ($itemgid, $itemname) => $allmodules, $haslanguagemodule\n";
-
return ($allmodules, $haslanguagemodule);
}
diff --git a/solenv/bin/modules/installer/servicesfile.pm b/solenv/bin/modules/installer/servicesfile.pm
index c74073e..3069fea 100644
--- a/solenv/bin/modules/installer/servicesfile.pm
+++ b/solenv/bin/modules/installer/servicesfile.pm
@@ -922,26 +922,16 @@ sub create_services_rdb
{
my $registryfile = ${$registryfiles}[$i];
- # my $servicesname = "services.rdb";
my $servicesname = $registryfile->{'Name'}; # not unique!
my $servicesgid = $registryfile->{'gid'}; # unique
my $uniquedirname = $servicesgid . "_servicesrdb";
- # my $uniquedirname = $servicesgid;
my ($nativeservicesurlprefix, $javaservicesurlprefix) = set_url_prefixes($registryfile);
installer::logger::include_header_into_logfile("Creating $servicesname ($servicesgid):");
- # my $servicesdir = installer::systemactions::create_directories($servicesname, $languagestringref);
my $servicesdir = installer::systemactions::create_directories($uniquedirname, $languagestringref);
-# if ( $^O =~ /cygwin/i )
-# { # $servicesdir is used as a parameter for regcomp and has to be DOS style
-# $servicesdir = qx{cygpath -d "$servicesdir"};
-# chomp($servicesdir);
-# $servicesdir =~ s/\\/\//g;
-# }
-
push(@installer::globals::removedirs, $servicesdir);
my $servicesfile = $servicesdir . $installer::globals::separator . $servicesname;
@@ -949,8 +939,6 @@ sub create_services_rdb
# If there is an older version of this file, it has to be removed
if ( -f $servicesfile ) { unlink($servicesfile); }
- # if ((-f $servicesfile) && (!($installer::globals::services_rdb_created))) { $installer::globals::services_rdb_created = 1; }
- # if ((!($installer::globals::services_rdb_created)) && $installer::globals::servicesrdb_can_be_created ) # This has to be done once
if ( $installer::globals::servicesrdb_can_be_created ) # This has to be done always
{
# Creating the services.rdb in directory "inprogress"
@@ -1009,7 +997,6 @@ sub create_services_rdb
# and now iteration over all files
- # my $error_during_registration = register_all_components($filesarrayref, $regcompfileref, $servicesfile, $regcomprdb, $includepatharrayref);
my $error_during_registration = register_all_components($allvariableshashref, $servicesgid, $unocomponentfiles, $regcompfileref, $servicesfile, $regcomprdb, $includepatharrayref, $nativeservicesurlprefix, $javaservicesurlprefix);
if (defined $var_library_path) {
@@ -1061,7 +1048,6 @@ sub create_services_rdb
# Adding the new services file source path to the filearray
$registryfile->{'sourcepath'} = $servicesfile; # setting the sourcepath!
- # add_services_sourcepath_into_filearray( $filesarrayref, $servicesfile, $servicesname );
}
}
diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm
index b221051..73f1660 100644
--- a/solenv/bin/modules/installer/setupscript.pm
+++ b/solenv/bin/modules/installer/setupscript.pm
@@ -162,23 +162,17 @@ sub add_lowercase_productname_setupscriptvariable
push(@{$variablesref} ,$newline);
$value = $original;
$value =~ s/\s/\_/g;
- # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; }
$newline = "\%UNIXPRODUCTNAME " . lc($value) . "\n";
push(@{$variablesref} ,$newline);
$newline = "\%SYSTEMINTUNIXPACKAGENAME " . lc($value) . "\n";
push(@{$variablesref} ,$newline);
- # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; }
- # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $2 . $4; }
$newline = "\%UNIXPACKAGENAME " . lc($value) . "\n";
push(@{$variablesref} ,$newline);
$value = $original;
$value =~ s/\s/\_/g;
$value =~ s/\.//g;
- # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; }
$newline = "\%WITHOUTDOTUNIXPRODUCTNAME " . lc($value) . "\n";
push(@{$variablesref} ,$newline);
- # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; }
- # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $2 . $4; }
$newline = "\%WITHOUTDOTUNIXPACKAGENAME " . lc($value) . "\n";
push(@{$variablesref} ,$newline);
$newline = "\%SOLARISBRANDPACKAGENAME " . lc($value) . "\n";
@@ -292,7 +286,6 @@ sub replace_all_setupscriptvariables_in_script
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";
}
}
@@ -521,10 +514,6 @@ sub replace_preset_properties
my @presetproperties = ();
push(@presetproperties, "SOLARISBRANDPACKAGENAME");
push(@presetproperties, "SYSTEMINTUNIXPACKAGENAME");
- # push(@presetproperties, "UNIXPACKAGENAME");
- # push(@presetproperties, "WITHOUTDOTUNIXPACKAGENAME");
- # push(@presetproperties, "UNIXPRODUCTNAME");
- # push(@presetproperties, "WITHOUTDOTUNIXPRODUCTNAME");
foreach $property ( @presetproperties )
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 668146c..3157ab8 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -27,7 +27,6 @@
package installer::simplepackage;
-# use Archive::Zip qw( :ERROR_CODES :CONSTANTS );
use Cwd;
use File::Copy;
use installer::download;
@@ -192,9 +191,6 @@ sub register_extensions
sub get_mac_translation_file
{
my $translationfilename = $installer::globals::maclangpackfilename;
- # my $translationfilename = $installer::globals::idtlanguagepath . $installer::globals::separator . $installer::globals::maclangpackfilename;
- # if ( $installer::globals::unicodensis ) { $translationfilename = $translationfilename . ".uulf"; }
- # else { $translationfilename = $translationfilename . ".mlf"; }
if ( ! -f $translationfilename ) { installer::exiter::exit_program("ERROR: Could not find language file $translationfilename!", "get_mac_translation_file"); }
my $translationfile = installer::files::read_file($translationfilename);
@@ -306,8 +302,6 @@ sub localize_scriptfile
{
my ($scriptfile, $translationfile, $languagestringref) = @_;
- # my $translationfile = get_mac_translation_file();
-
my $onelanguage = $$languagestringref;
if ( $onelanguage =~ /^\s*(.*?)_/ ) { $onelanguage = $1; }
diff --git a/solenv/bin/modules/installer/substfilenamefiles.pm b/solenv/bin/modules/installer/substfilenamefiles.pm
index 24a4567..7390a4c 100644
--- a/solenv/bin/modules/installer/substfilenamefiles.pm
+++ b/solenv/bin/modules/installer/substfilenamefiles.pm
@@ -82,7 +82,6 @@ sub resolving_subst_filename_flag
my $sourcepath = $onefile->{'sourcepath'};
- # if ( $onefilename =~ /^\s*\Q$installer::globals::separator\E/ ) # filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs
if ( $onefilename =~ /\Q$installer::globals::separator\E/ ) # filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs
{
$onefilename =~ s/^\s*\Q$installer::globals::separator\E//;
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index 626af7f..8007a34 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -307,7 +307,6 @@ sub create_directories
{
my $number_of_languages = get_number_of_langs($languagestring);
chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`);
- # $languagestring = $shorter;
my $id = substr($shorter, 0, 8); # taking only the first 8 digits
$languagestring = "lang_" . $number_of_languages . "_id_" . $id;
}
@@ -1100,8 +1099,6 @@ sub rename_directory
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;
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index 7252c76..0e327a7 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -184,17 +184,6 @@ sub make_checksum_file
my $checksumfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$installer::globals::checksumfile, $includepatharrayref, 1);
if ( $$checksumfileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $installer::globals::checksumfile !", "make_checksum_file"); }
-# # very slow on Windows
-# for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-# {
-# my $onefile = ${$filesref}[$i];
-# my $systemcall = "$$checksumfileref $onefile->{'sourcepath'} |";
-# open (CHECK, "$systemcall");
-# my $localchecksum = <CHECK>;
-# close (CHECK);
-# push(@checksum, $localchecksum);
-# }
-
my $systemcall = "$$checksumfileref";
for ( my $i = 0; $i <= $#{$filesref}; $i++ )
@@ -773,7 +762,6 @@ sub install_simple ($$$$$$)
if ((!($dir =~ /\bPREDEFINED_/ )) || ( $dir =~ /\bPREDEFINED_PROGDIR\b/ ))
{
- # printf "mkdir $destdir$onedir->{'HostName'}\n";
mkdir $destdir . $onedir->{'HostName'};
push @lines, "%dir " . $onedir->{'HostName'} . "\n";
}
@@ -793,13 +781,10 @@ sub install_simple ($$$$$$)
$sourcepath =~ s/\$\$/\$/;
push @lines, "$destination\n";
- # printf "cp $sourcepath $destdir$destination\n";
if(-d "$destdir$destination"){
- #printf "Deleting already present Directory $destdir$destination from previous builds\n";
rmtree("$destdir$destination");
}
if(-e "$destdir$destination") {
- #printf "Deleting already present file $destdir$destination from previous builds\n";
unlink "$destdir$destination";
}
@@ -816,9 +801,7 @@ sub install_simple ($$$$$$)
my $destination = $onelink->{'destination'};
my $destinationfile = $onelink->{'destinationfile'};
- # print "link $destinationfile -> $destdir$destination\n";
if(-e "$destdir$destination") {
- #printf "Deleting already present symlink $destdir$destination from previous builds\n";
unlink "$destdir$destination";
}
symlink ("$destinationfile", "$destdir$destination") || die "Can't create symlink: $!";
@@ -831,7 +814,6 @@ sub install_simple ($$$$$$)
my $target = $onelink->{'Target'};
my $destination = $onelink->{'destination'};
- # print "Unix link $target -> $destdir$destination\n";
`ln -sf '$target' '$destdir$destination'`;
push @lines, "$destination\n";
}
@@ -1504,7 +1486,6 @@ sub reorg_patchfile
for ( my $j = 0; $j <= $#{$patchfiles}; $j++ )
{
- # "\tXXXXX\t" . $olddestination . "\n";
if ( ${$patchfiles}[$j] =~ /^\s*(.*?)\s*\tXXXXX\t\Q$directory\E\s*$/ )
{
$line = $1 . "\n";
@@ -1638,7 +1619,6 @@ sub prepare_windows_patchfiles
my $patchfilename2 = "patchmsi.dll";
if ( ! $allvariableshashref->{'WINDOWSPATCHLEVEL'} ) { installer::exiter::exit_program("ERROR: No Windows patch level defined in list file (WINDOWSPATCHLEVEL) !", "prepare_windows_patchfiles"); }
- # my $windowspatchlevel = $allvariableshashref->{'WINDOWSPATCHLEVEL'};
my $windowspatchlevel = $installer::globals::buildid;
# the environment variable CWS_WORK_STAMP is set only in CWS
@@ -1714,9 +1694,6 @@ sub prepare_windows_patchfiles
$infoline = "Size of patch file list: $filesize\n\n";
push( @installer::globals::logfileinfo, $infoline);
installer::logger::print_message( "... size of patch list file: $filesize Byte ... \n" );
-
- # Win 98: Maximum size of ini file is 65 kB
- # if ( $filesize > 64000 ) { installer::exiter::exit_program("ERROR: Maximum size of patch file list is 65 kB (Win98), now reached: $filesize Byte !", "prepare_windows_patchfiles"); }
}
}
@@ -1955,8 +1932,6 @@ sub copy_all_packages
{
my $destinationdir = $destdir . $installer::globals::separator . $packagename;
if ( ! -d $onepackage ) { installer::exiter::exit_program("ERROR: Could not find Solaris package $onepackage!", "copy_all_packages"); }
- # installer::systemactions::hardlink_complete_directory($onepackage, $destinationdir);
- # installer::systemactions::copy_complete_directory($onepackage, $destinationdir);
my $systemcall = "cp -p -R $onepackage $destinationdir";
make_systemcall($systemcall);
@@ -2121,8 +2096,6 @@ sub check_jds_language
my $infoline = "";
- # languagesarrayref and $allvariableshashref->{'JDSLANG'}
-
if ( ! $allvariableshashref->{'JDSLANG'} ) { installer::exiter::exit_program("ERROR: For building JDS installation sets \"JDSLANG\" must be defined!", "check_jds_language"); }
my $languagestring = $allvariableshashref->{'JDSLANG'};
@@ -2285,7 +2258,6 @@ sub get_platform_name
}
else
{
- # $platformname = $installer::globals::packageformat;
$platformname = $installer::globals::compiler;
}
@@ -2381,7 +2353,6 @@ sub collect_all_files_from_includepathes
my @sourcefiles = ();
my $pathstring = "";
- # installer::systemactions::read_complete_directory($includepath, $pathstring, \@sourcefiles);
installer::systemactions::read_full_directory($includepath, $pathstring, \@sourcefiles);
if ( ! ( $#sourcefiles > -1 ))
@@ -2436,9 +2407,6 @@ sub find_file_by_id
}
}
- # It does not need to exist. For example products that do not contain the libraries.
- # if (! $foundfile ) { installer::exiter::exit_program("ERROR: No unique file name found for $filename !", "get_selfreg_file"); }
-
if (! $foundfile ) { $onefile = ""; }
return $onefile;
@@ -2986,7 +2954,6 @@ sub resolving_hidden_flag
if ( $copysuccess )
{
- # $onefile->{'Name'} = $newfilename;
$onefile->{'sourcepath'} = $destfile;
$destination = $onefile->{'destination'};
installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination);
@@ -3144,7 +3111,6 @@ sub put_license_into_setup
# find and read english license file
my $licenselanguage = "en-US"; # always english !
- # my $licensefilename = "LICENSE_" . $licenselanguage;
my $licensefilename = "license_" . $licenselanguage . ".txt";
my $licenseincludepatharrayref = get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
@@ -3196,7 +3162,6 @@ sub tar_package
if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . $getuidlibrary; }
my $systemcall = "cd $installdir; $ldpreloadstring tar -cf - $packagename > $tarfilename";
- # my $systemcall = "cd $installdir; $ldpreloadstring tar -cf - * > $tarfilename";
my $returnvalue = system($systemcall);
@@ -3262,32 +3227,12 @@ sub shuffle_array
{
my ( $arrayref ) = @_;
- # my $counter = 0;
- # my $infoline = "Old package order: \n";
- # push( @installer::globals::logfileinfo, $infoline);
- # foreach my $onepackage ( @{$arrayref} )
- # {
- # $counter++;
- # $infoline = "$counter: $onepackage->{'module'}\n";
- # push( @installer::globals::logfileinfo, $infoline);
- # }
-
my $i = @$arrayref;
while (--$i)
{
my $j = int rand ($i+1);
@$arrayref[$i,$j] = @$arrayref[$j,$i];
}
-
- # $counter = 0;
- # $infoline = "New package order: \n";
- # push( @installer::globals::logfileinfo, $infoline);
- # foreach my $onepackage ( @{$arrayref} )
- # {
- # $counter++;
- # $infoline = "$counter: $onepackage->{'module'}\n";
- # push( @installer::globals::logfileinfo, $infoline);
- # }
}
################################################
@@ -3437,7 +3382,6 @@ sub collectpackagemaps
# Create a tar gz file with all package maps
my $tarfilename = $subdirname . ".tar";
my $targzname = $tarfilename . ".gz";
- # my $systemcall = "cd $pkgmapdir; tar -cf - $subdirname > $tarfilename";
$systemcall = "cd $pkgmapdir; tar -cf - $subdirname | gzip > $targzname";
make_systemcall($systemcall);
installer::systemactions::remove_complete_directory($pkgmapsubdir, 1);
diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm
index 975ff0d..8b0df5d 100644
--- a/solenv/bin/modules/installer/xpdinstaller.pm
+++ b/solenv/bin/modules/installer/xpdinstaller.pm
@@ -109,8 +109,6 @@ sub get_module
$found = 1;
last;
}
-
- # if ( ! $found ) { installer::exiter::exit_program("ERROR: Could not find module belonging to gid $modulegid!", "get_module (xpdinstaller)"); }
}
return $searchmodule;
@@ -581,7 +579,6 @@ sub get_size_value
if (( $installer::globals::isrpmbuild ) && ( $isrpmfile ))
{
- # if ( ! $installer::globals::rpmquerycommand ) { installer::exiter::exit_program("ERROR: rpm not found for querying packages!", "get_size_value"); }
if ( ! $installer::globals::rpmquerycommand ) { $installer::globals::rpmquerycommand = "rpm"; }
my $systemcall = "$installer::globals::rpmquerycommand -qp --queryformat \"\[\%\{FILESIZES\}\\n\]\" $packagename 2\>\&1 |";
@@ -720,7 +717,6 @@ sub get_fullpkgname_value
return $value;
}
- # if ( ! $installer::globals::rpmquerycommand ) { installer::exiter::exit_program("ERROR: rpm not found for querying packages!", "get_fullpkgname_value"); }
if ( ! $installer::globals::rpmquerycommand ) { $installer::globals::rpmquerycommand = "rpm"; }
my $systemcall = "$installer::globals::rpmquerycommand -qp $packagename |";
my $ld_library_backup = $ENV{LD_LIBRARY_PATH};
@@ -1076,7 +1072,6 @@ sub set_productdir_tag
if ( $allvariables->{"BRANDPACKAGEVERSION"} )
{
$productdir = $productdir . $allvariables->{"BRANDPACKAGEVERSION"};
-# if ( $allvariables->{"LCPRODUCTEXTENSION"} ) { $productdir = $productdir . $allvariables->{"LCPRODUCTEXTENSION"}; }
}
else
{
@@ -1487,7 +1482,6 @@ sub create_emptyparents_xpd_file
push(@installer::globals::logfileinfo, $infoline);
}
- # push(@installer::globals::emptyxpdparents, $parentgid);
push( @installer::globals::createdxpdfiles, $parentgid);
return $grandpagid;
@@ -1558,7 +1552,6 @@ sub create_xpd_file
my $xpddir = installer::systemactions::create_directories("xpdinstaller", $languagestringref);
$xpddir =~ s/\/\s*$//;
$installer::globals::xpddir = $xpddir;
- # push(@installer::globals::removedirs, $xpddir);
my $modulegid = $onepackage->{'module'};
@@ -1616,7 +1609,6 @@ sub create_xpd_file
{
my $create_missing_parent = is_empty_parent($parentgid, $allpackages);
- # if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($parentgid, \@installer::globals::emptyxpdparents) ))
if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($parentgid, \@installer::globals::createdxpdfiles) ))
{
$grandpagid = create_emptyparents_xpd_file($parentgid, $modulesarrayref, $xpddir);
@@ -1627,7 +1619,6 @@ sub create_xpd_file
{
my $create_missing_parent = is_empty_parent($grandpagid, $allpackages);
- # if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($parentgid, \@installer::globals::emptyxpdparents) ))
if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($grandpagid, \@installer::globals::createdxpdfiles) ))
{
create_emptyparents_xpd_file($grandpagid, $modulesarrayref, $xpddir);
@@ -1671,7 +1662,6 @@ sub create_xpd_file_for_childproject
if ( $parentgid ne "root" )
{
- # my $create_missing_parent = is_empty_parent($parentgid, $allpackages);
my $create_missing_parent = 1; # -> Always missing parent by child projects!
# Parent is now created, if it was not created before. Attention: Parent module must not come later.
if (( $create_missing_parent ) && ( ! installer::existence::exists_in_array($parentgid, \@installer::globals::createdxpdfiles) ))
@@ -1698,8 +1688,6 @@ sub create_xpd_file_for_systemintegration
{
my $newpackagename = ${$newcontent}[$i];
- # installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$newpackagename);
-
my $infoline = "Creating xpd file for package: $newpackagename\n";
push( @installer::globals::logfileinfo, $infoline);
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index fdbb3a9..d487389 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -490,7 +490,6 @@ sub replace_minor_in_pathes
my $line = ${$patharrayref}[$i];
if ( ! defined $ENV{CWS_WORK_STAMP} and defined $ENV{UPDMINOR} )
-# if ( $installer::globals::minor )
{
$line =~ s/\{minor\}/$installer::globals::minor/g;
# no difference for minor and minornonpre (ToDo ?)
More information about the Libreoffice-commits
mailing list