Mercurial > hg > truffle

comparison mx/mx_graal.py @ 13471:020099961eb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
renamed JavaVersion to VersionSpec
author Doug Simon <doug.simon@oracle.com>
date Sat, 21 Dec 2013 13:33:05 +0100
parents 16d99e9d77ad
children 72e2ec923b7b
comparison
equal deleted inserted replaced
13470:eb7bc1fd38de 13471:020099961eb4
75 """ Prefix for running the VM. """ 75 """ Prefix for running the VM. """
76 _vm_prefix = None 76 _vm_prefix = None
77 77
78 _make_eclipse_launch = False 78 _make_eclipse_launch = False
79 79
80 _minVersion = mx.JavaVersion('1.7.0_04') 80 _minVersion = mx.VersionSpec('1.7.0_04')
81 81
82 def _get_vm(): 82 def _get_vm():
83 """ 83 """
84 Gets the configured VM, presenting a dialogue if there is no currently configured VM. 84 Gets the configured VM, presenting a dialogue if there is no currently configured VM.
85 """ 85 """
979 unittest([]) 979 unittest([])
980 tasks.append(t.stop()) 980 tasks.append(t.stop())
981 981
982 for vmbuild in ['fastdebug', 'product']: 982 for vmbuild in ['fastdebug', 'product']:
983 for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel=vmbuild): 983 for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel=vmbuild):
984 if 'eclipse' in str(test) and mx.java().version >= mx.JavaVersion('1.8'): 984 if 'eclipse' in str(test) and mx.java().version >= mx.VersionSpec('1.8'):
985 # DaCapo eclipse doesn't not run under JDK8 985 # DaCapo eclipse doesn't not run under JDK8
986 continue 986 continue
987 987
988 t = Task(str(test) + ':' + vmbuild) 988 t = Task(str(test) + ':' + vmbuild)
989 if not test.test('graal'): 989 if not test.test('graal'):
1135 mx.run(['ant', '-f', join(_graal_home, 'visualizer', 'build.xml'), '-l', fp.name, 'run']) 1135 mx.run(['ant', '-f', join(_graal_home, 'visualizer', 'build.xml'), '-l', fp.name, 'run'])
1136 1136
1137 def igv(args): 1137 def igv(args):
1138 """run the Ideal Graph Visualizer""" 1138 """run the Ideal Graph Visualizer"""
1139 env = os.environ.copy() 1139 env = os.environ.copy()
1140 if mx.java().version >= mx.JavaVersion('1.8'): 1140 if mx.java().version >= mx.VersionSpec('1.8'):
1141 jdk7 = mx.get_env('JAVA7_HOME', None) 1141 jdk7 = mx.get_env('JAVA7_HOME', None)
1142 if jdk7: 1142 if jdk7:
1143 env['JAVA_HOME'] = jdk7 1143 env['JAVA_HOME'] = jdk7
1144 else: 1144 else:
1145 mx.abort('IGV does not yet work with JDK 8. Use --java-home to specify a JDK 7 when launching the IGV') 1145 mx.abort('IGV does not yet work with JDK 8. Use --java-home to specify a JDK 7 when launching the IGV')