Mercurial > hg > graal-jvmci-8
comparison mx/projects @ 12432:90494fdf11c8
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Tue, 15 Oct 2013 23:06:27 +0200 |
parents | 5124eeec1a7b c1910f6400d7 |
children | f87c68d79f07 |
comparison
equal
deleted
inserted
replaced
12431:7080a96be216 | 12432:90494fdf11c8 |
---|---|
26 | 26 |
27 library@OKRA@path=lib/okra-1.2.jar | 27 library@OKRA@path=lib/okra-1.2.jar |
28 library@OKRA@urls=http://cr.openjdk.java.net/~tdeneau/okra-1.2.jar | 28 library@OKRA@urls=http://cr.openjdk.java.net/~tdeneau/okra-1.2.jar |
29 | 29 |
30 distribution@GRAAL@path=graal.jar | 30 distribution@GRAAL@path=graal.jar |
31 distribution@GRAAL@dependencies=com.oracle.graal.hotspot.amd64,com.oracle.graal.hotspot.ptx,com.oracle.graal.truffle,com.oracle.graal.truffle.printer,com.oracle.graal.hotspot.sparc,com.oracle.graal.hotspot,com.oracle.graal.hotspot.hsail | 31 distribution@GRAAL@dependencies=com.oracle.graal.hotspot.amd64,com.oracle.graal.hotspot.ptx,com.oracle.graal.truffle,com.oracle.graal.hotspot.sparc,com.oracle.graal.hotspot,com.oracle.graal.compiler.hsail |
32 | 32 |
33 # graal.api.runtime | 33 # graal.api.runtime |
34 project@com.oracle.graal.api.runtime@subDir=graal | 34 project@com.oracle.graal.api.runtime@subDir=graal |
35 project@com.oracle.graal.api.runtime@sourceDirs=src | 35 project@com.oracle.graal.api.runtime@sourceDirs=src |
36 project@com.oracle.graal.api.runtime@checkstyle=com.oracle.graal.graph | 36 project@com.oracle.graal.api.runtime@checkstyle=com.oracle.graal.graph |
620 project@com.oracle.truffle.sl.test@workingSets=Truffle,SimpleLanguage,Test | 620 project@com.oracle.truffle.sl.test@workingSets=Truffle,SimpleLanguage,Test |
621 | 621 |
622 # graal.truffle | 622 # graal.truffle |
623 project@com.oracle.graal.truffle@subDir=graal | 623 project@com.oracle.graal.truffle@subDir=graal |
624 project@com.oracle.graal.truffle@sourceDirs=src | 624 project@com.oracle.graal.truffle@sourceDirs=src |
625 project@com.oracle.graal.truffle@dependencies=com.oracle.truffle.api,com.oracle.graal.truffle.printer,com.oracle.graal.hotspot | 625 project@com.oracle.graal.truffle@dependencies=com.oracle.truffle.api,com.oracle.graal.hotspot |
626 project@com.oracle.graal.truffle@checkstyle=com.oracle.graal.graph | 626 project@com.oracle.graal.truffle@checkstyle=com.oracle.graal.graph |
627 project@com.oracle.graal.truffle@javaCompliance=1.7 | 627 project@com.oracle.graal.truffle@javaCompliance=1.7 |
628 project@com.oracle.graal.truffle@workingSets=Graal,Truffle | 628 project@com.oracle.graal.truffle@workingSets=Graal,Truffle |
629 | 629 |
630 # graal.truffle.test | 630 # graal.truffle.test |
633 project@com.oracle.graal.truffle.test@dependencies=com.oracle.graal.truffle,com.oracle.graal.compiler.test | 633 project@com.oracle.graal.truffle.test@dependencies=com.oracle.graal.truffle,com.oracle.graal.compiler.test |
634 project@com.oracle.graal.truffle.test@checkstyle=com.oracle.graal.graph | 634 project@com.oracle.graal.truffle.test@checkstyle=com.oracle.graal.graph |
635 project@com.oracle.graal.truffle.test@javaCompliance=1.7 | 635 project@com.oracle.graal.truffle.test@javaCompliance=1.7 |
636 project@com.oracle.graal.truffle.test@workingSets=Graal,Truffle,Test | 636 project@com.oracle.graal.truffle.test@workingSets=Graal,Truffle,Test |
637 | 637 |
638 # graal.truffle.printer | 638 |
639 project@com.oracle.graal.truffle.printer@subDir=graal | |
640 project@com.oracle.graal.truffle.printer@sourceDirs=src | |
641 project@com.oracle.graal.truffle.printer@dependencies=com.oracle.graal.nodes | |
642 project@com.oracle.graal.truffle.printer@checkstyle=com.oracle.graal.graph | |
643 project@com.oracle.graal.truffle.printer@javaCompliance=1.7 | |
644 project@com.oracle.graal.truffle.printer@workingSets=Graal,Truffle | |
645 | |
646 |