INTEGRATION: CWS networker3 (1.2.2); FILE MERGED

2004/05/26 16:56:23 is 1.2.2.4: #116507# javafilter custom action
Issue number:
Submitted by:
Reviewed by:
2004/05/17 11:07:40 is 1.2.2.3: #i28288# new zip list path variable platformname
Issue number:
Submitted by:
Reviewed by:
2004/05/04 11:43:07 is 1.2.2.2: #i22149# new ause variables LOCAL_OUT and LOCAL_COMMON_OUT to instset_native
Issue number:
Submitted by:
Reviewed by:
2004/05/03 13:21:42 is 1.2.2.1: #i28280# new table selfreg
Issue number:
Submitted by:
Reviewed by:

1 files changed, 26 insertions, 9 deletions

diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index bfcf8081d6d1..88e6cd8ae3e2 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: environment.pm,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: svesik $ $Date: 2004-04-20 12:26:17 $
+#   last change: $Author: kz $ $Date: 2004-06-11 18:15:28 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -62,6 +62,7 @@
 
 package installer::environment;
 
+use installer::exiter;
 use installer::globals;
 
 ######################################################
@@ -88,16 +89,30 @@ sub create_pathvariables
 
     $variables{'os'} = $installer::globals::compiler;
 
-    my $solarenvpath  = $environment->{'ENV_ROOT'} . $installer::globals::separator . "solenv" . $installer::globals::separator . "inst";
+#   my $solarenvpath  = $environment->{'ENV_ROOT'} . $installer::globals::separator . "solenv" . $installer::globals::separator . "inst";
+#   $variables{'solarenvpath'} = $solarenvpath;
+
+    my $solarenvpath = "";
+
+    if (!($installer::globals::product =~ /OpenOffice/i ))
+    {
+        if ( $ENV{'SO_PACK'} ) { $solarenvpath  = $ENV{'SO_PACK'}; }
+        else { installer::exiter::exit_program("ERROR: Environment variable SO_PACK not set!", "create_pathvariables"); }
+
+        # overriding with STAR_INSTPATH, if set
+        if ( $ENV{'STAR_INSTPATH'} ) { $solarenvpath = $ENV{'STAR_INSTPATH'}; }
+    }
+
     $variables{'solarenvpath'} = $solarenvpath;
 
-    # pmiscpath can be removed
+    my $localpath  = $environment->{'LOCAL_OUT'};
+    $variables{'localpath'} = $localpath;
 
-    my $pmiscpath;
-    if ( $installer::globals::iswin ) { $pmiscpath = "z\:"; }
-    else { $pmiscpath = "/packmisc"; }
+    my $localcommonpath  = $environment->{'LOCAL_COMMON_OUT'};
+    $variables{'localcommonpath'} = $localcommonpath;
 
-    $variables{'pmiscpath'} = $pmiscpath;
+    my $platformname  = $environment->{'OUTPATH'};
+    $variables{'platformname'} = $platformname;
 
     return \%variables;
 }
@@ -113,9 +128,11 @@ sub set_global_environment_variables
     my ( $environment ) = @_;
 
     $installer::globals::build = $environment->{'WORK_STAMP'};
-    $installer::globals::minor = $environment->{'UPDMINOR'};
+    # $installer::globals::minor = $environment->{'UPDMINOR'};
     $installer::globals::compiler = $environment->{'OUTPATH'};
 
+    if ( $ENV{'UPDMINOR'} ) { $installer::globals::minor = $ENV{'UPDMINOR'}; }
+
     if ( $ENV{'PROEXT'} ) { $installer::globals::pro = 1; }
     if ( $ENV{'SOLAR_JAVA'} ) { $installer::globals::solarjava = 1; }
     if ( $ENV{'JDKLIB'} ) { $installer::globals::jdklib = $ENV{'JDKLIB'}; }