# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1387629185 -3600
# Node ID 020099961eb447bea3a1cc5259f446e868cc5138
# Parent  eb7bc1fd38de4e1a8fbc31d1a3bf48345fea06f6
renamed JavaVersion to VersionSpec

diff -r eb7bc1fd38de -r 020099961eb4 mx/mx_graal.py
--- a/mx/mx_graal.py	Sat Dec 21 13:28:44 2013 +0100
+++ b/mx/mx_graal.py	Sat Dec 21 13:33:05 2013 +0100
@@ -77,7 +77,7 @@
 
 _make_eclipse_launch = False
 
-_minVersion = mx.JavaVersion('1.7.0_04')
+_minVersion = mx.VersionSpec('1.7.0_04')
 
 def _get_vm():
     """
@@ -981,7 +981,7 @@
 
     for vmbuild in ['fastdebug', 'product']:
         for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel=vmbuild):
-            if 'eclipse' in str(test) and mx.java().version >= mx.JavaVersion('1.8'):
+            if 'eclipse' in str(test) and mx.java().version >= mx.VersionSpec('1.8'):
                 # DaCapo eclipse doesn't not run under JDK8
                 continue
 
@@ -1137,7 +1137,7 @@
 def igv(args):
     """run the Ideal Graph Visualizer"""
     env = os.environ.copy()
-    if mx.java().version >= mx.JavaVersion('1.8'):
+    if mx.java().version >= mx.VersionSpec('1.8'):
         jdk7 = mx.get_env('JAVA7_HOME', None)
         if jdk7:
             env['JAVA_HOME'] = jdk7
diff -r eb7bc1fd38de -r 020099961eb4 mxtool/mx.py
--- a/mxtool/mx.py	Sat Dec 21 13:28:44 2013 +0100
+++ b/mxtool/mx.py	Sat Dec 21 13:33:05 2013 +0100
@@ -720,7 +720,7 @@
                                 abort('suite name in project file does not match ' + _suitename(self.mxDir))
                         elif parts[0] == 'mxversion':
                             try:
-                                self.requiredMxVersion = JavaVersion(value)
+                                self.requiredMxVersion = VersionSpec(value)
                             except AssertionError as ae:
                                 abort('Exception while parsing "mxversion" in project file: ' + str(ae))
                         else:
@@ -1558,9 +1558,9 @@
         return cmp(self.value, other.value)
 
 """
-A Java version as defined in JSR-56
+A version specification as defined in JSR-56
 """
-class JavaVersion:
+class VersionSpec:
     def __init__(self, versionString):
         validChar = r'[\x21-\x25\x27-\x29\x2c\x2f-\x5e\x60-\x7f]'
         separator = r'[.\-_]'
@@ -1612,7 +1612,7 @@
 
         output = output.split()
         assert output[1] == 'version'
-        self.version = JavaVersion(output[2].strip('"'))
+        self.version = VersionSpec(output[2].strip('"'))
         self.javaCompliance = JavaCompliance(self.version.versionString)
 
         if self.debug_port is not None:
@@ -4528,7 +4528,7 @@
         # no need to show the stack trace when the user presses CTRL-C
         abort(1)
 
-version = JavaVersion("1.0")
+version = VersionSpec("1.0")
 
 if __name__ == '__main__':
     # rename this module as 'mx' so it is not imported twice by the commands.py modules