# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1320854532 -3600
# Node ID e81927755129e81f5c5c1b77d7cb299d495c410a
# Parent  3b2ab8970aa4755f320f07af748a4426b39cd61b
Removed targetting of JDK7G by gl.py.

diff -r 3b2ab8970aa4 -r e81927755129 pytools/commands.py
--- a/pytools/commands.py	Wed Nov 09 16:02:46 2011 +0100
+++ b/pytools/commands.py	Wed Nov 09 17:02:12 2011 +0100
@@ -31,7 +31,7 @@
 from collections import Callable
 
 def clean(env, args):
-    """cleans the Graal+HotSpot source tree"""
+    """cleans the GraalVM source tree"""
     os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='16')
     env.run(['gmake', 'clean'], cwd=join(env.graal_home, 'make'))
 
@@ -121,7 +121,7 @@
     print 'gl {0} {1}\n\n{2}\n'.format(name, usage, doc)
 
 def make(env, args):
-    """builds the Graal+HotSpot binary"""
+    """builds the GraalVM binary"""
 
     def fix_jvm_cfg(env, jdk):
         jvmCfg = join(jdk, 'jre', 'lib', 'amd64', 'jvm.cfg')
@@ -138,7 +138,6 @@
                 f.write('-graal KNOWN\n')
 
     fix_jvm_cfg(env, env.jdk7)
-    fix_jvm_cfg(env, env.jdk7g)
 
     if env.get_os() != 'windows':
         javaLink = join(env.graal_home, 'graal', 'hotspot', 'java')
@@ -152,12 +151,6 @@
         env.log('Creating Graal directory in JDK7: ' + graalVmDir)
         os.makedirs(graalVmDir)
 
-    graalVmDbgDir = join(env.jdk7g, 'jre', 'lib', 'amd64', 'graal')
-    if not exists(graalVmDbgDir):
-        env.log('Creating Graal directory in JDK7G: ' + graalVmDbgDir)
-        os.makedirs(graalVmDbgDir)
-
-
     os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='4', ALT_BOOTDIR=env.jdk7g, INSTALL='y')
     env.run(['gmake', 'jvmggraal'], cwd=join(env.graal_home, 'make'))
 
diff -r 3b2ab8970aa4 -r e81927755129 pytools/gl.py
--- 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):