Mercurial > hg > truffle
diff mx/projects @ 4358:3d8e80de2c29
Merge.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Fri, 20 Jan 2012 15:08:24 +0100 |
| parents | 685cbfb8e08e 874fcc2ddd9d |
| children | 7d6490436b57 |
line wrap: on
line diff
--- a/mx/projects Fri Jan 20 14:58:51 2012 +0100 +++ b/mx/projects Fri Jan 20 15:08:24 2012 +0100 @@ -44,7 +44,7 @@ # graal.hotspot project@com.oracle.max.graal.hotspot@subDir=graal project@com.oracle.max.graal.hotspot@sourceDirs=src -project@com.oracle.max.graal.hotspot@dependencies=com.oracle.max.graal.snippets,com.oracle.max.asmdis +project@com.oracle.max.graal.hotspot@dependencies=com.oracle.max.graal.snippets project@com.oracle.max.graal.hotspot@checkstyle=com.oracle.max.graal.graph # graal.graph @@ -99,18 +99,6 @@ project@com.oracle.max.asm@dependencies=com.oracle.max.criutils project@com.oracle.max.asm@checkstyle=com.oracle.max.graal.graph -# max.base -project@com.oracle.max.base@subDir=graal -project@com.oracle.max.base@sourceDirs=src,test -project@com.oracle.max.base@dependencies=JUNIT -project@com.oracle.max.base@checkstyle=com.oracle.max.graal.graph - -# max.asmdis -project@com.oracle.max.asmdis@subDir=graal -project@com.oracle.max.asmdis@sourceDirs=src,test -project@com.oracle.max.asmdis@dependencies=com.oracle.max.base -project@com.oracle.max.asmdis@checkstyle=com.oracle.max.graal.graph - # max.cri project@com.oracle.max.cri@subDir=graal project@com.oracle.max.cri@sourceDirs=src