# HG changeset patch
# User Gilles Duboscq <gilles.m.duboscq@oracle.com>
# Date 1434032236 -7200
# Node ID 290a87b718e1765749d349f03d2704781a7a70cd
# Parent  7a0c8adc0a303cb0b788b4a386bd6bad3b5dfe1a
mx: Use purpose while selecting jdk for IGV and projects. Make jdk selection messages nicer

diff -r 7a0c8adc0a30 -r 290a87b718e1 mx/mx_graal.py
--- a/mx/mx_graal.py	Thu Jun 11 15:38:42 2015 +0200
+++ b/mx/mx_graal.py	Thu Jun 11 16:17:16 2015 +0200
@@ -1808,7 +1808,7 @@
     v8 = mx.VersionSpec("1.8")
     def _igvJdkVersionCheck(version):
         return version >= v8 and (version < v8u20 or version >= v8u40)
-    return mx.java_version(_igvJdkVersionCheck, versionDescription='>= 1.8 and < 1.8.0u20 or >= 1.8.0u40').jdk
+    return mx.java_version(_igvJdkVersionCheck, versionDescription='>= 1.8 and < 1.8.0u20 or >= 1.8.0u40', purpose="building & running IGV").jdk
 
 def _igvBuildEnv():
         # When the http_proxy environment variable is set, convert it to the proxy settings that ant needs
diff -r 7a0c8adc0a30 -r 290a87b718e1 mxtool/mx.py
--- 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