[Libreoffice-commits] .: solenv/bin
Tim Retout
timretout at kemper.freedesktop.org
Thu Aug 16 00:23:45 PDT 2012
solenv/bin/make_installer.pl | 1
solenv/bin/modules/installer/environment.pm | 1
solenv/bin/modules/installer/epmfile.pm | 4
solenv/bin/modules/installer/globals.pm | 89 ----------------------
solenv/bin/modules/installer/parameter.pm | 24 -----
solenv/bin/modules/installer/windows/directory.pm | 2
solenv/bin/modules/par2script/globals.pm | 7 -
solenv/bin/modules/pre2par/globals.pm | 8 -
8 files changed, 136 deletions(-)
New commits:
commit e327840a6d41d8d68e5b5157c944d2acbd3232b0
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Aug 15 15:27:09 2012 +0200
installer: remove unused globals
Change-Id: I521e2c816b3dbc4aba1770e5a3b5eb47d5542ac1
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 91e8ca6..57dedc3 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -517,7 +517,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
{
my $languagesarrayref = installer::languages::get_all_languages_for_one_product($installer::globals::languageproducts[$n], $allvariableshashref);
- $installer::globals::alllanguagesinproductarrayref = $languagesarrayref;
my $languagestringref = installer::languages::get_language_string($languagesarrayref);
installer::logger::print_message( "------------------------------------\n" );
installer::logger::print_message( "... languages $$languagestringref ... \n" );
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index 5459761..b0c541b 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -122,7 +122,6 @@ sub set_global_environment_variables
if ( $ENV{'LOCALUNPACKDIR'} ) { $installer::globals::localunpackdir = $ENV{'LOCALUNPACKDIR'}; }
if ( $ENV{'MAX_LANG_LENGTH'} ) { $installer::globals::max_lang_length = $ENV{'MAX_LANG_LENGTH'}; }
- if ( $ENV{'SOLAR_JAVA'} ) { $installer::globals::solarjavaset = 1; }
if ( $ENV{'RPM'} ) { $installer::globals::rpm = $ENV{'RPM'}; }
if ( $ENV{'DONTCOMPRESS'} ) { $installer::globals::solarisdontcompress = 1; }
if ( $ENV{'IGNORE_ERROR_IN_LOGFILE'} ) { $installer::globals::ignore_error_in_logfile = 1; }
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 1ea9572..bc50aeb 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2360,10 +2360,6 @@ sub create_packages_without_epm
my $rpmcommand = $installer::globals::rpm;
my $rpmversion = determine_rpm_version();
- # saving globally for later usage
- $installer::globals::rpmcommand = $rpmcommand;
- $installer::globals::rpmquerycommand = "rpm";
-
my $target = "";
if ( $installer::globals::compiler =~ /unxlngi/) { $target = "i586"; }
elsif ( $installer::globals::compiler =~ /unxaigppc/) { $target = "ppc"; }
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 7b5876f..6a2bc77 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -108,7 +108,6 @@ BEGIN
$languagelist = "";
$added_english = 0;
$set_office_start_language = 0;
- $solarjavaset = 0;
$destdir = "";
$rootpath = "";
@@ -124,19 +123,10 @@ BEGIN
$dounzip = 1;
$languages_defined_in_productlist = 0;
$setupscript_defined_in_productlist = 0;
- $islinux = 0;
- $issolaris = 0;
- $ismacosx = 0;
$iswindowsbuild = 0;
$islinuxbuild = 0;
$isrpmbuild = 0;
$isdebbuild = 0;
- $islinuxintelrpmbuild = 0;
- $islinuxppcrpmbuild = 0;
- $islinuxinteldebbuild = 0;
- $islinuxppcdebbuild = 0;
- $islinuxx86_64rpmbuild = 0;
- $islinuxx86_64debbuild = 0;
$issolarisbuild = 0;
$issolarispkgbuild = 0;
$issolarissparcbuild = 0;
@@ -149,13 +139,11 @@ BEGIN
$idttemplatepath = "";
$idtlanguagepath = "";
$buildid = "Not set";
- $guidcounter = 1000; # for uniqueness of guids
$fontsfolder = "FontsFolder";
$fontsfoldername = "Fonts";
$fontsdirparent = "";
$fontsdirname = "";
$fontsdirhostname = "truetype";
- $officefolder = "OfficeFolder";
$officemenufolder = "OfficeMenuFolder";
$startupfolder = "StartupFolder";
$startmenufolder = "StartMenuFolder";
@@ -180,12 +168,10 @@ BEGIN
$packagerevision = 1;
$rpm = "";
$rpmcommand = "";
- $rpmquerycommand = "";
$rpminfologged = 0;
$debian = "";
$installertypedir = "";
$controlledmakecabversion = "5";
- $saved_packages_path = "";
$max_lang_length = 50;
$globalblock = "Globals";
$rootmodulegid = "";
@@ -206,11 +192,6 @@ BEGIN
$packageformat = "";
$packagename = "";
$packagelist = "";
- $addpackagelist = "";
- $is_unix_multi = 0;
- $unixmultipath = "";
- $unixmultipath_orig = "";
- $alllanguagesinproductarrayref = "";
$shiptestdirectory = "";
$makelinuxlinkrpm = 0;
$linuxlinkrpmprocess = 0;
@@ -245,17 +226,8 @@ BEGIN
$exitlog = "";
$globalinfo_copied = 0;
$quiet = 0;
- $nodownload = 0;
- $writetotemp = 0;
- $useminor = 0;
- $followme_from_directory = 0;
- $internal_cabinet_signing = 0;
-
- $checksumfilename = "checksum.txt";
$ismultilingual = 0;
- @multilanguagemodules = ();
- $languagemodulesbase = "gid_Module_Root_";
%alluniquefilenames = ();
%alllcuniquefilenames = ();
%uniquefilenamesequence = ();
@@ -268,16 +240,8 @@ BEGIN
$upgradecode = "";
$msiproductversion = "";
$msimajorproductversion = "";
- $created_new_component_guid = 0;
@allddffiles = ();
$infodirectory = "";
- @currentcontent = ();
- @installsetcontent = ();
- $signfiles_checked = 0;
- $dosign = 0;
- $pwfile = "";
- $pwfile = "";
- $pfxfile = "";
%mergemodules = ();
%merge_media_line = ();
@@ -291,27 +255,20 @@ BEGIN
$defaultlanguage = "";
$javalanguagepath = "";
- $javasettozero = 0;
$addlicensefile = 1;
$addsystemintegration = 0;
- $added_directories = 0;
$makedownload = 1;
@installsetfiles = ();
@binarytableonlyfiles = ();
@allscpactions = ();
$languagepackaddon = "LanguagePack";
- $helppackaddon = "HelpPack";
$patchaddon = "Patch";
$ooodownloadfilename = "";
$downloadfilename = "";
$downloadfileextension = "";
- $followmeinfofilename = "";
- $oooversionstring = "";
$shellnewfilesadded = 0;
%multilingual_only_modules = ();
%application_modules = ();
- $defaultinstallorder = 1000;
- $defaultsystemintinstallorder = 1200;
$is_copy_only_project = 0;
$is_simple_packager_project = 0;
@@ -324,23 +281,10 @@ BEGIN
$patchincludepath = "";
$refresh_includepaths = 0;
$include_paths_read = 0;
- $patchfilelistname = "patchfilelist.txt";
@patchfilecollector = ();
$nopatchfilecollector = "";
@userregistrycollector = ();
$addeduserregitrykeys = 0;
- %createpackages = ();
- $newpcfcontentcalculated = 0;
- $sessionid = 0;
- $sessionidset = 0;
- $savelockfilecontent = "";
- $savelockfilename = "";
- $getuidpath = "";
- $getuidpathset = 0;
- $newpcfcontent = "";
- %pcfdifflist = ();
- @pcfdiffcomment = ();
- @epmdifflist = ();
$desktoplinkexists = 0;
$analyze_spellcheckerlanguage = 0;
%spellcheckerlanguagehash = ();
@@ -353,30 +297,17 @@ BEGIN
%allregistrycomponents_ = ();
%allregistrycomponents_in_this_database_ = ();
%allshortregistrycomponents = ();
- %allregistryidentifier = ();
$installlocationdirectory = "";
$installlocationdirectoryset = 0;
$vendordirectory = "";
- $vendordirectoryset = 0;
$officeinstalldirectory = "";
- $officeinstalldirectoryset = 0;
- $basisinstalldirectory = "";
- $basisinstalldirectoryset = 0;
- $ureinstalldirectory = "";
- $ureinstalldirectoryset = 0;
$rootbrandpackage = "";
$rootbrandpackageset = 0;
$officedirhostname = "";
- $basisdirhostname = "";
- $uredirhostname = "";
$officedirgid = "";
- $basisdirgid = "";
- $uredirgid = "";
- %sign_extensions = ("dll" => "1", "exe" => "1", "cab" => "1");
%treestyles = ();
- %installlocations = ("INSTALLLOCATION" => "1");
%treelayername = ();
%hostnametreestyles = ();
%treeconditions = ();
@@ -393,7 +324,6 @@ BEGIN
$msidatabasename = "";
$prepare_winpatch = 0;
$previous_idt_dir = "";
- $updatepack = 0;
$msitranpath = "";
$insert_file_at_end = 0;
$newfilesexist = 0;
@@ -448,17 +378,14 @@ BEGIN
@removedirs = ();
@removefiletable = ();
@emptypackages = ();
- %fontpackageexists = ();
$plat = $^O;
if ( $plat =~ /cygwin/i )
{
$zippath = "zip"; # Has to be in the path: /usr/bin/zip
- $checksumfile = "so_checksum";
$separator = "/";
$pathseparator = "\:";
- $libextension = "\.dll";
$isunix = 0;
$iswin = 1;
$archiveformat = ".zip";
@@ -470,29 +397,13 @@ BEGIN
else
{
$zippath = "zip"; # Has to be in the path: /usr/bin/zip
- $checksumfile = "so_checksum";
$separator = "/";
$pathseparator = "\:";
- if ( $plat =~ /darwin/i )
- {
- $libextension = "\.dylib";
- }
- else
- {
- $libextension = "\.so";
- }
$archiveformat = ".tar.gz";
$isunix = 1;
$iswin = 0;
}
- if ( $plat =~ /linux/i ) { $islinux = 1; }
- if ( $plat =~ /kfreebsd/i ) { $islinux = 1; }
- if ( $plat =~ /solaris/i ) { $issolaris = 1; }
- if ( $plat =~ /darwin/i ) { $ismacosx = 1; }
-
- # ToDo: Needs to be expanded for additional platforms
-
}
1;
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index b7b7c3b..c3469b7 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -323,18 +323,6 @@ sub setglobalvariables
{
$installer::globals::isrpmbuild = 1;
$installer::globals::epmoutpath = "RPMS";
- if ( $installer::globals::compiler =~ /unxlngi/ )
- {
- $installer::globals::islinuxintelrpmbuild = 1;
- }
- if ( $installer::globals::compiler =~ /unxlngppc/ )
- {
- $installer::globals::islinuxppcrpmbuild = 1;
- }
- if ( $installer::globals::compiler =~ /unxlngx/ )
- {
- $installer::globals::islinuxx86_64rpmbuild = 1;
- }
if ( $installer::globals::rpm eq "" ) { installer::exiter::exit_program("ERROR: Environment variable \"\$RPM\" has to be defined!", "setglobalvariables"); }
}
@@ -350,18 +338,6 @@ sub setglobalvariables
$installer::globals::isrpmbuild = 0;
$installer::globals::isdebbuild = 1;
$installer::globals::epmoutpath = "DEBS";
- if ( $installer::globals::compiler =~ /unxlngi/ )
- {
- $installer::globals::islinuxinteldebbuild = 1;
- }
- if ( $installer::globals::compiler =~ /unxlngppc/ )
- {
- $installer::globals::islinuxppcdebbuild = 1;
- }
- if ( $installer::globals::compiler =~ /unxlngx/ )
- {
- $installer::globals::islinuxx86_64debbuild = 1;
- }
}
}
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index 4c71610..606a2a0 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -139,8 +139,6 @@ sub create_unique_directorynames
{
my ($directoryref, $allvariables) = @_;
- $installer::globals::officeinstalldirectoryset = 0;
-
my %conversionhash = ();
my $infoline = "";
my $errorcount = 0;
diff --git a/solenv/bin/modules/par2script/globals.pm b/solenv/bin/modules/par2script/globals.pm
index 82103c0..db4652d 100644
--- a/solenv/bin/modules/par2script/globals.pm
+++ b/solenv/bin/modules/par2script/globals.pm
@@ -71,13 +71,6 @@ BEGIN
$pathseparator = "\:";
$isunix = 1;
$iswin = 0;
-
- $islinux = 0;
- $issolaris = 0;
-
- if ( $plat =~ /linux/i ) { $islinux = 1; }
- if ( $plat =~ /solaris/i ) { $issolaris = 1; }
-
}
1;
diff --git a/solenv/bin/modules/pre2par/globals.pm b/solenv/bin/modules/pre2par/globals.pm
index 26f87ae..c69e5b5 100644
--- a/solenv/bin/modules/pre2par/globals.pm
+++ b/solenv/bin/modules/pre2par/globals.pm
@@ -46,14 +46,6 @@ BEGIN
$pathseparator = "\:";
$isunix = 1;
$iswin = 0;
-
- $islinux = 0;
- $issolaris = 0;
-
- if ( $plat =~ /linux/i ) { $islinux = 1; }
- if ( $plat =~ /kfreebsd/i ) { $islinux = 1; }
- if ( $plat =~ /solaris/i ) { $issolaris = 1; }
-
}
1;
More information about the Libreoffice-commits
mailing list