Mercurial > hg > truffle

comparison mx/commands.py @ 11493:94779c895aad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed documentation of --installed-jdks mx option
author Doug Simon <doug.simon@oracle.com>
date Sat, 31 Aug 2013 09:18:42 +0200
parents ece40b452e65
children 3110bea9a6b0
comparison
equal deleted inserted replaced
11492:a4163e660a1b 11493:94779c895aad
284 answer = raw_input('Build it now? [Yn]: ') 284 answer = raw_input('Build it now? [Yn]: ')
285 if not answer.lower().startswith('n'): 285 if not answer.lower().startswith('n'):
286 with VM(vm, bld): 286 with VM(vm, bld):
287 build([]) 287 build([])
288 return 288 return
289 mx.abort('You need to run "mx --vm ' + vm + '--vmbuild ' + bld + ' build" to build the selected VM') 289 mx.abort('You need to run "mx --vm ' + vm + ' --vmbuild ' + bld + ' build" to build the selected VM')
290 290
291 def _jdk(build='product', vmToCheck=None, create=False, installGraalJar=True): 291 def _jdk(build='product', vmToCheck=None, create=False, installGraalJar=True):
292 """ 292 """
293 Get the JDK into which Graal is installed, creating it first if necessary. 293 Get the JDK into which Graal is installed, creating it first if necessary.
294 """ 294 """
1356 1356
1357 mx.add_argument('--jacoco', help='instruments com.oracle.* classes using JaCoCo', default='off', choices=['off', 'on', 'append']) 1357 mx.add_argument('--jacoco', help='instruments com.oracle.* classes using JaCoCo', default='off', choices=['off', 'on', 'append'])
1358 mx.add_argument('--vmcwd', dest='vm_cwd', help='current directory will be changed to <path> before the VM is executed', default=None, metavar='<path>') 1358 mx.add_argument('--vmcwd', dest='vm_cwd', help='current directory will be changed to <path> before the VM is executed', default=None, metavar='<path>')
1359 mx.add_argument('--installed-jdks', help='the base directory in which the JDKs cloned from $JAVA_HOME exist. ' + 1359 mx.add_argument('--installed-jdks', help='the base directory in which the JDKs cloned from $JAVA_HOME exist. ' +
1360 'The VM selected by --vm and --vmbuild options is under this directory (i.e., ' + 1360 'The VM selected by --vm and --vmbuild options is under this directory (i.e., ' +
1361 join('<path>', '<vmbuild>', 'jre', 'lib', '<vm>', mx.add_lib_prefix(mx.add_lib_suffix('jvm'))) + ')', default=None, metavar='<path>') 1361 join('<path>', '<jdk-version>', '<vmbuild>', 'jre', 'lib', '<vm>', mx.add_lib_prefix(mx.add_lib_suffix('jvm'))) + ')', default=None, metavar='<path>')
1362 1362
1363 if (_vmSourcesAvailable): 1363 if (_vmSourcesAvailable):
1364 mx.add_argument('--vm', action='store', dest='vm', choices=_vmChoices.keys(), help='the VM type to build/run') 1364 mx.add_argument('--vm', action='store', dest='vm', choices=_vmChoices.keys(), help='the VM type to build/run')
1365 mx.add_argument('--vmbuild', action='store', dest='vmbuild', choices=_vmbuildChoices, help='the VM build to build/run (default: ' + _vmbuildChoices[0] +')') 1365 mx.add_argument('--vmbuild', action='store', dest='vmbuild', choices=_vmbuildChoices, help='the VM build to build/run (default: ' + _vmbuildChoices[0] +')')
1366 mx.add_argument('--ecl', action='store_true', dest='make_eclipse_launch', help='create launch configuration for running VM execution(s) in Eclipse') 1366 mx.add_argument('--ecl', action='store_true', dest='make_eclipse_launch', help='create launch configuration for running VM execution(s) in Eclipse')