truffle: mx/commands.py comparison

comparison mx/commands.py @ 8506:c3657d00e343

-Merge with tip

author	Christos Kotselidis <christos.kotselidis@oracle.com>
date	Thu, 21 Mar 2013 14:11:13 +0100
parents	2bfb9644dcc2
children	83fde86ae759

comparison

equal deleted inserted replaced

-:dee7c8b578c7
+:c3657d00e343
 # questions.
 #
 # ----------------------------------------------------------------------------------------------------
 import os, sys, shutil, zipfile, tempfile, re, time, datetime, platform, subprocess, multiprocessing
-from os.path import join, exists, dirname, basename
+from os.path import join, exists, dirname, basename, getmtime
 from argparse import ArgumentParser, REMAINDER
 import mx
 import sanitycheck
 import json
 _native_dbg = None
 _make_eclipse_launch = False
-_copyrightTemplate = """/*
+_minVersion = mx.JavaVersion('1.7.0_04')
-* Copyright (c) {0}, Oracle and/or its affiliates. All rights reserved.
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* This code is free software; you can redistribute it and/or modify it
-* under the terms of the GNU General Public License version 2 only, as
-* published by the Free Software Foundation.
-*
-* This code is distributed in the hope that it will be useful, but WITHOUT
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-* FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-* version 2 for more details (a copy is included in the LICENSE file that
-* accompanied this code).
-*
-* You should have received a copy of the GNU General Public License version
-* 2 along with this work; if not, write to the Free Software Foundation,
-* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-*
-* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-* or visit www.oracle.com if you need additional information or have any
-* questions.
-*/
-"""
 def _chmodDir(chmodFlags, dirname, fnames):
 os.chmod(dirname, chmodFlags)
 for name in fnames:
 os.chmod(os.path.join(dirname, name), chmodFlags)
 """clean the GraalVM source tree"""
 opts = mx.clean(args, parser=ArgumentParser(prog='mx clean'))
 if opts.native:
 os.environ.update(ARCH_DATA_MODEL='64', LANG='C', HOTSPOT_BUILD_JOBS='16')
 mx.run([mx.gmake_cmd(), 'clean'], cwd=join(_graal_home, 'make'))
-jdks = join(_graal_home, 'jdk' + mx.java().version)
+jdks = join(_graal_home, 'jdk' + str(mx.java().version))
 if exists(jdks):
 shutil.rmtree(jdks)
 def export(args):
 """create a GraalVM zip file for distribution"""
 """
 if platform.system() == 'Windows':
 return join(jdk, 'jre', 'lib', _arch(), 'jvm.cfg')
 return join(_vmLibDirInJdk(jdk), 'jvm.cfg')
-def _jdk(build='product', create=False):
+def _jdk(build='product', vmToCheck=None, create=False):
 """
 Get the JDK into which Graal is installed, creating it first if necessary.
 """
-jdk = join(_graal_home, 'jdk' + mx.java().version, build)
+jdk = join(_graal_home, 'jdk' + str(mx.java().version), build)
 jdkContents = ['bin', 'include', 'jre', 'lib']
 if (exists(join(jdk, 'db'))):
 jdkContents.append('db')
 if mx.get_os() != 'windows':
 jdkContents.append('man')
 # reliably used as the bootstrap for a HotSpot build.
 jvmCfg = _vmCfgInJdk(jdk)
 if not exists(jvmCfg):
 mx.abort(jvmCfg + ' does not exist')
-lines = []
 defaultVM = None
 with open(jvmCfg) as f:
 for line in f:
 if line.startswith('-') and defaultVM is None:
 parts = line.split()
 assert len(parts) == 2, parts
 assert parts[1] == 'KNOWN', parts[1]
 defaultVM = parts[0][1:]
-lines.append('-' + defaultVM + '0 KNOWN\n')
-lines.append(line)
 assert defaultVM is not None, 'Could not find default VM in ' + jvmCfg
 if mx.get_os() != 'windows':
 chmodRecursive(jdk, 0755)
 shutil.copytree(join(_vmLibDirInJdk(jdk), defaultVM), join(_vmLibDirInJdk(jdk), defaultVM + '0'))
-with open(jvmCfg, 'w') as f:
+with open(jvmCfg, 'w') as fp:
-for line in lines:
+print >> fp, '-' + defaultVM + '0 KNOWN'
-f.write(line)
 # Install a copy of the disassembler library
 try:
 hsdis([], copyToDir=_vmLibDirInJdk(jdk))
 except SystemExit:
 pass
 else:
 if not exists(jdk):
-mx.abort('The ' + build + ' VM has not been created - run \'mx clean; mx build ' + build + '\'')
+mx.abort('The ' + build + ' VM has not been created - run "mx build ' + build + '"')
+_installGraalJarInJdks(mx.distribution('GRAAL'))
+if vmToCheck is not None:
+jvmCfg = _vmCfgInJdk(jdk)
+found = False
+with open(jvmCfg) as f:
+for line in f:
+if line.strip() == '-' + vmToCheck + ' KNOWN':
+found = True
+break
+if not found:
+mx.abort('The ' + build + ' ' + vmToCheck + ' VM has not been created - run "mx --vm ' + vmToCheck + ' build ' + build + '"')
 return jdk
+def _installGraalJarInJdks(graalDist):
+graalJar = graalDist.path
+jdks = join(_graal_home, 'jdk' + str(mx.java().version))
+if exists(jdks):
+for e in os.listdir(jdks):
+jreLibDir = join(jdks, e, 'jre', 'lib')
+if exists(jreLibDir):
+# do a copy and then a move to get atomic updating (on Unix) of graal.jar in the JRE
+fd, tmp = tempfile.mkstemp(suffix='', prefix='graal.jar', dir=jreLibDir)
+shutil.copyfile(graalJar, tmp)
+os.close(fd)
+shutil.move(tmp, join(jreLibDir, 'graal.jar'))
 # run a command in the windows SDK Debug Shell
 def _runInDebugShell(cmd, workingDir, logFile=None, findInOutput=None, respondTo={}):
 newLine = os.linesep
 STARTTOKEN = 'RUNINDEBUGSHELL_STARTSEQUENCE'
 def jdkhome(args, vm=None):
 """print the JDK directory selected for the 'vm' command"""
 build = _vmbuild if _vmSourcesAvailable else 'product'
-print join(_graal_home, 'jdk' + mx.java().version, build)
+print join(_graal_home, 'jdk' + str(mx.java().version), build)
+def initantbuild(args):
+"""(re)generates an ant build file for producing graal.jar"""
+parser=ArgumentParser(prog='mx initantbuild')
+parser.add_argument('-f', '--buildfile', help='file to generate', default=join(_graal_home, 'make', 'build-graal.xml'))
+args = parser.parse_args(args)
+out = mx.XMLDoc()
+out.comment("""
+Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+This code is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 2 only, as
+published by the Free Software Foundation.  Oracle designates this
+particular file as subject to the "Classpath" exception as provided
+by Oracle in the LICENSE file that accompanied this code.
+This code is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+version 2 for more details (a copy is included in the LICENSE file that
+accompanied this code).
+You should have received a copy of the GNU General Public License version
+2 along with this work; if not, write to the Free Software Foundation,
+Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+or visit www.oracle.com if you need additional information or have any
+questions.
+""")
+out.open('project', {'name' : 'graal', 'default' : 'main', 'basedir' : '.'})
+out.element('property', {'name' : 'src.dir', 'value' : '${gamma.dir}/graal'})
+out.element('property', {'name' : 'classes.dir', 'value' : '${shared.dir}/graal'})
+out.element('property', {'name' : 'jar.dir', 'value' : '${shared.dir}'})
+out.element('property', {'name' : 'jar.file', 'value' : '${jar.dir}/graal.jar'})
+out.element('target', {'name' : 'main', 'depends' : 'jar'})
+out.open('target', {'name' : 'compile'})
+out.element('mkdir', {'dir' : '${classes.dir}'})
+out.open('javac', {'destdir' : '${classes.dir}', 'debug' : 'on', 'includeantruntime' : 'false', })
+for p in mx.sorted_deps(mx.distribution('GRAAL').deps):
+out.element('src', {'path' : '${src.dir}/' + p.name})
+out.element('compilerarg', {'value' : '-XDignore.symbol.file'})
+out.open('classpath')
+out.open('fileset', {'dir' : '${java.home}/../lib'})
+out.element('include', {'name' : 'tools.jar'})
+out.close('fileset')
+out.close('classpath')
+out.close('javac')
+out.close('target')
+out.open('target', {'name' : 'jar', 'depends' : 'compile'})
+out.element('mkdir', {'dir' : '${jar.dir}'})
+out.element('jar', {'destfile' : '${jar.file}', 'basedir' : '${classes.dir}'})
+out.close('target')
+out.open('target', {'name' : 'clean'})
+out.element('delete', {'dir' : '${classes.dir}'})
+out.element('delete', {'file' : '${jar.filr}'})
+out.close('target')
+out.close('project')
+mx.update_file(args.buildfile, out.xml(indent='  ', newl='\n'))
 def build(args, vm=None):
 """build the VM binary
 The global '--vm' option selects which VM to build. This command also
 elif vm == 'client':
 buildSuffix = '1'
 else:
 assert vm == 'graal', vm
 buildSuffix = 'graal'
+initantbuild([])
 for build in builds:
 if build == 'ide-build-target':
 build = os.environ.get('IDE_BUILD_TARGET', 'product')
 if len(build) == 0:
 os.makedirs(vmDir)
 def filterXusage(line):
 if not 'Xusage.txt' in line:
 sys.stderr.write(line + os.linesep)
-# Check that the declaration of graal_projects in arguments.cpp is up to date
-argumentsCpp = join(_graal_home, 'src', 'share', 'vm', 'runtime', 'arguments.cpp')
-assert exists(argumentsCpp), 'File does not exist: ' + argumentsCpp
-with open(argumentsCpp) as fp:
-source = fp.read();
-decl = 'const char* graal_projects[] = {'
-start = source.find(decl)
-assert start != -1, 'Could not find "' + decl + '" in ' + fp.name
-end = source.find('};', start)
-assert end != -1, 'Could not find "' + decl + '" ... "};" in ' + fp.name
-actual = frozenset(re.findall(r'"([^"]+)"', source[start + len(decl):end]))
-expected = frozenset([p.name for p in mx.project('com.oracle.graal.hotspot.' + _arch()).all_deps([], False)])
-missing = expected - actual
-extra = actual - expected
-if len(missing) != 0:
-mx.abort(fp.name + ':' + str(source[:start].count('\n') + 1) + ': add missing project(s) to declaration:\n    ' + '\n    '.join(missing))
-if len(extra) != 0:
-mx.abort(fp.name + ':' + str(source[:start].count('\n') + 1) + ': remove project(s) from declaration:\n    ' + '\n    '.join(extra))
 # Check if a build really needs to be done
 timestampFile = join(vmDir, '.build-timestamp')
 if opts2.force or not exists(timestampFile):
 mustBuild = True
 found = False
 if not exists(jvmCfg):
 mx.abort(jvmCfg + ' does not exist')
 prefix = '-' + vm
-vmKnown = prefix + ' KNOWN\n'
+vmKnown = prefix + ' KNOWN'
-lines = []
 with open(jvmCfg) as f:
 for line in f:
-if vmKnown in line:
+if vmKnown == line.strip():
 found = True
 break
-if not line.startswith(prefix):
-lines.append(line)
 if not found:
 mx.log('Appending "' + prefix + ' KNOWN" to ' + jvmCfg)
-lines.append(vmKnown)
 if mx.get_os() != 'windows':
 os.chmod(jvmCfg, 0755)
-with open(jvmCfg, 'w') as f:
+with open(jvmCfg, 'a') as f:
-for line in lines:
+print >> f, vmKnown
-f.write(line)
 if exists(timestampFile):
 os.utime(timestampFile, None)
 else:
 file(timestampFile, 'a')
 if vm is None:
 vm = _vm
 build = vmbuild if vmbuild is not None else _vmbuild if _vmSourcesAvailable else 'product'
-jdk = _jdk(build)
+jdk = _jdk(build, vmToCheck=vm)
 mx.expand_project_in_args(args)
 if _make_eclipse_launch:
 mx.make_eclipse_launch(args, 'graal-' + build, name=None, deps=mx.project('com.oracle.graal.hotspot').all_deps([], True))
 if len([a for a in args if 'PrintAssembly' in a]) != 0:
 hsdis([], copyToDir=_vmLibDirInJdk(jdk))
 'destfile' : 'jacoco.exec'
 }
 args = ['-javaagent:' + jacocoagent.get_path(True) + '=' + ','.join([k + '=' + v for k, v in agentOptions.items()])] + args
 if '-d64' not in args:
 args = ['-d64'] + args
 exe = join(jdk, 'bin', mx.exe_suffix('java'))
 dbg = _native_dbg.split() if _native_dbg is not None else []
 return mx.run(dbg + [exe, '-' + vm] + args, nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd, timeout=timeout)
 def _find_classes_with_annotations(p, pkgRoot, annotations, includeInnerClasses=False):
 """
 matches = lambda line : len([a for a in annotations if line == a or line.startswith(a + '(')]) != 0
 return p.find_classes_with_matching_source_line(pkgRoot, matches, includeInnerClasses)
-def _run_tests(args, harness):
+def _run_tests(args, harness, annotations, testfile):
 pos = [a for a in args if a[0] != '-' and a[0] != '@' ]
 neg = [a[1:] for a in args if a[0] == '-']
 vmArgs = [a[1:] for a in args if a[0] == '@']
 def containsAny(c, substrings):
 for s in substrings:
 if s in c:
 return True
 return False
+classes = []
 for p in mx.projects():
-classes = _find_classes_with_annotations(p, None, ['@Test'])
+classes += _find_classes_with_annotations(p, None, annotations)
 if len(pos) != 0:
 classes = [c for c in classes if containsAny(c, pos)]
 if len(neg) != 0:
 classes = [c for c in classes if not containsAny(c, neg)]
-if len(classes) != 0:
+projectscp = mx.classpath([pcp.name for pcp in mx.projects()])
-mx.log('running tests in ' + p.name)
-harness(p, vmArgs, classes)
+if len(classes) != 0:
+f_testfile = open(testfile, 'w')
+for c in classes:
+f_testfile.write(c + '\n')
+f_testfile.close()
+harness(projectscp, vmArgs)
+def _unittest(args, annotations):
+mxdir = dirname(__file__)
+name = 'JUnitWrapper'
+javaSource = join(mxdir, name + '.java')
+javaClass = join(mxdir, name + '.class')
+(_, testfile) = tempfile.mkstemp(".testclasses", "graal")
+def harness(projectscp, vmArgs):
+if not exists(javaClass) or getmtime(javaClass) < getmtime(javaSource):
+subprocess.check_call([mx.java().javac, '-cp', projectscp, '-d', mxdir, javaSource])
+prefixArgs = ['-XX:-BootstrapGraal', '-esa', '-ea']
+vm(prefixArgs + vmArgs + ['-cp', projectscp + ':' + mxdir, name] + [testfile])
+_run_tests(args, harness, annotations, testfile)
+os.remove(testfile)
 def unittest(args):
-"""run the JUnit tests
+"""run the JUnit tests (all testcases)
 If filters are supplied, only tests whose fully qualified name
 include a filter as a substring are run. Negative filters are
 those with a '-' prefix. VM args should have a @ prefix."""
-def harness(p, vmArgs, classes):
+_unittest(args, ['@Test', '@LongTest'])
-prefixArgs = ['-XX:-BootstrapGraal', '-esa', '-ea']
-vm(prefixArgs + vmArgs + ['-cp', mx.classpath(p.name), 'org.junit.runner.JUnitCore'] + classes)
+def shortunittest(args):
-_run_tests(args, harness)
+"""run the JUnit tests (short testcases only)
+If filters are supplied, only tests whose fully qualified name
+include a filter as a substring are run. Negative filters are
+those with a '-' prefix. VM args should have a @ prefix."""
+_unittest(args, ['@Test'])
+def longunittest(args):
+"""run the JUnit tests (long testcases only)
+If filters are supplied, only tests whose fully qualified name
+include a filter as a substring are run. Negative filters are
+those with a '-' prefix. VM args should have a @ prefix."""
+_unittest(args, ['@LongTest'])
 def buildvms(args):
 """build one or more VMs in various configurations"""
 parser = ArgumentParser(prog='mx buildvms');
 if eclipse_exe is not None:
 t = Task('CodeFormatCheck')
 if mx.eclipseformat(['-e', eclipse_exe]) != 0:
 t.abort('Formatter modified files - run "mx eclipseformat", check in changes and repush')
 tasks.append(t.stop())
+t = Task('Canonicalization Check')
+mx.log(time.strftime('%d %b %Y %H:%M:%S - Ensuring mx/projects files are canonicalized...'))
+if mx.canonicalizeprojects([]) != 0:
+t.abort('Rerun "mx canonicalizeprojects" and check-in the modified mx/projects files.')
+tasks.append(t.stop())
 t = Task('BuildJava')
 build(['--no-native', '--jdt-warning-as-error'])
+tasks.append(t.stop())
+t = Task('Checkstyle')
+if mx.checkstyle([]) != 0:
+t.abort('Checkstyle warnings were found')
 tasks.append(t.stop())
 if exists('jacoco.exec'):
 os.unlink('jacoco.exec')
 if args.jacocout is not None:
 _jacoco = 'append'
 else:
 _jacoco = 'off'
 t = Task('BuildHotSpotGraal: fastdebug,product')
-buildvms(['--vms', 'graal', '--builds', 'fastdebug,product'])
+buildvms(['--vms', 'graal,server', '--builds', 'fastdebug,product'])
 tasks.append(t.stop())
 _vmbuild = 'fastdebug'
 t = Task('BootstrapWithSystemAssertions:fastdebug')
 vm(['-esa', '-version'])
 tasks.append(t.stop())
 _vmbuild = 'product'
-t = Task('UnitTests:product')
+t = Task('BootstrapWithRegisterPressure:product')
+vm(['-G:RegisterPressure=rbx,r11,r14,xmm3,xmm11,xmm14', '-esa', '-version'])
+tasks.append(t.stop())
+originalVm = _vm
+_vm = 'server' # hosted mode
+t = Task('UnitTests:hosted-product')
 unittest([])
 tasks.append(t.stop())
+_vm = originalVm
 for vmbuild in ['fastdebug', 'product']:
 for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel=vmbuild):
 t = Task(str(test) + ':' + vmbuild)
 if not test.test('graal'):
 if args.jacocout is not None:
 jacocoreport([args.jacocout])
 _jacoco = 'off'
-t = Task('Checkstyle')
-if mx.checkstyle([]) != 0:
-t.abort('Checkstyle warnings were found')
-tasks.append(t.stop())
-t = Task('Canonicalization Check')
-mx.log(time.strftime('%d %b %Y %H:%M:%S - Ensuring mx/projects files are canonicalized...'))
-if mx.canonicalizeprojects([]) != 0:
-t.abort('Rerun "mx canonicalizeprojects" and check-in the modified mx/projects files.')
-tasks.append(t.stop())
 t = Task('CleanAndBuildGraalVisualizer')
 mx.run(['ant', '-f', join(_graal_home, 'visualizer', 'build.xml'), '-q', 'clean', 'build'])
 tasks.append(t.stop())
 mx.abort('-it (Iteration time) needs a numeric value (seconds)')
 vmArgs.remove('-it')
 benchArgs.remove(args[itIdx+1])
 vm = _vm;
 sanitycheck.getSPECjvm2008(benchArgs, skipCheck, skipValid, wt, it).bench(vm, opts=vmArgs)
+def specjbb2013(args):
+"""runs the composite SPECjbb2013 benchmark
+All options begining with - will be passed to the vm"""
+benchArgs = [a for a in args if a[0] != '-']
+vmArgs = [a for a in args if a[0] == '-']
+vm = _vm;
+sanitycheck.getSPECjbb2013(benchArgs).bench(vm, opts=vmArgs)
+def specjbb2005(args):
+"""runs the composite SPECjbb2005 benchmark
+All options begining with - will be passed to the vm"""
+benchArgs = [a for a in args if a[0] != '-']
+vmArgs = [a for a in args if a[0] == '-']
+vm = _vm;
+sanitycheck.getSPECjbb2005(benchArgs).bench(vm, opts=vmArgs)
 def hsdis(args, copyToDir=None):
 """download the hsdis library
 This is needed to support HotSpot's assembly dumping features.
 out = args[0]
 elif len(args) > 1:
 mx.abort('jacocoreport takes only one argument : an output directory')
 mx.run_java(['-jar', jacocoreport.get_path(True), '-in', 'jacoco.exec', '-g', join(_graal_home, 'graal'), out])
-def jar(args):
-parser = ArgumentParser(prog='mx jar');
-parser.add_argument('projects', nargs=REMAINDER, metavar='projects...')
-args = parser.parse_args(args)
-if not args.projects:
-mx.abort('Please specify at least one project to jar.')
-for pname in args.projects:
-p = mx.project(pname, fatalIfMissing=True)
-outputDir = p.output_dir()
-targetJar = join(p.dir, p.name + '.jar')
-mx.jar(targetJar, [outputDir])
 def site(args):
 """create a website containing javadoc and the project dependency graph"""
 return mx.site(['--name', 'Graal',
 '--jd', '@-tag', '--jd', '@test:X',
 'build': [build, '[-options]'],
 'buildvms': [buildvms, '[-options]'],
 'clean': [clean, ''],
 'hsdis': [hsdis, '[att]'],
 'hcfdis': [hcfdis, ''],
+'initantbuild' : [initantbuild, '[-options]'],
 'igv' : [igv, ''],
 'jdkhome': [jdkhome, ''],
 'dacapo': [dacapo, '[[n] benchmark] [VM options|@DaCapo options]'],
 'scaladacapo': [scaladacapo, '[[n] benchmark] [VM options|@Scala DaCapo options]'],
-'specjvm2008': [specjvm2008, '[VM options|@specjvm2008 options]'],
+'specjvm2008': [specjvm2008, '[VM options|specjvm2008 options (-v, -ikv, -ict, -wt, -it)]'],
-'jar': [jar, '[-options]'],
+'specjbb2013': [specjbb2013, '[VM options]'],
+'specjbb2005': [specjbb2005, '[VM options]'],
 #'example': [example, '[-v] example names...'],
 'gate' : [gate, '[-options]'],
 'gv' : [gv, ''],
 'bench' : [bench, '[-resultfile file] [all(default)|dacapo|specjvm2008|bootstrap]'],
 'unittest' : [unittest, '[filters...]'],
+'longunittest' : [longunittest, '[filters...]'],
+'shortunittest' : [shortunittest, '[filters...]'],
 'jacocoreport' : [jacocoreport, '[output directory]'],
 'site' : [site, '[-options]'],
 'vm': [vm, '[-options] class [args...]'],
 'vmg': [vmg, '[-options] class [args...]'],
 'vmfg': [vmfg, '[-options] class [args...]'],
 'build': [build, '[-options] [product|debug|fastdebug]...']
 })
 mx.commands.update(commands)
-def mx_post_parse_cmd_line(opts):
+def mx_post_parse_cmd_line(opts):#
-version = mx.java().version.split('-')[0]
+# TODO _minVersion check could probably be part of a Suite in mx?
-parts = version.split('.')
+if (mx.java().version < _minVersion) :
-assert len(parts) >= 2
+mx.abort('Requires Java version ' + str(_minVersion) + ' or greater, got version ' + str(mx.java().version))
-assert parts[0] == '1'
-major = int(parts[1])
-minor = 0
-update = 0
-if len(parts) >= 3:
-minorParts = parts[2].split('_')
-if len(minorParts) >= 1:
-minor = int(minorParts[0])
-if len(minorParts) >= 2:
-update = int(minorParts[1])
-if (not major >= 7) or (major == 7 and minor == 0 and not update >= 4) :
-mx.abort('Requires Java version 1.7.0_04 or greater, got version ' + version)
 if (_vmSourcesAvailable):
 if hasattr(opts, 'vm') and opts.vm is not None:
 global _vm
 _vm = opts.vm
 _make_eclipse_launch = getattr(opts, 'make_eclipse_launch', False)
 global _jacoco
 _jacoco = opts.jacoco
 global _native_dbg
 _native_dbg = opts.native_dbg
+mx.distribution('GRAAL').add_update_listener(_installGraalJarInJdks)

Mercurial > hg > truffle

comparison mx/commands.py @ 8506:c3657d00e343