diff pytools/gl.py @ 3624:e81927755129

Removed targetting of JDK7G by gl.py.
author Doug Simon <doug.simon@oracle.com>
date Wed, 09 Nov 2011 17:02:12 +0100
parents 3b2ab8970aa4
children c773cc740d4a
line wrap: on
line diff
--- a/pytools/gl.py	Wed Nov 09 16:02:46 2011 +0100
+++ b/pytools/gl.py	Wed Nov 09 17:02:12 2011 +0100
@@ -55,16 +55,14 @@
     def __init__(self):
         self.dacapo = os.getenv('DACAPO')
         self.jdk7 = os.getenv('JDK7')
-        self.jdk7g = os.getenv('JDK7G')
         self.maxine = os.getenv('MAXINE')
         
         ArgumentParser.__init__(self, prog='gl')
     
         self.add_argument('-v', action='store_true', dest='verbose', help='enable verbose output')
-        self.add_argument('--dacapo', help='path to DaCapo 91.12 jar file')
-        self.add_argument('--jdk7', help='JDK7 installation in which the GraalVM binary is installed', metavar='<path>')
-        self.add_argument('--jdk7g', help='JDK7G installation in which the GraalVM binary is installed', metavar='<path>')
-        self.add_argument('-M', '--maxine', dest='maxine', help='path to Maxine code base', metavar='<path>')
+        self.add_argument('--dacapo', help='path to DaCapo 9.12 jar file', metavar='<path>')
+        self.add_argument('--jdk7', help='JDK7 in which the GraalVM will be installed', metavar='<path>')
+        self.add_argument('-M', dest='maxine', help='path to Maxine code base', metavar='<path>')
         
     def parse_cmd_line(self, configFile):
         
@@ -76,10 +74,6 @@
             self.log('JDK7 is required. Use --jdk7 option or set JDK7 environment variable (in ' + configFile + ')')
             self.abort(1)
 
-        if self.jdk7g is None or not isdir(self.jdk7g):
-            self.log('JDK7G is required. Use --jdk7g option or set JDK7G environment variable (in ' + configFile + ')')
-            self.abort(1)
-
         self.graal_home = dirname(abspath(dirname(sys.argv[0])))
     
     def load_config_file(self, configFile):