Mercurial > hg > truffle
diff mx/mx_graal.py @ 20107:2c65cac3d940
Merge with 7815c4d4a07f92d10d27a180f32e0dbc8ca15d44
| author | Michael Van De Vanter <michael.van.de.vanter@oracle.com> |
|---|---|
| date | Tue, 31 Mar 2015 19:15:45 -0700 |
| parents | 6e5df2d60fbd |
| children | 379471b334cb |
line wrap: on
line diff
--- a/mx/mx_graal.py Tue Mar 31 19:01:07 2015 -0700 +++ b/mx/mx_graal.py Tue Mar 31 19:15:45 2015 -0700 @@ -83,6 +83,9 @@ _minVersion = mx.VersionSpec('1.8') +# max version (first _unsupported_ version) +_untilVersion = mx.VersionSpec('1.8.0_40') + class JDKDeployedDist: def __init__(self, name, isExtension): self.name = name @@ -2527,7 +2530,9 @@ def mx_post_parse_cmd_line(opts): # # TODO _minVersion check could probably be part of a Suite in mx? if mx.java().version < _minVersion: - mx.abort('Requires Java version ' + str(_minVersion) + ' or greater, got version ' + str(mx.java().version)) + mx.abort('Requires Java version ' + str(_minVersion) + ' or greater for JAVA_HOME, got version ' + str(mx.java().version)) + if mx.java().version >= _untilVersion: + mx.abort('Requires Java version strictly before ' + str(_untilVersion) + ' for JAVA_HOME, got version ' + str(mx.java().version)) if _vmSourcesAvailable: if hasattr(opts, 'vm') and opts.vm is not None: