# HG changeset patch # User Gilles Duboscq # Date 1480679638 -3600 # Node ID f553add9342f1e57a4206123b773275c10ae86d2 # Parent 2f5a8d1a96571ce9cb44ffef6be71f3040fc2714 Update and fix JDK version checks diff -r 2f5a8d1a9657 -r f553add9342f mx.jvmci/mx_jvmci.py --- 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