Kaydet (Commit) 19b2933c authored tarafından Michael Stahl's avatar Michael Stahl

installer: stop using PROEXT

Remove "productextension" from installer.

There is some "common" cruft here that needs more cleanup..

Change-Id: Ia4ef306009f0c4952792d096bb335f834b0f8262
üst eca3dec2
...@@ -165,7 +165,7 @@ sub resolving_archive_flag ...@@ -165,7 +165,7 @@ sub resolving_archive_flag
my $iscommonfile = 0; my $iscommonfile = 0;
my $sourcepath = $onefile->{'sourcepath'}; my $sourcepath = $onefile->{'sourcepath'};
if ( $sourcepath =~ /\Q$installer::globals::separator\E\bcommon$installer::globals::productextension\Q$installer::globals::separator\E/ ) # /common/ or /common.pro/ if ( $sourcepath =~ /\Q$installer::globals::separator\E\bcommon\Q$installer::globals::separator\E/ ) # /common/ or /common.pro/
{ {
$iscommonfile = 1; $iscommonfile = 1;
} }
......
...@@ -308,8 +308,6 @@ sub check_logfile ...@@ -308,8 +308,6 @@ sub check_logfile
my $ignore_error = 0; my $ignore_error = 0;
my $make_error_to_warning = 0; my $make_error_to_warning = 0;
if (( ! $installer::globals::pro ) && ( $installer::globals::ignore_error_in_logfile )) { $ignore_error = 1; }
for ( my $i = 0; $i <= $#{$logfile}; $i++ ) for ( my $i = 0; $i <= $#{$logfile}; $i++ )
{ {
my $line = ${$logfile}[$i]; my $line = ${$logfile}[$i];
......
...@@ -115,7 +115,7 @@ sub set_global_environment_variables ...@@ -115,7 +115,7 @@ sub set_global_environment_variables
if ( $ENV{'LAST_MINOR'} ) { $installer::globals::lastminor = $ENV{'LAST_MINOR'}; } if ( $ENV{'LAST_MINOR'} ) { $installer::globals::lastminor = $ENV{'LAST_MINOR'}; }
if ( $ENV{'PROEXT'} ) { $installer::globals::pro = 1; } if ( $ENV{'ENABLE_DBGUTIL'} ) {} else { $installer::globals::pro = 1; }
if ( $ENV{'VERBOSE'} && ( (lc $ENV{'VERBOSE'}) eq "false" ) ) { $installer::globals::quiet = 1; } if ( $ENV{'VERBOSE'} && ( (lc $ENV{'VERBOSE'}) eq "false" ) ) { $installer::globals::quiet = 1; }
if ( $ENV{'PREPARE_WINPATCH'} ) { $installer::globals::prepare_winpatch = 1; } if ( $ENV{'PREPARE_WINPATCH'} ) { $installer::globals::prepare_winpatch = 1; }
......
...@@ -35,7 +35,6 @@ BEGIN ...@@ -35,7 +35,6 @@ BEGIN
$destdir = ""; $destdir = "";
$rootpath = ""; $rootpath = "";
$productextension = "";
@languageproducts = (); @languageproducts = ();
$build = ""; $build = "";
$minor = ""; $minor = "";
......
...@@ -336,9 +336,6 @@ sub setglobalvariables ...@@ -336,9 +336,6 @@ sub setglobalvariables
if ( ! $installer::globals::packageformat ) { $installer::globals::packageformat = "native"; } if ( ! $installer::globals::packageformat ) { $installer::globals::packageformat = "native"; }
# extension, if $installer::globals::pro is set
if ($installer::globals::pro) { $installer::globals::productextension = ".pro"; }
# no languages defined as parameter # no languages defined as parameter
if ($installer::globals::languagelist eq "") { $installer::globals::languages_defined_in_productlist = 1; } if ($installer::globals::languagelist eq "") { $installer::globals::languages_defined_in_productlist = 1; }
...@@ -390,7 +387,7 @@ sub setglobalvariables ...@@ -390,7 +387,7 @@ sub setglobalvariables
if ( ! -d $installer::globals::temppath ) { installer::exiter::exit_program("ERROR: Failed to create directory $installer::globals::temppath ! Possible reason: Wrong privileges in directory $dirsave .", "setglobalvariables"); } if ( ! -d $installer::globals::temppath ) { installer::exiter::exit_program("ERROR: Failed to create directory $installer::globals::temppath ! Possible reason: Wrong privileges in directory $dirsave .", "setglobalvariables"); }
$installer::globals::temppath = $installer::globals::temppath . $installer::globals::separator . $installer::globals::compiler . $installer::globals::productextension; $installer::globals::temppath = $installer::globals::temppath . $installer::globals::separator . $installer::globals::compiler;
installer::systemactions::create_directory($installer::globals::temppath); installer::systemactions::create_directory($installer::globals::temppath);
if ( $^O =~ /cygwin/i ) if ( $^O =~ /cygwin/i )
{ {
......
...@@ -202,7 +202,7 @@ sub create_directories ...@@ -202,7 +202,7 @@ sub create_directories
if ($newdirectory eq "unzip" ) # special handling for common directory if ($newdirectory eq "unzip" ) # special handling for common directory
{ {
$path = $path . ".." . $installer::globals::separator . "common" . $installer::globals::productextension . $installer::globals::separator; $path = $path . ".." . $installer::globals::separator . "common" . $installer::globals::separator;
create_directory($path); create_directory($path);
$path = $path . $newdirectory . $installer::globals::separator; $path = $path . $newdirectory . $installer::globals::separator;
......
...@@ -185,14 +185,7 @@ sub analyze_settings_block ...@@ -185,14 +185,7 @@ sub analyze_settings_block
# Comment line in settings block begin with "#" or ";" # Comment line in settings block begin with "#" or ";"
if ( $installer::globals::pro ) $compilerstring = $installer::globals::compiler;
{
$compilerstring = $installer::globals::compiler . ".pro";
}
else
{
$compilerstring = $installer::globals::compiler;
}
for ( my $i = 0; $i <= $#{$blockref}; $i++ ) for ( my $i = 0; $i <= $#{$blockref}; $i++ )
{ {
......
...@@ -75,7 +75,7 @@ sub create_directories ...@@ -75,7 +75,7 @@ sub create_directories
if ($directory eq "unzip" ) if ($directory eq "unzip" )
{ {
$path = $path . "common" . $par2script::globals::productextension . $par2script::globals::separator; $path = $path . "common" . $par2script::globals::separator;
create_directory($path); create_directory($path);
$path = $path . $directory . $par2script::globals::separator; $path = $path . $directory . $par2script::globals::separator;
...@@ -83,7 +83,7 @@ sub create_directories ...@@ -83,7 +83,7 @@ sub create_directories
} }
else else
{ {
$path = $path . $par2script::globals::compiler . $par2script::globals::productextension . $par2script::globals::separator; $path = $path . $par2script::globals::compiler . $par2script::globals::separator;
create_directory($path); create_directory($path);
$path = $path . $par2script::globals::product . $par2script::globals::separator; $path = $path . $par2script::globals::product . $par2script::globals::separator;
......
...@@ -98,7 +98,7 @@ sub create_directories ...@@ -98,7 +98,7 @@ sub create_directories
if ($directory eq "unzip" ) if ($directory eq "unzip" )
{ {
$path = $path . "common" . $pre2par::globals::productextension . $pre2par::globals::separator; $path = $path . "common" . $pre2par::globals::separator;
create_directory($path); create_directory($path);
$path = $path . $directory . $pre2par::globals::separator; $path = $path . $directory . $pre2par::globals::separator;
...@@ -106,7 +106,7 @@ sub create_directories ...@@ -106,7 +106,7 @@ sub create_directories
} }
else else
{ {
$path = $path . $pre2par::globals::compiler . $pre2par::globals::productextension . $pre2par::globals::separator; $path = $path . $pre2par::globals::compiler . $pre2par::globals::separator;
create_directory($path); create_directory($path);
$path = $path . $pre2par::globals::product . $pre2par::globals::separator; $path = $path . $pre2par::globals::product . $pre2par::globals::separator;
......
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