Mercurial > hg > graal-jvmci-8
changeset 23978:f553add9342f
Update and fix JDK version checks
| author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
|---|---|
| date | Fri, 02 Dec 2016 12:53:58 +0100 |
| parents | 2f5a8d1a9657 |
| children | a81ca24b52bc |
| files | mx.jvmci/mx_jvmci.py |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mx.jvmci/mx_jvmci.py Tue Nov 22 23:04:56 2016 +0100 +++ b/mx.jvmci/mx_jvmci.py Fri Dec 02 12:53:58 2016 +0100 @@ -107,10 +107,10 @@ _make_eclipse_launch = False -_minVersion = mx.VersionSpec('1.8') +_minVersion = mx.VersionSpec('1.8.0_111') # max version (first _unsupported_ version) -_untilVersion = None +_untilVersion = mx.VersionSpec('1.9') class JDKDeployedDist(object): def __init__(self, name): @@ -1414,10 +1414,10 @@ global _jvmci_bootstrap_jdk if not _jvmci_bootstrap_jdk: def _versionCheck(version): - return version >= _minVersion and (not _untilVersion or version >= _untilVersion) + return version >= _minVersion and ((not _untilVersion) or version < _untilVersion) versionDesc = ">=" + str(_minVersion) if _untilVersion: - versionDesc += " and <=" + str(_untilVersion) + versionDesc += " and <" + str(_untilVersion) _jvmci_bootstrap_jdk = mx.get_jdk(_versionCheck, versionDescription=versionDesc, tag='default') return _jvmci_bootstrap_jdk