Mercurial > hg > graal-compiler
diff mxtool/mx.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 | 7a0c8adc0a30 |
| children | 36e37644f91e |
line wrap: on
line diff
--- a/mxtool/mx.py Thu Jun 11 15:38:42 2015 +0200 +++ b/mxtool/mx.py Thu Jun 11 16:17:16 2015 +0200 @@ -1276,7 +1276,7 @@ del _libs[d.name] self.libs.remove(d) elif d.isProject(): - if java(d.javaCompliance, cancel='some projects will be omitted which may result in errors') is None: + if java(d.javaCompliance, cancel='some projects will be omitted which may result in errors', purpose="building projects with compliance " + str(d.javaCompliance)) is None: logv('[omitting project {0} as Java compliance {1} cannot be satisfied by configured JDKs]'.format(d, d.javaCompliance)) ommittedDeps.add(d.name) del _projects[d.name] @@ -1905,10 +1905,10 @@ if not is_interactive(): msg = "Multiple possible choices for a JDK" if purpose: - msg += ' for' + purpose + msg += ' for ' + purpose msg += ': ' if versionDescription: - msg += '(' + versionDescription + ')' + msg += '(version ' + versionDescription + ')' selected = configs[0] msg += ". Selecting " + str(selected) log(msg) @@ -1918,10 +1918,10 @@ msg += 'default ' msg += 'JDK' if purpose: - msg += ' for' + purpose + msg += ' for ' + purpose msg += ': ' if versionDescription: - msg += '(' + versionDescription + ')' + msg += '(version ' + versionDescription + ')' log(msg) choices = configs + ['<other>'] if cancel: @@ -1940,15 +1940,15 @@ if versionDescription: msg = msg + ' ' + versionDescription if purpose: - msg += ' for' + purpose + msg += ' for ' + purpose log(msg) else: msg = 'Could not find any JDK' if purpose: - msg += ' for' + purpose + msg += ' for ' + purpose msg += ' ' if versionDescription: - msg = msg + '(' + versionDescription + ')' + msg = msg + '(version ' + versionDescription + ')' log(msg) selected = None