comparison mx/suite.py @ 21623:d2113f5ae550

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sun, 31 May 2015 23:58:09 +0200
parents 2f92172fa320
children 35da7c00e2fa
comparison
equal deleted inserted replaced
21622:45dea3e24169 21623:d2113f5ae550
201 }, 201 },
202 202
203 "com.oracle.nfi" : { 203 "com.oracle.nfi" : {
204 "subDir" : "graal", 204 "subDir" : "graal",
205 "sourceDirs" : ["src"], 205 "sourceDirs" : ["src"],
206 "dependencies" : [], 206 "dependencies" : ["com.oracle.jvmci.service"],
207 "checkstyle" : "com.oracle.graal.graph", 207 "checkstyle" : "com.oracle.graal.graph",
208 "javaCompliance" : "1.7", 208 "javaCompliance" : "1.7",
209 }, 209 },
210 210
211 "com.oracle.nfi.test" : { 211 "com.oracle.nfi.test" : {
990 }, 990 },
991 991
992 "com.oracle.truffle.api" : { 992 "com.oracle.truffle.api" : {
993 "subDir" : "graal", 993 "subDir" : "graal",
994 "sourceDirs" : ["src"], 994 "sourceDirs" : ["src"],
995 "dependencies" : [], 995 "dependencies" : ["com.oracle.jvmci.service"],
996 "javaCompliance" : "1.7", 996 "javaCompliance" : "1.7",
997 "workingSets" : "API,Truffle", 997 "workingSets" : "API,Truffle",
998 }, 998 },
999 999
1000 "com.oracle.truffle.api.test" : { 1000 "com.oracle.truffle.api.test" : {
1299 "dependencies" : [ 1299 "dependencies" : [
1300 "com.oracle.truffle.api.dsl", 1300 "com.oracle.truffle.api.dsl",
1301 "com.oracle.nfi", 1301 "com.oracle.nfi",
1302 "com.oracle.truffle.interop", 1302 "com.oracle.truffle.interop",
1303 "com.oracle.truffle.object.basic", 1303 "com.oracle.truffle.object.basic",
1304 ],
1305 "distDependencies" : [
1306 "JVMCI_SERVICE",
1304 ], 1307 ],
1305 }, 1308 },
1306 1309
1307 "GRAAL_TRUFFLE" : { 1310 "GRAAL_TRUFFLE" : {
1308 "path" : "build/graal-truffle.jar", 1311 "path" : "build/graal-truffle.jar",