Kaydet (Commit) 4594d7d4 authored tarafından Andre Fischer's avatar Andre Fischer

123729: Removed obsolete references to non-opensource builds.

üst 46f0ae64
...@@ -263,7 +263,6 @@ BEGIN ...@@ -263,7 +263,6 @@ BEGIN
$isopensourceproduct = 1; $isopensourceproduct = 1;
$manufacturer = ""; $manufacturer = "";
$longmanufacturer = ""; $longmanufacturer = "";
$sundirname = "Oracle";
$codefilename = "codes.txt"; $codefilename = "codes.txt";
$componentfilename = "components.txt"; $componentfilename = "components.txt";
$productcode = ""; $productcode = "";
...@@ -364,7 +363,6 @@ BEGIN ...@@ -364,7 +363,6 @@ BEGIN
@pcfdiffcomment = (); @pcfdiffcomment = ();
@epmdifflist = (); @epmdifflist = ();
$desktoplinkexists = 0; $desktoplinkexists = 0;
$sundirexists = 0;
$analyze_spellcheckerlanguage = 0; $analyze_spellcheckerlanguage = 0;
%spellcheckerlanguagehash = (); %spellcheckerlanguagehash = ();
%spellcheckerfilehash = (); %spellcheckerfilehash = ();
...@@ -392,11 +390,8 @@ BEGIN ...@@ -392,11 +390,8 @@ BEGIN
$officedirhostname = ""; $officedirhostname = "";
$basisdirhostname = ""; $basisdirhostname = "";
$uredirhostname = ""; $uredirhostname = "";
$sundirhostname = "";
$officedirgid = ""; $officedirgid = "";
$basisdirgid = ""; $basisdirgid = "";
$uredirgid = "";
$sundirgid = "";
%sign_extensions = ("dll" => "1", "exe" => "1", "cab" => "1"); %sign_extensions = ("dll" => "1", "exe" => "1", "cab" => "1");
%treestyles = (); %treestyles = ();
......
...@@ -715,12 +715,6 @@ sub set_global_directory_hostnames ...@@ -715,12 +715,6 @@ sub set_global_directory_hostnames
$installer::globals::officedirgid = $onedir->{'gid'}; $installer::globals::officedirgid = $onedir->{'gid'};
$allvariables->{'OFFICEDIRECTORYHOSTNAME'} = $installer::globals::officedirhostname; $allvariables->{'OFFICEDIRECTORYHOSTNAME'} = $installer::globals::officedirhostname;
} }
if ( $styles =~ /\bSUNDIRECTORY\b/ )
{
$installer::globals::sundirhostname = $onedir->{'HostName'};
$installer::globals::sundirgid = $onedir->{'gid'};
$allvariables->{'SUNDIRECTORYHOSTNAME'} = $installer::globals::sundirhostname;
}
} }
} }
......
...@@ -269,7 +269,6 @@ sub create_unique_directorynames ...@@ -269,7 +269,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"); } 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::installlocationdirectory = $uniquename;
$installer::globals::installlocationdirectoryset = 1; $installer::globals::installlocationdirectoryset = 1;
if ( $installer::globals::installlocationdirectory =~ /oracle_/i ) { $installer::globals::sundirexists = 1; }
} }
# setting the sundirectory # setting the sundirectory
......
...@@ -308,12 +308,6 @@ sub set_important_properties ...@@ -308,12 +308,6 @@ sub set_important_properties
$onepropertyline = "DONTOPTIMIZELIBS" . "\t" . "0" . "\n"; $onepropertyline = "DONTOPTIMIZELIBS" . "\t" . "0" . "\n";
push(@{$propertyfile}, $onepropertyline); push(@{$propertyfile}, $onepropertyline);
if ( $installer::globals::sundirexists )
{
my $onepropertyline = "SUNDIREXISTS" . "\t" . "1" . "\n";
push(@{$propertyfile}, $onepropertyline);
}
if ( $installer::globals::officedirhostname ) if ( $installer::globals::officedirhostname )
{ {
my $onepropertyline = "OFFICEDIRHOSTNAME" . "\t" . $installer::globals::officedirhostname . "\n"; my $onepropertyline = "OFFICEDIRHOSTNAME" . "\t" . $installer::globals::officedirhostname . "\n";
...@@ -325,12 +319,6 @@ sub set_important_properties ...@@ -325,12 +319,6 @@ sub set_important_properties
push(@{$propertyfile}, $onepropertyline); push(@{$propertyfile}, $onepropertyline);
} }
if ( $installer::globals::sundirhostname )
{
my $onepropertyline = "SUNDIRHOSTNAME" . "\t" . $installer::globals::sundirhostname . "\n";
push(@{$propertyfile}, $onepropertyline);
}
if ( $installer::globals::desktoplinkexists ) if ( $installer::globals::desktoplinkexists )
{ {
my $onepropertyline = "DESKTOPLINKEXISTS" . "\t" . "1" . "\n"; my $onepropertyline = "DESKTOPLINKEXISTS" . "\t" . "1" . "\n";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment