diff options
| author | Andras Timar <atimar@suse.com> | 2012-01-06 19:16:03 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-01-06 19:16:35 +0100 |
| commit | 1204483c13d093b202f6fc254b745156f2cb94e4 (patch) | |
| tree | a485456feee24accfebd340127300d83318d3379 /solenv | |
| parent | d19667fc1ab4739295ee5305456a79e4dd56fa59 (diff) | |
more wJRE cleanup
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/worker.pm | 13 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/xpdinstaller.pm | 7 |
2 files changed, 0 insertions, 20 deletions
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm index 795927482934..c91ece7108ab 100644 --- a/solenv/bin/modules/installer/worker.pm +++ b/solenv/bin/modules/installer/worker.pm @@ -2011,19 +2011,6 @@ sub add_variables_from_inc_to_hashref } } } - - # Allowing different Java versions for Windows and Unix. Instead of "JAVAVERSION" - # the property "WINDOWSJAVAVERSION" has to be used, if it is set. - - if ( $installer::globals::iswindowsbuild ) - { - if (( exists($allvariables->{'WINDOWSJAVAVERSION'})) && ( $allvariables->{'WINDOWSJAVAVERSION'} ne "" )) - { - $allvariables->{'JAVAVERSION'} = $allvariables->{'WINDOWSJAVAVERSION'}; - $infoline = "Changing value of property \"JAVAVERSION\" to $allvariables->{'JAVAVERSION'} (property \"WINDOWSJAVAVERSION\").\n"; - push( @installer::globals::globallogfileinfo, $infoline); - } - } } ############################################## diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm index 3b72889d2bc1..ac38b6489657 100644 --- a/solenv/bin/modules/installer/xpdinstaller.pm +++ b/solenv/bin/modules/installer/xpdinstaller.pm @@ -377,14 +377,7 @@ sub get_applicationmodule_value sub get_isjavamodule_value { - my ( $module ) = @_; - my $value = "false"; - - my $styles = ""; - if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; } - if ( $styles =~ /\bJAVAMODULE\b/ ) { $value = "true"; } - return $value; } |