diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-11-06 16:21:32 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-11-07 01:34:44 +0100 |
commit | 19b2933c6df6d429f47334f0882a3aaa17c61a39 (patch) | |
tree | 4bc657547867413bf4e2f90e564e943c9450ea7e /solenv/bin/modules | |
parent | eca3dec2047bf675932cc9a6b2ad8acaaf919a24 (diff) |
installer: stop using PROEXT
Remove "productextension" from installer.
There is some "common" cruft here that needs more cleanup..
Change-Id: Ia4ef306009f0c4952792d096bb335f834b0f8262
Diffstat (limited to 'solenv/bin/modules')
-rw-r--r-- | solenv/bin/modules/installer/archivefiles.pm | 2 | ||||
-rw-r--r-- | solenv/bin/modules/installer/control.pm | 2 | ||||
-rw-r--r-- | solenv/bin/modules/installer/environment.pm | 2 | ||||
-rw-r--r-- | solenv/bin/modules/installer/globals.pm | 1 | ||||
-rw-r--r-- | solenv/bin/modules/installer/parameter.pm | 5 | ||||
-rw-r--r-- | solenv/bin/modules/installer/systemactions.pm | 2 | ||||
-rw-r--r-- | solenv/bin/modules/installer/ziplist.pm | 9 | ||||
-rw-r--r-- | solenv/bin/modules/par2script/systemactions.pm | 4 | ||||
-rw-r--r-- | solenv/bin/modules/pre2par/systemactions.pm | 4 |
9 files changed, 9 insertions, 22 deletions
diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm index c4fd031b415a..ae138d93d084 100644 --- a/solenv/bin/modules/installer/archivefiles.pm +++ b/solenv/bin/modules/installer/archivefiles.pm @@ -165,7 +165,7 @@ sub resolving_archive_flag my $iscommonfile = 0; 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; } diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index bd80505bb5f7..caa9f52b1b9e 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -308,8 +308,6 @@ sub check_logfile my $ignore_error = 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++ ) { my $line = ${$logfile}[$i]; diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm index 91c77d9cffcd..ab0d877758c2 100644 --- a/solenv/bin/modules/installer/environment.pm +++ b/solenv/bin/modules/installer/environment.pm @@ -115,7 +115,7 @@ sub set_global_environment_variables 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{'PREPARE_WINPATCH'} ) { $installer::globals::prepare_winpatch = 1; } diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index bf0dba6823b6..a0b92de16539 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -35,7 +35,6 @@ BEGIN $destdir = ""; $rootpath = ""; - $productextension = ""; @languageproducts = (); $build = ""; $minor = ""; diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm index ef7f2f6777e9..5feef849c151 100644 --- a/solenv/bin/modules/installer/parameter.pm +++ b/solenv/bin/modules/installer/parameter.pm @@ -336,9 +336,6 @@ sub setglobalvariables 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 if ($installer::globals::languagelist eq "") { $installer::globals::languages_defined_in_productlist = 1; } @@ -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"); } - $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); if ( $^O =~ /cygwin/i ) { diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm index 457d68f3e83d..2037c10af1f2 100644 --- a/solenv/bin/modules/installer/systemactions.pm +++ b/solenv/bin/modules/installer/systemactions.pm @@ -202,7 +202,7 @@ sub create_directories 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); $path = $path . $newdirectory . $installer::globals::separator; diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index dc24d4b025a0..18d75a914ec1 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -185,14 +185,7 @@ sub analyze_settings_block # Comment line in settings block begin with "#" or ";" - if ( $installer::globals::pro ) - { - $compilerstring = $installer::globals::compiler . ".pro"; - } - else - { - $compilerstring = $installer::globals::compiler; - } + $compilerstring = $installer::globals::compiler; for ( my $i = 0; $i <= $#{$blockref}; $i++ ) { diff --git a/solenv/bin/modules/par2script/systemactions.pm b/solenv/bin/modules/par2script/systemactions.pm index bf3bdd86a41c..475f276f9eaa 100644 --- a/solenv/bin/modules/par2script/systemactions.pm +++ b/solenv/bin/modules/par2script/systemactions.pm @@ -75,7 +75,7 @@ sub create_directories if ($directory eq "unzip" ) { - $path = $path . "common" . $par2script::globals::productextension . $par2script::globals::separator; + $path = $path . "common" . $par2script::globals::separator; create_directory($path); $path = $path . $directory . $par2script::globals::separator; @@ -83,7 +83,7 @@ sub create_directories } else { - $path = $path . $par2script::globals::compiler . $par2script::globals::productextension . $par2script::globals::separator; + $path = $path . $par2script::globals::compiler . $par2script::globals::separator; create_directory($path); $path = $path . $par2script::globals::product . $par2script::globals::separator; diff --git a/solenv/bin/modules/pre2par/systemactions.pm b/solenv/bin/modules/pre2par/systemactions.pm index ffcda9c32c99..cd2deaf28caf 100644 --- a/solenv/bin/modules/pre2par/systemactions.pm +++ b/solenv/bin/modules/pre2par/systemactions.pm @@ -98,7 +98,7 @@ sub create_directories if ($directory eq "unzip" ) { - $path = $path . "common" . $pre2par::globals::productextension . $pre2par::globals::separator; + $path = $path . "common" . $pre2par::globals::separator; create_directory($path); $path = $path . $directory . $pre2par::globals::separator; @@ -106,7 +106,7 @@ sub create_directories } else { - $path = $path . $pre2par::globals::compiler . $pre2par::globals::productextension . $pre2par::globals::separator; + $path = $path . $pre2par::globals::compiler . $pre2par::globals::separator; create_directory($path); $path = $path . $pre2par::globals::product . $pre2par::globals::separator; |