Mercurial > hg > truffle

comparison mx/mx_graal.py @ 20102:6e5df2d60fbd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mx: fix compliance check for EXTRA_JAVA_HOMES, add maximum JAVA_HOME version in mx_graal
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Tue, 31 Mar 2015 14:35:17 +0200
parents 4d119424b4ce
children 379471b334cb
comparison
equal deleted inserted replaced
20101:178814b064a7 20102:6e5df2d60fbd
80 _vm_prefix = None 80 _vm_prefix = None
81 81
82 _make_eclipse_launch = False 82 _make_eclipse_launch = False
83 83
84 _minVersion = mx.VersionSpec('1.8') 84 _minVersion = mx.VersionSpec('1.8')
85
86 # max version (first _unsupported_ version)
87 _untilVersion = mx.VersionSpec('1.8.0_40')
85 88
86 class JDKDeployedDist: 89 class JDKDeployedDist:
87 def __init__(self, name, isExtension): 90 def __init__(self, name, isExtension):
88 self.name = name 91 self.name = name
89 self.isExtension = isExtension 92 self.isExtension = isExtension
2525 mx.update_commands(suite, commands) 2528 mx.update_commands(suite, commands)
2526 2529
2527 def mx_post_parse_cmd_line(opts): # 2530 def mx_post_parse_cmd_line(opts): #
2528 # TODO _minVersion check could probably be part of a Suite in mx? 2531 # TODO _minVersion check could probably be part of a Suite in mx?
2529 if mx.java().version < _minVersion: 2532 if mx.java().version < _minVersion:
2530 mx.abort('Requires Java version ' + str(_minVersion) + ' or greater, got version ' + str(mx.java().version)) 2533 mx.abort('Requires Java version ' + str(_minVersion) + ' or greater for JAVA_HOME, got version ' + str(mx.java().version))
2534 if mx.java().version >= _untilVersion:
2535 mx.abort('Requires Java version strictly before ' + str(_untilVersion) + ' for JAVA_HOME, got version ' + str(mx.java().version))
2531 2536
2532 if _vmSourcesAvailable: 2537 if _vmSourcesAvailable:
2533 if hasattr(opts, 'vm') and opts.vm is not None: 2538 if hasattr(opts, 'vm') and opts.vm is not None:
2534 global _vm 2539 global _vm
2535 _vm = opts.vm 2540 _vm = opts.vm