Mercurial > hg > truffle
comparison mx/commands.py @ 11432:565724c714a7
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 26 Aug 2013 21:38:44 +0200 |
parents | ece40b452e65 |
children | 94779c895aad |
comparison
equal
deleted
inserted
replaced
11431:ca53d08b8ef9 | 11432:565724c714a7 |
---|---|
678 if vm is None: | 678 if vm is None: |
679 vm = _get_vm() | 679 vm = _get_vm() |
680 | 680 |
681 if cwd is None: | 681 if cwd is None: |
682 cwd = _vm_cwd | 682 cwd = _vm_cwd |
683 elif _vm_cwd != cwd: | 683 elif _vm_cwd is not None and _vm_cwd != cwd: |
684 mx.abort("conflicting working directories: do not set --vmcwd for this command") | 684 mx.abort("conflicting working directories: do not set --vmcwd for this command") |
685 | 685 |
686 build = vmbuild if vmbuild is not None else _vmbuild if _vmSourcesAvailable else 'product' | 686 build = vmbuild if vmbuild is not None else _vmbuild if _vmSourcesAvailable else 'product' |
687 jdk = _jdk(build, vmToCheck=vm, installGraalJar=False) | 687 jdk = _jdk(build, vmToCheck=vm, installGraalJar=False) |
688 mx.expand_project_in_args(args) | 688 mx.expand_project_in_args(args) |