# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1433174652 -7200
# Node ID 11f68b116a07182b9a4a67c034ad5a6ef8bd063c
# Parent  e65bf81961be3f8c0c6015157b6aced9467c5d2d
mx: added support for server-nograal and client-nograal aliases

diff -r e65bf81961be -r 11f68b116a07 .hgignore
--- a/.hgignore	Mon Jun 01 17:20:51 2015 +0200
+++ b/.hgignore	Mon Jun 01 18:04:12 2015 +0200
@@ -11,6 +11,7 @@
 ^mx/includes
 ^build/
 ^build-nograal/
+^build-nojvmci/
 ^dist/
 ^java/
 ^lib/
diff -r e65bf81961be -r 11f68b116a07 mx/mx_graal.py
--- a/mx/mx_graal.py	Mon Jun 01 17:20:51 2015 +0200
+++ b/mx/mx_graal.py	Mon Jun 01 18:04:12 2015 +0200
@@ -54,6 +54,8 @@
     'client-nojvmci' : None,  # all compilation with client compiler, JVMCI omitted
     'original' : None,  # default VM copied from bootstrap JDK
     'graal' : None, # alias for jvmci
+    'server-nograal' : None,  # alias for server-nojvmci
+    'client-nograal' : None,  # alias for client-nojvmci
 }
 
 """ The VM that will be run by the 'vm' command and built by default by the 'build' command.
@@ -121,12 +123,12 @@
         return _vm
     vm = mx.get_env('DEFAULT_VM')
     envPath = join(_graal_home, 'mx', 'env')
-    if vm == 'graal':
+    if vm and 'graal' in vm:
         if exists(envPath):
             with open(envPath) as fp:
-                if 'DEFAULT_VM=graal' in fp.read():
-                    mx.log('Please update the DEFAULT_VM entry in ' + envPath + ' to use "jvmci" instead of "graal" as the value')
-        vm = 'jvmci'
+                if ('DEFAULT_VM=' + vm) in fp.read():
+                    mx.log('Please update the DEFAULT_VM value in ' + envPath + ' to replace "graal" with "jvmci"')
+        vm = vm.replace('graal', 'jvmci')
     if vm is None:
         if not mx.is_interactive():
             mx.abort('Need to specify VM with --vm option or DEFAULT_VM environment variable')
@@ -2662,8 +2664,7 @@
         if hasattr(opts, 'vm') and opts.vm is not None:
             global _vm
             _vm = opts.vm
-            if _vm == 'graal':
-                _vm = 'jvmci'
+            _vm = _vm.replace('graal', 'jvmci')
         if hasattr(opts, 'vmbuild') and opts.vmbuild is not None:
             global _vmbuild
             _vmbuild = opts.vmbuild