# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1360776834 -3600
# Node ID dbbe8ce3bfa53b1fa7ee631e8ba04464ea51d27a
# Parent  2865133eeef20856055778c9399d354eb38be74c
commands: accept 'server0' as a vm, accept version number which have '-...' suffix (-internal, -ea...)

diff -r 2865133eeef2 -r dbbe8ce3bfa5 mx/commands.py
--- a/mx/commands.py	Wed Feb 13 16:21:35 2013 +0100
+++ b/mx/commands.py	Wed Feb 13 18:33:54 2013 +0100
@@ -1152,7 +1152,7 @@
     mx.add_argument('--jacoco', help='instruments com.oracle.* classes using JaCoCo', default='off', choices=['off', 'on', 'append'])
 
     if (_vmSourcesAvailable):
-        mx.add_argument('--vm', action='store', dest='vm', default='graal', choices=['graal', 'server', 'client'], help='the VM to build/run (default: graal)')
+        mx.add_argument('--vm', action='store', dest='vm', default='graal', choices=['graal', 'server', 'client', 'server0'], help='the VM to build/run (default: graal)')
         mx.add_argument('--product', action='store_const', dest='vmbuild', const='product', help='select the product build of the VM')
         mx.add_argument('--debug', action='store_const', dest='vmbuild', const='debug', help='select the debug build of the VM')
         mx.add_argument('--fastdebug', action='store_const', dest='vmbuild', const='fastdebug', help='select the fast debug build of the VM')
@@ -1169,7 +1169,7 @@
     mx.commands.update(commands)
 
 def mx_post_parse_cmd_line(opts):
-    version = mx.java().version
+    version = mx.java().version.split('-')[0]
     parts = version.split('.')
     assert len(parts) >= 2
     assert parts[0] == '1'