[Libreoffice-commits] .: 3 commits - solenv/bin
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sun Aug 28 14:42:00 PDT 2011
solenv/bin/modules/installer/converter.pm | 25 --------
solenv/bin/modules/installer/download.pm | 68 -----------------------
solenv/bin/modules/installer/downloadsigner.pm | 18 ------
solenv/bin/modules/installer/existence.pm | 50 ----------------
solenv/bin/modules/installer/windows/registry.pm | 3 -
5 files changed, 164 deletions(-)
New commits:
commit 33a9d32107d35f8995caa2f6182427202fec17da
Author: Jordan Ayers <jordan.ayers at gmail.com>
Date: Sun Aug 28 12:41:53 2011 -0500
Remove unused perl function.
Remove installer::download::create_tar_gz_file_from_package, which has not been used
since the integration of CWS rt30_DEV300 in 2008.
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index a21fdad..c647740 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -344,74 +344,6 @@ sub tar_package
}
#########################################################
-# Creating a tar.gz file
-#########################################################
-
-sub create_tar_gz_file_from_package
-{
- my ($installdir, $getuidlibrary) = @_;
-
- my $infoline = "";
- my $alldirs = installer::systemactions::get_all_directories($installdir);
- my $onedir = ${$alldirs}[0];
- $installdir = $onedir;
-
- my $allfiles = installer::systemactions::get_all_files_from_one_directory($installdir);
-
- for ( my $i = 0; $i <= $#{$allfiles}; $i++ )
- {
- my $onefile = ${$allfiles}[$i];
- my $systemcall = "cd $installdir; rm $onefile";
- my $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);
- }
- }
-
- $alldirs = installer::systemactions::get_all_directories($installdir);
- $packagename = ${$alldirs}[0]; # only taking the first Solaris package
- if ( $packagename eq "" ) { installer::exiter::exit_program("ERROR: Could not find package in directory $installdir!", "determine_packagename"); }
-
- installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$packagename);
-
- $installer::globals::downloadfileextension = ".tar.gz";
- my $targzname = $packagename . $installer::globals::downloadfileextension;
- $installer::globals::downloadfilename = $targzname;
- my $ldpreloadstring = "";
- if ( $getuidlibrary ne "" ) { $ldpreloadstring = "LD_PRELOAD=" . $getuidlibrary; }
-
- $systemcall = "cd $installdir; $ldpreloadstring tar -cf - $packagename | gzip > $targzname";
- print "... $systemcall ...\n";
-
- my $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);
- }
-}
-
-#########################################################
# Setting type of installation
#########################################################
commit f64ca4c4273c2c281519020e1af7c70fe1d4cee2
Author: Jordan Ayers <jordan.ayers at gmail.com>
Date: Sun Aug 28 12:20:45 2011 -0500
Perl cleanup: Remove unused local variable.
Remove an unused style copy per registry entry that was added to
installer::windows::registry::add_userregs_to_registry_table()
as part of the integration of CWS jl67.
diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
index ad03686..4846580 100644
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@ -342,9 +342,6 @@ sub add_userregs_to_registry_table
{
my $onefile = $installer::globals::userregistrycollector[$i];
- my $styles = "";
- if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-
my %registry = ();
$registry{'Registry'} = $onefile->{'userregkeypath'};
commit a73b9fc0e2cccc240cadf40d6566fa15c46f70b7
Author: Jordan Ayers <jordan.ayers at gmail.com>
Date: Wed Aug 24 21:55:08 2011 -0500
Remove some unused perl functions.
Added in CWS nativefixer5, but never used:
installer::existence::filename_exists_in_filesarray
installer::existence::filegid_exists_in_filesarray
Added in CWS native222, but never used:
installer::downloadsigner::logfollowmeinfohash
Added in CWS newscpzip2, but never used:
installer::converter::convert_hash_into_array
Added in 2004, used for a month, then dropped from usage:
installer::converter::get_number_from_directory
diff --git a/solenv/bin/modules/installer/converter.pm b/solenv/bin/modules/installer/converter.pm
index 53eb108..2fe728b 100644
--- a/solenv/bin/modules/installer/converter.pm
+++ b/solenv/bin/modules/installer/converter.pm
@@ -48,13 +48,6 @@ sub convert_array_to_hash
return \%newhash;
}
-sub convert_hash_into_array
-{
- my ($hashref) = @_;
-
- return [map { "$_ = $hashref->{$_}\n" } keys %{$hashref}];
-}
-
#############################################################################
# Converting a string list with separator $listseparator
# into an array
@@ -217,24 +210,6 @@ sub combine_arrays_from_references_first_win
}
#################################################################
-# Returning the current ending number of a directory
-#################################################################
-
-sub get_number_from_directory
-{
- my ( $directory ) = @_;
-
- my $number = 0;
-
- if ( $directory =~ /\_(\d+)\s*$/ )
- {
- $number = $1;
- }
-
- return $number;
-}
-
-#################################################################
# Replacing separators, that are included into quotes
#################################################################
diff --git a/solenv/bin/modules/installer/downloadsigner.pm b/solenv/bin/modules/installer/downloadsigner.pm
index 8a63242..d3af898 100644
--- a/solenv/bin/modules/installer/downloadsigner.pm
+++ b/solenv/bin/modules/installer/downloadsigner.pm
@@ -544,24 +544,6 @@ sub createproductlist
return \@infofilelist;
}
-#############################################
-# Logging the content of the download hash
-#############################################
-
-sub logfollowmeinfohash
-{
- my ( $followmehash ) = @_;
-
- print "\n*****************************************\n";
- print "Content of follow-me info file:\n";
- print "finalinstalldir: $followmehash->{'finalinstalldir'}\n";
- print "downloadname: $followmehash->{'downloadname'}\n";
- print "languagestring: $followmehash->{'languagestring'}\n";
- foreach my $lang ( @{$followmehash->{'languagesarray'}} ) { print "languagesarray: $lang\n"; }
- foreach my $path ( @{$followmehash->{'includepatharray'}} ) { print "includepatharray: $path"; }
- foreach my $key ( sort keys %{$followmehash->{'allvariableshash'}} ) { print "allvariableshash: $key : $followmehash->{'allvariableshash'}->{$key}\n"; }
-}
-
########################################################################
# Renaming the follow me info file, if it was successfully used.
# This can only be done, if the parameter "-d" was used with a
diff --git a/solenv/bin/modules/installer/existence.pm b/solenv/bin/modules/installer/existence.pm
index 1ecf9ce..1f362f7 100644
--- a/solenv/bin/modules/installer/existence.pm
+++ b/solenv/bin/modules/installer/existence.pm
@@ -137,54 +137,4 @@ sub get_specified_file_by_name
return $onefile;
}
-#####################################################################
-# Checking existence of a specific file, defined by its "Name"
-#####################################################################
-
-sub filename_exists_in_filesarray
-{
- my ($filesarrayref, $searchname) = @_;
-
- my $foundfile = 0;
-
- for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
- {
- my $onefile = ${$filesarrayref}[$i];
- my $filename = $onefile->{'Name'};
-
- if ( $filename eq $searchname )
- {
- $foundfile = 1;
- last;
- }
- }
-
- return $foundfile;
-}
-
-#####################################################################
-# Checking existence of a specific file, defined by its "gid"
-#####################################################################
-
-sub filegid_exists_in_filesarray
-{
- my ($filesarrayref, $searchgid) = @_;
-
- my $foundfile = 0;
-
- for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
- {
- my $onefile = ${$filesarrayref}[$i];
- my $filegid = $onefile->{'gid'};
-
- if ( $filegid eq $searchgid )
- {
- $foundfile = 1;
- last;
- }
- }
-
- return $foundfile;
-}
-
1;
More information about the Libreoffice-commits
mailing list