comparison 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
comparison
equal deleted inserted replaced
3623:3b2ab8970aa4 3624:e81927755129
53 return msg + '\n' 53 return msg + '\n'
54 54
55 def __init__(self): 55 def __init__(self):
56 self.dacapo = os.getenv('DACAPO') 56 self.dacapo = os.getenv('DACAPO')
57 self.jdk7 = os.getenv('JDK7') 57 self.jdk7 = os.getenv('JDK7')
58 self.jdk7g = os.getenv('JDK7G')
59 self.maxine = os.getenv('MAXINE') 58 self.maxine = os.getenv('MAXINE')
60 59
61 ArgumentParser.__init__(self, prog='gl') 60 ArgumentParser.__init__(self, prog='gl')
62 61
63 self.add_argument('-v', action='store_true', dest='verbose', help='enable verbose output') 62 self.add_argument('-v', action='store_true', dest='verbose', help='enable verbose output')
64 self.add_argument('--dacapo', help='path to DaCapo 91.12 jar file') 63 self.add_argument('--dacapo', help='path to DaCapo 9.12 jar file', metavar='<path>')
65 self.add_argument('--jdk7', help='JDK7 installation in which the GraalVM binary is installed', metavar='<path>') 64 self.add_argument('--jdk7', help='JDK7 in which the GraalVM will be installed', metavar='<path>')
66 self.add_argument('--jdk7g', help='JDK7G installation in which the GraalVM binary is installed', metavar='<path>') 65 self.add_argument('-M', dest='maxine', help='path to Maxine code base', metavar='<path>')
67 self.add_argument('-M', '--maxine', dest='maxine', help='path to Maxine code base', metavar='<path>')
68 66
69 def parse_cmd_line(self, configFile): 67 def parse_cmd_line(self, configFile):
70 68
71 self.add_argument('commandAndArgs', nargs=REMAINDER, metavar='command args...') 69 self.add_argument('commandAndArgs', nargs=REMAINDER, metavar='command args...')
72 70
73 self.parse_args(namespace=self) 71 self.parse_args(namespace=self)
74 72
75 if self.jdk7 is None or not isdir(self.jdk7): 73 if self.jdk7 is None or not isdir(self.jdk7):
76 self.log('JDK7 is required. Use --jdk7 option or set JDK7 environment variable (in ' + configFile + ')') 74 self.log('JDK7 is required. Use --jdk7 option or set JDK7 environment variable (in ' + configFile + ')')
77 self.abort(1)
78
79 if self.jdk7g is None or not isdir(self.jdk7g):
80 self.log('JDK7G is required. Use --jdk7g option or set JDK7G environment variable (in ' + configFile + ')')
81 self.abort(1) 75 self.abort(1)
82 76
83 self.graal_home = dirname(abspath(dirname(sys.argv[0]))) 77 self.graal_home = dirname(abspath(dirname(sys.argv[0])))
84 78
85 def load_config_file(self, configFile): 79 def load_config_file(self, configFile):