Mercurial > hg > graal-jvmci-8
comparison mx/mx_graal.py @ 21975:290a87b718e1
mx: Use purpose while selecting jdk for IGV and projects. Make jdk selection messages nicer
author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
---|---|
date | Thu, 11 Jun 2015 16:17:16 +0200 |
parents | 647459c6013a |
children | 36e37644f91e |
comparison
equal
deleted
inserted
replaced
21974:7a0c8adc0a30 | 21975:290a87b718e1 |
---|---|
1806 v8u20 = mx.VersionSpec("1.8.0_20") | 1806 v8u20 = mx.VersionSpec("1.8.0_20") |
1807 v8u40 = mx.VersionSpec("1.8.0_40") | 1807 v8u40 = mx.VersionSpec("1.8.0_40") |
1808 v8 = mx.VersionSpec("1.8") | 1808 v8 = mx.VersionSpec("1.8") |
1809 def _igvJdkVersionCheck(version): | 1809 def _igvJdkVersionCheck(version): |
1810 return version >= v8 and (version < v8u20 or version >= v8u40) | 1810 return version >= v8 and (version < v8u20 or version >= v8u40) |
1811 return mx.java_version(_igvJdkVersionCheck, versionDescription='>= 1.8 and < 1.8.0u20 or >= 1.8.0u40').jdk | 1811 return mx.java_version(_igvJdkVersionCheck, versionDescription='>= 1.8 and < 1.8.0u20 or >= 1.8.0u40', purpose="building & running IGV").jdk |
1812 | 1812 |
1813 def _igvBuildEnv(): | 1813 def _igvBuildEnv(): |
1814 # When the http_proxy environment variable is set, convert it to the proxy settings that ant needs | 1814 # When the http_proxy environment variable is set, convert it to the proxy settings that ant needs |
1815 env = dict(os.environ) | 1815 env = dict(os.environ) |
1816 proxy = os.environ.get('http_proxy') | 1816 proxy = os.environ.get('http_proxy') |