Mercurial > hg > truffle

comparison mx/mx_graal.py @ 20805:379471b334cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Lift 8u40 mx restriction
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Tue, 07 Apr 2015 15:00:39 +0200
parents 6e5df2d60fbd
children 10766b486cbb
comparison
equal deleted inserted replaced
20804:7848fc12602b 20805:379471b334cb
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 85
86 # max version (first _unsupported_ version) 86 # max version (first _unsupported_ version)
87 _untilVersion = mx.VersionSpec('1.8.0_40') 87 _untilVersion = None
88 88
89 class JDKDeployedDist: 89 class JDKDeployedDist:
90 def __init__(self, name, isExtension): 90 def __init__(self, name, isExtension):
91 self.name = name 91 self.name = name
92 self.isExtension = isExtension 92 self.isExtension = isExtension
2529 2529
2530 def mx_post_parse_cmd_line(opts): # 2530 def mx_post_parse_cmd_line(opts): #
2531 # 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?
2532 if mx.java().version < _minVersion: 2532 if mx.java().version < _minVersion:
2533 mx.abort('Requires Java version ' + str(_minVersion) + ' or greater for JAVA_HOME, 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: 2534 if _untilVersion and mx.java().version >= _untilVersion:
2535 mx.abort('Requires Java version strictly before ' + str(_untilVersion) + ' for JAVA_HOME, got version ' + str(mx.java().version)) 2535 mx.abort('Requires Java version strictly before ' + str(_untilVersion) + ' for JAVA_HOME, got version ' + str(mx.java().version))
2536 2536
2537 if _vmSourcesAvailable: 2537 if _vmSourcesAvailable:
2538 if hasattr(opts, 'vm') and opts.vm is not None: 2538 if hasattr(opts, 'vm') and opts.vm is not None:
2539 global _vm 2539 global _vm