gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject svn commit: r164796 - /gump/trunk/python/gump/core/run/gumpenv.py
Date Tue, 26 Apr 2005 14:28:00 GMT
Author: ajack
Date: Tue Apr 26 07:27:59 2005
New Revision: 164796

URL: http://svn.apache.org/viewcvs?rev=164796&view=rev
Log:
Hopefully a moot change.

Modified:
    gump/trunk/python/gump/core/run/gumpenv.py

Modified: gump/trunk/python/gump/core/run/gumpenv.py
URL: http://svn.apache.org/viewcvs/gump/trunk/python/gump/core/run/gumpenv.py?rev=164796&r1=164795&r2=164796&view=diff
==============================================================================
--- gump/trunk/python/gump/core/run/gumpenv.py (original)
+++ gump/trunk/python/gump/core/run/gumpenv.py Tue Apr 26 07:27:59 2005
@@ -89,12 +89,7 @@
         self.javaHome = None
         self.javaCommand = 'java'
         self.javacCommand = 'javac'
-        
-        # Default to $JAVA_HOME/bin/java, can be overridden with $JAVA_CMD.
-        if os.environ.has_key('JAVA_HOME'):        
-            self.javaCommand  = os.path.join(os.environ['JAVA_HOME'],'bin',self.javaCommand)
-            self.addInfo('JAVA_CMD set to $JAVA_HOME/bin/java = ' + self.javaCommand )  
          
-        
+                
         # Timezone and offset from UTC
         self.timezone = time.tzname
         self.timezoneOffset = time.timezone
@@ -119,8 +114,13 @@
         # JAVAC_CMD can be set (perhaps for JRE verse JDK)
         if os.environ.has_key('JAVAC_CMD'):        
             self.javacCommand  = os.environ['JAVAC_CMD']
-            self.addInfo('JAVAC_CMD environmental variable setting javac command to ' + self.javacCommand
)      
-    
+            self.addInfo('javaCommand environmental variable setting javac command to ' +
self.javacCommand )      
+        else:
+            # Default to $JAVA_HOME/bin/java, can be overridden with $JAVA_CMD.
+            if os.environ.has_key('JAVA_HOME'):        
+                self.javaCommand  = os.path.join(os.environ['JAVA_HOME'],'bin',self.javaCommand)
+                self.addInfo('javaCommand set to $JAVA_HOME/bin/java = ' + self.javaCommand
)             
+        
         self._checkEnvVariable('JAVA_HOME')
                 
         if os.environ.has_key('JAVA_HOME'):        



Mime
View raw message