# HG changeset patch # User Bernhard Urban # Date 1399636570 -7200 # Node ID 0c0b479903bb5b1ce0d0ae8482a78106f6aec253 # Parent cb2f3c49deb24735e6fbd77c3192bd6ed344e686 mx trufflejar: use distribution feature of mx instead (`mx archive @TRUFFLE') diff -r cb2f3c49deb2 -r 0c0b479903bb mx/mx_graal.py --- 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']) diff -r cb2f3c49deb2 -r 0c0b479903bb mx/projects --- 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