Mercurial > hg > truffle
changeset 15576:0c0b479903bb
mx trufflejar: use distribution feature of mx instead (`mx archive @TRUFFLE')
| author | Bernhard Urban <bernhard.urban@jku.at> |
|---|---|
| date | Fri, 09 May 2014 13:56:10 +0200 |
| parents | cb2f3c49deb2 |
| children | 406a94c03ffa |
| files | mx/mx_graal.py mx/projects |
| diffstat | 2 files changed, 5 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/mx/mx_graal.py Fri May 09 13:21:43 2014 +0200 +++ b/mx/mx_graal.py Fri May 09 13:56:10 2014 +0200 @@ -1799,20 +1799,6 @@ vmArgs, slArgs = _extract_VM_args(args) vm(vmArgs + ['-cp', mx.classpath("com.oracle.truffle.sl"), "com.oracle.truffle.sl.SLMain"] + slArgs) -def trufflejar(args=None): - """make truffle.jar""" - - # Test with the built classes - _unittest(["com.oracle.truffle.api.test", "com.oracle.truffle.api.dsl.test"], ['@Test', '@Parameters']) - - # We use the DSL processor as the starting point for the classpath - this - # therefore includes the DSL processor, the DSL and the API. - packagejar(mx.classpath("com.oracle.truffle.dsl.processor").split(os.pathsep), "truffle.jar", None, "com.oracle.truffle.dsl.processor.TruffleProcessor") - - # Test with the JAR - _unittest(["com.oracle.truffle.api.test", "com.oracle.truffle.api.dsl.test"], ['@Test', '@Parameters'], "truffle.jar:") - - def isGraalEnabled(vm): return vm != 'original' and not vm.endswith('nograal') @@ -2042,8 +2028,7 @@ 'vmfg': [vmfg, '[-options] class [args...]'], 'deoptalot' : [deoptalot, '[n]'], 'longtests' : [longtests, ''], - 'sl' : [sl, '[SL args|@VM options]'], - 'trufflejar' : [trufflejar, ''] + 'sl' : [sl, '[SL args|@VM options]'] } mx.add_argument('--jacoco', help='instruments com.oracle.* classes using JaCoCo', default='off', choices=['off', 'on', 'append'])
--- a/mx/projects Fri May 09 13:21:43 2014 +0200 +++ b/mx/projects Fri May 09 13:56:10 2014 +0200 @@ -78,6 +78,10 @@ com.oracle.graal.hotspot.hsail distribution@GRAAL@excludeLibs=FINDBUGS +distribution@TRUFFLE@path=truffle.jar +distribution@TRUFFLE@dependencies=\ +com.oracle.truffle.dsl.processor + # graal.api.collections project@com.oracle.graal.api.collections@subDir=graal project@com.oracle.graal.api.collections@sourceDirs=src