solenv/bin/modules/installer/globals.pm | 4 ---- solenv/bin/modules/installer/scriptitems.pm | 6 ------ solenv/bin/modules/installer/windows/directory.pm | 9 --------- solenv/bin/modules/installer/windows/property.pm | 12 ------------ 4 files changed, 31 deletions(-)
New commits: commit efa4580b8f4a86566fda9be87e02d0ed9a346aa3 Author: Andras Timar <ati...@suse.com> Date: Wed Apr 11 18:09:26 2012 +0200 remove sundir* stuff from installer that was used for the proprietary product diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index c07f3f6..fc65622 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -262,7 +262,6 @@ BEGIN %dependfilenames = (); $manufacturer = ""; $longmanufacturer = ""; - $sundirname = "Oracle"; $codefilename = "codes.txt"; $componentfilename = "components.txt"; $productcode = ""; @@ -343,7 +342,6 @@ BEGIN @pcfdiffcomment = (); @epmdifflist = (); $desktoplinkexists = 0; - $sundirexists = 0; $analyze_spellcheckerlanguage = 0; %spellcheckerlanguagehash = (); %spellcheckerfilehash = (); @@ -372,11 +370,9 @@ BEGIN $officedirhostname = ""; $basisdirhostname = ""; $uredirhostname = ""; - $sundirhostname = ""; $officedirgid = ""; $basisdirgid = ""; $uredirgid = ""; - $sundirgid = ""; %sign_extensions = ("dll" => "1", "exe" => "1", "cab" => "1"); %treestyles = (); diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index ad42ab1..4050ca5 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -528,12 +528,6 @@ sub set_global_directory_hostnames $installer::globals::officedirgid = $onedir->{'gid'}; $allvariables->{'OFFICEDIRECTORYHOSTNAME'} = $installer::globals::officedirhostname; } - if ( $styles =~ /\bSUNDIRECTORY\b/ ) - { - $installer::globals::sundirhostname = $onedir->{'HostName'}; - $installer::globals::sundirgid = $onedir->{'gid'}; - $allvariables->{'SUNDIRECTORYHOSTNAME'} = $installer::globals::sundirhostname; - } } } diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm index cd922ad..4c71610 100644 --- a/solenv/bin/modules/installer/windows/directory.pm +++ b/solenv/bin/modules/installer/windows/directory.pm @@ -235,15 +235,6 @@ sub create_unique_directorynames if ( $installer::globals::installlocationdirectoryset ) { installer::exiter::exit_program("ERROR: Directory with flag ISINSTALLLOCATION alread set: \"$installer::globals::installlocationdirectory\".", "create_unique_directorynames"); } $installer::globals::installlocationdirectory = $uniquename; $installer::globals::installlocationdirectoryset = 1; - if ( $installer::globals::installlocationdirectory =~ /oracle_/i ) { $installer::globals::sundirexists = 1; } - } - - # setting the sundirectory - if ( $styles =~ /\bSUNDIRECTORY\b/ ) - { - if ( $installer::globals::vendordirectoryset ) { installer::exiter::exit_program("ERROR: Directory with flag SUNDIRECTORY alread set: \"$installer::globals::vendordirectory\".", "create_unique_directorynames"); } - $installer::globals::vendordirectory = $uniquename; - $installer::globals::vendordirectoryset = 1; } } diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm index 8650883..c402de9 100644 --- a/solenv/bin/modules/installer/windows/property.pm +++ b/solenv/bin/modules/installer/windows/property.pm @@ -309,12 +309,6 @@ sub set_important_properties $onepropertyline = "DONTOPTIMIZELIBS" . "\t" . "0" . "\n"; push(@{$propertyfile}, $onepropertyline); - if ( $installer::globals::sundirexists ) - { - my $onepropertyline = "SUNDIREXISTS" . "\t" . "1" . "\n"; - push(@{$propertyfile}, $onepropertyline); - } - if ( $installer::globals::officedirhostname ) { my $onepropertyline = "OFFICEDIRHOSTNAME" . "\t" . $installer::globals::officedirhostname . "\n"; @@ -326,12 +320,6 @@ sub set_important_properties push(@{$propertyfile}, $onepropertyline); } - if ( $installer::globals::sundirhostname ) - { - my $onepropertyline = "SUNDIRHOSTNAME" . "\t" . $installer::globals::sundirhostname . "\n"; - push(@{$propertyfile}, $onepropertyline); - } - if ( $installer::globals::desktoplinkexists ) { my $onepropertyline = "DESKTOPLINKEXISTS" . "\t" . "1" . "\n"; _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits