Mercurial > hg > truffle
diff mx/projects @ 15213:ff0283a98b7a
Merge.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Thu, 17 Apr 2014 17:40:39 +0200 |
| parents | 2f97d638c7af |
| children | 2c0cfbf454b5 |
line wrap: on
line diff
--- a/mx/projects Thu Apr 17 17:40:20 2014 +0200 +++ b/mx/projects Thu Apr 17 17:40:39 2014 +0200 @@ -253,7 +253,7 @@ # graal.graph project@com.oracle.graal.graph@subDir=graal project@com.oracle.graal.graph@sourceDirs=src -project@com.oracle.graal.graph@dependencies=com.oracle.graal.debug,com.oracle.graal.api.code,FINDBUGS +project@com.oracle.graal.graph@dependencies=com.oracle.graal.debug,com.oracle.graal.api.code,com.oracle.graal.compiler.common,FINDBUGS project@com.oracle.graal.graph@javaCompliance=1.8 project@com.oracle.graal.graph@workingSets=Graal,Graph @@ -373,7 +373,7 @@ # graal.nodes project@com.oracle.graal.nodes@subDir=graal project@com.oracle.graal.nodes@sourceDirs=src -project@com.oracle.graal.nodes@dependencies=com.oracle.graal.graph,com.oracle.graal.api.replacements,com.oracle.graal.cfg +project@com.oracle.graal.nodes@dependencies=com.oracle.graal.graph,com.oracle.graal.api.replacements project@com.oracle.graal.nodes@checkstyle=com.oracle.graal.graph project@com.oracle.graal.nodes@javaCompliance=1.8 project@com.oracle.graal.nodes@annotationProcessors=com.oracle.graal.replacements.verifier @@ -499,13 +499,13 @@ project@com.oracle.graal.java@javaCompliance=1.8 project@com.oracle.graal.java@workingSets=Graal,Java -# graal.cfg -project@com.oracle.graal.cfg@subDir=graal -project@com.oracle.graal.cfg@sourceDirs=src -project@com.oracle.graal.cfg@dependencies= -project@com.oracle.graal.cfg@checkstyle=com.oracle.graal.graph -project@com.oracle.graal.cfg@javaCompliance=1.8 -project@com.oracle.graal.cfg@workingSets=Graal,Java +# graal.compiler.common +project@com.oracle.graal.compiler.common@subDir=graal +project@com.oracle.graal.compiler.common@sourceDirs=src +project@com.oracle.graal.compiler.common@dependencies= +project@com.oracle.graal.compiler.common@checkstyle=com.oracle.graal.graph +project@com.oracle.graal.compiler.common@javaCompliance=1.8 +project@com.oracle.graal.compiler.common@workingSets=Graal,Java # graal.baseline project@com.oracle.graal.baseline@subDir=graal @@ -640,7 +640,7 @@ # graal.asm.hsail project@com.oracle.graal.asm.hsail@subDir=graal project@com.oracle.graal.asm.hsail@sourceDirs=src -project@com.oracle.graal.asm.hsail@dependencies=com.oracle.graal.hsail,OKRA,com.oracle.graal.asm,com.oracle.graal.graph +project@com.oracle.graal.asm.hsail@dependencies=com.oracle.graal.hsail,OKRA,com.oracle.graal.asm,com.oracle.graal.compiler.common project@com.oracle.graal.asm.hsail@checkstyle=com.oracle.graal.graph project@com.oracle.graal.asm.hsail@javaCompliance=1.8