comparison mx/suite.py @ 21677:7a8a5bb5ec56

Merge.
author Chris Seaton <chris.seaton@oracle.com>
date Wed, 03 Jun 2015 00:06:34 +0100
parents 90bccd2369d9 2e8c01def9a5
children 729e6acde6c0
comparison
equal deleted inserted replaced
21676:90bccd2369d9 21677:7a8a5bb5ec56
151 "jar" : "jfr.jar", 151 "jar" : "jfr.jar",
152 } 152 }
153 }, 153 },
154 154
155 "projects" : { 155 "projects" : {
156
157 # ------------- JVMCI -------------
158
156 "com.oracle.jvmci.service" : { 159 "com.oracle.jvmci.service" : {
157 "subDir" : "graal", 160 "subDir" : "graal",
158 "sourceDirs" : ["src"], 161 "sourceDirs" : ["src"],
159 "checkstyle" : "com.oracle.graal.graph", 162 "checkstyle" : "com.oracle.graal.graph",
160 "javaCompliance" : "1.8", 163 "javaCompliance" : "1.8",
161 "workingSets" : "API,Graal", 164 "workingSets" : "API,JVMCI",
165 },
166
167 "com.oracle.jvmci.service.processor" : {
168 "subDir" : "graal",
169 "sourceDirs" : ["src"],
170 "dependencies" : ["com.oracle.jvmci.service"],
171 "checkstyle" : "com.oracle.graal.graph",
172 "javaCompliance" : "1.8",
173 "workingSets" : "JVMCI,Codegen,HotSpot",
162 }, 174 },
163 175
164 "com.oracle.jvmci.common" : { 176 "com.oracle.jvmci.common" : {
165 "subDir" : "graal", 177 "subDir" : "graal",
166 "sourceDirs" : ["src"], 178 "sourceDirs" : ["src"],
179 "checkstyle" : "com.oracle.graal.graph",
180 "javaCompliance" : "1.8",
181 "workingSets" : "API,JVMCI",
182 },
183
184 "com.oracle.jvmci.meta" : {
185 "subDir" : "graal",
186 "sourceDirs" : ["src"],
187 "checkstyle" : "com.oracle.graal.graph",
188 "javaCompliance" : "1.8",
189 "workingSets" : "API,JVMCI",
190 },
191
192 "com.oracle.jvmci.code" : {
193 "subDir" : "graal",
194 "sourceDirs" : ["src"],
195 "dependencies" : ["com.oracle.jvmci.meta"],
167 "checkstyle" : "com.oracle.graal.graph", 196 "checkstyle" : "com.oracle.graal.graph",
168 "javaCompliance" : "1.8", 197 "javaCompliance" : "1.8",
169 "workingSets" : "API,JVMCI", 198 "workingSets" : "API,JVMCI",
170 }, 199 },
171 200
211 "checkstyle" : "com.oracle.graal.graph", 240 "checkstyle" : "com.oracle.graal.graph",
212 "javaCompliance" : "1.8", 241 "javaCompliance" : "1.8",
213 "workingSets" : "JVMCI", 242 "workingSets" : "JVMCI",
214 }, 243 },
215 244
245 "com.oracle.jvmci.hotspotvmconfig" : {
246 "subDir" : "graal",
247 "sourceDirs" : ["src"],
248 "checkstyle" : "com.oracle.graal.graph",
249 "javaCompliance" : "1.8",
250 "workingSets" : "JVMCI,HotSpot",
251 },
252
253 "com.oracle.jvmci.hotspotvmconfig.processor" : {
254 "subDir" : "graal",
255 "sourceDirs" : ["src"],
256 "dependencies" : ["com.oracle.jvmci.hotspotvmconfig", "com.oracle.jvmci.common"],
257 "checkstyle" : "com.oracle.graal.graph",
258 "javaCompliance" : "1.8",
259 "workingSets" : "JVMCI,HotSpot,Codegen",
260 },
261
262 "com.oracle.jvmci.debug" : {
263 "subDir" : "graal",
264 "sourceDirs" : ["src"],
265 "checkstyle" : "com.oracle.graal.graph",
266 "dependencies" : [
267 "com.oracle.jvmci.service",
268 ],
269 "javaCompliance" : "1.8",
270 "workingSets" : "JVMCI,Debug",
271 },
272
273 "com.oracle.jvmci.debug.test" : {
274 "subDir" : "graal",
275 "sourceDirs" : ["src"],
276 "dependencies" : [
277 "JUNIT",
278 "com.oracle.jvmci.debug",
279 ],
280 "checkstyle" : "com.oracle.graal.graph",
281 "javaCompliance" : "1.8",
282 "workingSets" : "JVMCI,Debug,Test",
283 },
284
285 "com.oracle.jvmci.options" : {
286 "subDir" : "graal",
287 "sourceDirs" : ["src"],
288 "dependencies" : [
289 "com.oracle.jvmci.service",
290 ],
291 "checkstyle" : "com.oracle.graal.graph",
292 "javaCompliance" : "1.8",
293 "workingSets" : "JVMCI",
294 },
295
296 "com.oracle.jvmci.options.processor" : {
297 "subDir" : "graal",
298 "sourceDirs" : ["src"],
299 "dependencies" : [
300 "com.oracle.jvmci.options",
301 ],
302 "checkstyle" : "com.oracle.graal.graph",
303 "javaCompliance" : "1.8",
304 "workingSets" : "JVMCI,Codegen",
305 },
306
307 "com.oracle.jvmci.options.test" : {
308 "subDir" : "graal",
309 "sourceDirs" : ["src"],
310 "dependencies" : [
311 "com.oracle.jvmci.options",
312 "JUNIT",
313 ],
314 "checkstyle" : "com.oracle.graal.graph",
315 "annotationProcessors" : ["com.oracle.jvmci.options.processor"],
316 "javaCompliance" : "1.8",
317 "workingSets" : "JVMCI",
318 },
319
320 "com.oracle.jvmci.hotspot.jfr" : {
321 "subDir" : "graal",
322 "sourceDirs" : ["src"],
323 "dependencies" : [
324 "com.oracle.jvmci.hotspot",
325 "JFR",
326 ],
327 "checkstyle" : "com.oracle.graal.graph",
328 "annotationProcessors" : ["com.oracle.jvmci.service.processor"],
329 "javaCompliance" : "1.8",
330 "profile" : "",
331 "workingSets" : "JVMCI,HotSpot",
332 },
333
334 "com.oracle.jvmci.amd64" : {
335 "subDir" : "graal",
336 "sourceDirs" : ["src"],
337 "dependencies" : ["com.oracle.jvmci.code"],
338 "checkstyle" : "com.oracle.graal.graph",
339 "javaCompliance" : "1.8",
340 "workingSets" : "JVMCI,AMD64",
341 },
342
343 "com.oracle.jvmci.hotspot.amd64" : {
344 "subDir" : "graal",
345 "sourceDirs" : ["src"],
346 "dependencies" : [
347 "com.oracle.jvmci.amd64",
348 "com.oracle.jvmci.hotspot",
349 ],
350 "checkstyle" : "com.oracle.graal.graph",
351 "annotationProcessors" : ["com.oracle.jvmci.service.processor"],
352 "javaCompliance" : "1.8",
353 "workingSets" : "JVMCI,HotSpot,AMD64",
354 },
355
356 "com.oracle.jvmci.sparc" : {
357 "subDir" : "graal",
358 "sourceDirs" : ["src"],
359 "dependencies" : ["com.oracle.jvmci.code"],
360 "checkstyle" : "com.oracle.graal.graph",
361 "javaCompliance" : "1.8",
362 "workingSets" : "JVMCI,SPARC",
363 },
364
365 "com.oracle.jvmci.hotspot.sparc" : {
366 "subDir" : "graal",
367 "sourceDirs" : ["src"],
368 "dependencies" : [
369 "com.oracle.jvmci.sparc",
370 "com.oracle.jvmci.hotspot",
371 ],
372 "checkstyle" : "com.oracle.graal.graph",
373 "annotationProcessors" : ["com.oracle.jvmci.service.processor"],
374 "javaCompliance" : "1.8",
375 "workingSets" : "JVMCI,HotSpot,SPARC",
376 },
377
378 # ------------- NFI -------------
379
216 "com.oracle.nfi" : { 380 "com.oracle.nfi" : {
217 "subDir" : "graal", 381 "subDir" : "graal",
218 "sourceDirs" : ["src"], 382 "sourceDirs" : ["src"],
219 "dependencies" : ["com.oracle.jvmci.service"], 383 "dependencies" : ["com.oracle.jvmci.service"],
220 "checkstyle" : "com.oracle.graal.graph", 384 "checkstyle" : "com.oracle.graal.graph",
231 ], 395 ],
232 "checkstyle" : "com.oracle.graal.graph", 396 "checkstyle" : "com.oracle.graal.graph",
233 "javaCompliance" : "1.7", 397 "javaCompliance" : "1.7",
234 }, 398 },
235 399
400 # ------------- Graal -------------
401
236 "com.oracle.graal.api.collections" : { 402 "com.oracle.graal.api.collections" : {
237 "subDir" : "graal", 403 "subDir" : "graal",
238 "sourceDirs" : ["src"], 404 "sourceDirs" : ["src"],
239 "checkstyle" : "com.oracle.graal.graph", 405 "checkstyle" : "com.oracle.graal.graph",
240 "javaCompliance" : "1.8", 406 "javaCompliance" : "1.8",
281 "checkstyle" : "com.oracle.graal.graph", 447 "checkstyle" : "com.oracle.graal.graph",
282 "javaCompliance" : "1.8", 448 "javaCompliance" : "1.8",
283 "workingSets" : "API,Graal,Test", 449 "workingSets" : "API,Graal,Test",
284 }, 450 },
285 451
286 "com.oracle.jvmci.meta" : { 452 "com.oracle.graal.api.replacements" : {
287 "subDir" : "graal",
288 "sourceDirs" : ["src"],
289 "checkstyle" : "com.oracle.graal.graph",
290 "javaCompliance" : "1.8",
291 "workingSets" : "API,JVMCI",
292 },
293
294 "com.oracle.jvmci.code" : {
295 "subDir" : "graal", 453 "subDir" : "graal",
296 "sourceDirs" : ["src"], 454 "sourceDirs" : ["src"],
297 "dependencies" : ["com.oracle.jvmci.meta"], 455 "dependencies" : ["com.oracle.jvmci.meta"],
298 "checkstyle" : "com.oracle.graal.graph", 456 "checkstyle" : "com.oracle.graal.graph",
299 "javaCompliance" : "1.8", 457 "javaCompliance" : "1.8",
300 "workingSets" : "API,JVMCI",
301 },
302
303 "com.oracle.graal.api.replacements" : {
304 "subDir" : "graal",
305 "sourceDirs" : ["src"],
306 "dependencies" : ["com.oracle.jvmci.meta"],
307 "checkstyle" : "com.oracle.graal.graph",
308 "javaCompliance" : "1.8",
309 "workingSets" : "API,Graal,Replacements", 458 "workingSets" : "API,Graal,Replacements",
310 },
311
312 "com.oracle.jvmci.service.processor" : {
313 "subDir" : "graal",
314 "sourceDirs" : ["src"],
315 "dependencies" : ["com.oracle.jvmci.service"],
316 "checkstyle" : "com.oracle.graal.graph",
317 "javaCompliance" : "1.8",
318 "workingSets" : "Codegen,HotSpot",
319 },
320
321 "com.oracle.graal.amd64" : {
322 "subDir" : "graal",
323 "sourceDirs" : ["src"],
324 "dependencies" : ["com.oracle.jvmci.code"],
325 "checkstyle" : "com.oracle.graal.graph",
326 "javaCompliance" : "1.8",
327 "workingSets" : "Graal,AMD64",
328 },
329
330 "com.oracle.graal.sparc" : {
331 "subDir" : "graal",
332 "sourceDirs" : ["src"],
333 "dependencies" : ["com.oracle.jvmci.code"],
334 "checkstyle" : "com.oracle.graal.graph",
335 "javaCompliance" : "1.8",
336 "workingSets" : "Graal,SPARC",
337 },
338
339 "com.oracle.jvmci.hotspotvmconfig" : {
340 "subDir" : "graal",
341 "sourceDirs" : ["src"],
342 "checkstyle" : "com.oracle.graal.graph",
343 "javaCompliance" : "1.8",
344 "workingSets" : "JVMCI,HotSpot",
345 },
346
347 "com.oracle.jvmci.hotspotvmconfig.processor" : {
348 "subDir" : "graal",
349 "sourceDirs" : ["src"],
350 "dependencies" : ["com.oracle.jvmci.hotspotvmconfig", "com.oracle.jvmci.common"],
351 "checkstyle" : "com.oracle.graal.graph",
352 "javaCompliance" : "1.8",
353 "workingSets" : "Graal,HotSpot,Codegen",
354 }, 459 },
355 460
356 "com.oracle.graal.hotspot" : { 461 "com.oracle.graal.hotspot" : {
357 "subDir" : "graal", 462 "subDir" : "graal",
358 "sourceDirs" : ["src"], 463 "sourceDirs" : ["src"],
369 ], 474 ],
370 "javaCompliance" : "1.8", 475 "javaCompliance" : "1.8",
371 "workingSets" : "Graal,HotSpot", 476 "workingSets" : "Graal,HotSpot",
372 }, 477 },
373 478
374 "com.oracle.jvmci.hotspot.jfr" : {
375 "subDir" : "graal",
376 "sourceDirs" : ["src"],
377 "dependencies" : [
378 "com.oracle.jvmci.hotspot",
379 "JFR",
380 ],
381 "checkstyle" : "com.oracle.graal.graph",
382 "annotationProcessors" : ["com.oracle.jvmci.service.processor"],
383 "javaCompliance" : "1.8",
384 "profile" : "",
385 "workingSets" : "JVMCI,HotSpot",
386 },
387
388 "com.oracle.graal.hotspot.amd64" : { 479 "com.oracle.graal.hotspot.amd64" : {
389 "subDir" : "graal", 480 "subDir" : "graal",
390 "sourceDirs" : ["src"], 481 "sourceDirs" : ["src"],
391 "dependencies" : [ 482 "dependencies" : [
483 "com.oracle.jvmci.hotspot.amd64",
392 "com.oracle.graal.compiler.amd64", 484 "com.oracle.graal.compiler.amd64",
393 "com.oracle.graal.hotspot", 485 "com.oracle.graal.hotspot",
394 "com.oracle.graal.replacements.amd64", 486 "com.oracle.graal.replacements.amd64",
395 ], 487 ],
396 "checkstyle" : "com.oracle.graal.graph", 488 "checkstyle" : "com.oracle.graal.graph",
401 493
402 "com.oracle.graal.hotspot.sparc" : { 494 "com.oracle.graal.hotspot.sparc" : {
403 "subDir" : "graal", 495 "subDir" : "graal",
404 "sourceDirs" : ["src"], 496 "sourceDirs" : ["src"],
405 "dependencies" : [ 497 "dependencies" : [
498 "com.oracle.jvmci.hotspot.sparc",
406 "com.oracle.graal.compiler.sparc", 499 "com.oracle.graal.compiler.sparc",
407 "com.oracle.graal.replacements.sparc", 500 "com.oracle.graal.replacements.sparc",
408 ], 501 ],
409 "checkstyle" : "com.oracle.graal.graph", 502 "checkstyle" : "com.oracle.graal.graph",
410 "annotationProcessors" : ["com.oracle.jvmci.service.processor", "com.oracle.graal.compiler.match.processor"], 503 "annotationProcessors" : ["com.oracle.jvmci.service.processor", "com.oracle.graal.compiler.match.processor"],
432 "com.oracle.graal.hotspot.test", 525 "com.oracle.graal.hotspot.test",
433 ], 526 ],
434 "checkstyle" : "com.oracle.graal.graph", 527 "checkstyle" : "com.oracle.graal.graph",
435 "javaCompliance" : "1.8", 528 "javaCompliance" : "1.8",
436 "workingSets" : "Graal,HotSpot,AMD64,Test", 529 "workingSets" : "Graal,HotSpot,AMD64,Test",
437 },
438
439 "com.oracle.jvmci.options" : {
440 "subDir" : "graal",
441 "sourceDirs" : ["src"],
442 "dependencies" : [
443 "com.oracle.jvmci.service",
444 ],
445 "checkstyle" : "com.oracle.graal.graph",
446 "javaCompliance" : "1.8",
447 "workingSets" : "JVMCI",
448 },
449
450 "com.oracle.jvmci.options.processor" : {
451 "subDir" : "graal",
452 "sourceDirs" : ["src"],
453 "dependencies" : [
454 "com.oracle.jvmci.options",
455 ],
456 "checkstyle" : "com.oracle.graal.graph",
457 "javaCompliance" : "1.8",
458 "workingSets" : "JVMCI,Codegen",
459 },
460
461 "com.oracle.jvmci.options.test" : {
462 "subDir" : "graal",
463 "sourceDirs" : ["src"],
464 "dependencies" : [
465 "com.oracle.jvmci.options",
466 "JUNIT",
467 ],
468 "checkstyle" : "com.oracle.graal.graph",
469 "annotationProcessors" : ["com.oracle.jvmci.options.processor"],
470 "javaCompliance" : "1.8",
471 "workingSets" : "JVMCI",
472 }, 530 },
473 531
474 "com.oracle.graal.nodeinfo" : { 532 "com.oracle.graal.nodeinfo" : {
475 "subDir" : "graal", 533 "subDir" : "graal",
476 "sourceDirs" : ["src"], 534 "sourceDirs" : ["src"],
515 ], 573 ],
516 "javaCompliance" : "1.8", 574 "javaCompliance" : "1.8",
517 "workingSets" : "Graal,Graph,Test", 575 "workingSets" : "Graal,Graph,Test",
518 }, 576 },
519 577
520 "com.oracle.jvmci.debug" : {
521 "subDir" : "graal",
522 "sourceDirs" : ["src"],
523 "checkstyle" : "com.oracle.graal.graph",
524 "dependencies" : [
525 "com.oracle.jvmci.service",
526 ],
527 "javaCompliance" : "1.8",
528 "workingSets" : "JVMCI,Debug",
529 },
530
531 "com.oracle.jvmci.debug.test" : {
532 "subDir" : "graal",
533 "sourceDirs" : ["src"],
534 "dependencies" : [
535 "JUNIT",
536 "com.oracle.jvmci.debug",
537 ],
538 "checkstyle" : "com.oracle.graal.graph",
539 "javaCompliance" : "1.8",
540 "workingSets" : "JVMCI,Debug,Test",
541 },
542
543 "com.oracle.graal.lir" : { 578 "com.oracle.graal.lir" : {
544 "subDir" : "graal", 579 "subDir" : "graal",
545 "sourceDirs" : ["src"], 580 "sourceDirs" : ["src"],
546 "dependencies" : [ 581 "dependencies" : [
547 "com.oracle.graal.compiler.common", 582 "com.oracle.graal.compiler.common",
792 827
793 "com.oracle.graal.compiler.amd64.test" : { 828 "com.oracle.graal.compiler.amd64.test" : {
794 "subDir" : "graal", 829 "subDir" : "graal",
795 "sourceDirs" : ["src"], 830 "sourceDirs" : ["src"],
796 "dependencies" : [ 831 "dependencies" : [
797 "com.oracle.graal.amd64", 832 "com.oracle.jvmci.amd64",
798 "com.oracle.graal.lir.jtt", 833 "com.oracle.graal.lir.jtt",
799 ], 834 ],
800 "checkstyle" : "com.oracle.graal.graph", 835 "checkstyle" : "com.oracle.graal.graph",
801 "javaCompliance" : "1.8", 836 "javaCompliance" : "1.8",
802 "workingSets" : "Graal,AMD64,Test", 837 "workingSets" : "Graal,AMD64,Test",
813 848
814 "com.oracle.graal.compiler.sparc.test" : { 849 "com.oracle.graal.compiler.sparc.test" : {
815 "subDir" : "graal", 850 "subDir" : "graal",
816 "sourceDirs" : ["src"], 851 "sourceDirs" : ["src"],
817 "dependencies" : [ 852 "dependencies" : [
818 "com.oracle.graal.sparc", 853 "com.oracle.jvmci.sparc",
819 "com.oracle.graal.compiler.test", 854 "com.oracle.graal.compiler.test",
820 ], 855 ],
821 "checkstyle" : "com.oracle.graal.graph", 856 "checkstyle" : "com.oracle.graal.graph",
822 "javaCompliance" : "1.8", 857 "javaCompliance" : "1.8",
823 "workingSets" : "Graal,SPARC,Test", 858 "workingSets" : "Graal,SPARC,Test",
968 "com.oracle.graal.asm.amd64" : { 1003 "com.oracle.graal.asm.amd64" : {
969 "subDir" : "graal", 1004 "subDir" : "graal",
970 "sourceDirs" : ["src"], 1005 "sourceDirs" : ["src"],
971 "dependencies" : [ 1006 "dependencies" : [
972 "com.oracle.graal.asm", 1007 "com.oracle.graal.asm",
973 "com.oracle.graal.amd64", 1008 "com.oracle.jvmci.amd64",
974 ], 1009 ],
975 "checkstyle" : "com.oracle.graal.graph", 1010 "checkstyle" : "com.oracle.graal.graph",
976 "javaCompliance" : "1.8", 1011 "javaCompliance" : "1.8",
977 "workingSets" : "Graal,Assembler,AMD64", 1012 "workingSets" : "Graal,Assembler,AMD64",
978 }, 1013 },
992 "com.oracle.graal.asm.sparc" : { 1027 "com.oracle.graal.asm.sparc" : {
993 "subDir" : "graal", 1028 "subDir" : "graal",
994 "sourceDirs" : ["src"], 1029 "sourceDirs" : ["src"],
995 "dependencies" : [ 1030 "dependencies" : [
996 "com.oracle.graal.hotspot", 1031 "com.oracle.graal.hotspot",
997 "com.oracle.graal.sparc", 1032 "com.oracle.jvmci.sparc",
998 ], 1033 ],
999 "checkstyle" : "com.oracle.graal.graph", 1034 "checkstyle" : "com.oracle.graal.graph",
1000 "javaCompliance" : "1.8", 1035 "javaCompliance" : "1.8",
1001 "workingSets" : "Graal,Assembler,SPARC", 1036 "workingSets" : "Graal,Assembler,SPARC",
1002 }, 1037 },
1038
1039 # ------------- Truffle -------------
1003 1040
1004 "com.oracle.truffle.api" : { 1041 "com.oracle.truffle.api" : {
1005 "subDir" : "graal", 1042 "subDir" : "graal",
1006 "sourceDirs" : ["src"], 1043 "sourceDirs" : ["src"],
1007 "dependencies" : ["com.oracle.jvmci.service"], 1044 "dependencies" : ["com.oracle.jvmci.service"],
1177 "checkstyle" : "com.oracle.truffle.api", 1214 "checkstyle" : "com.oracle.truffle.api",
1178 "javaCompliance" : "1.8", 1215 "javaCompliance" : "1.8",
1179 "workingSets" : "Truffle,SimpleLanguage,Tools", 1216 "workingSets" : "Truffle,SimpleLanguage,Tools",
1180 }, 1217 },
1181 1218
1219 # ------------- GraalTruffle -------------
1220
1182 "com.oracle.graal.truffle" : { 1221 "com.oracle.graal.truffle" : {
1183 "subDir" : "graal", 1222 "subDir" : "graal",
1184 "sourceDirs" : ["src"], 1223 "sourceDirs" : ["src"],
1185 "dependencies" : [ 1224 "dependencies" : [
1186 "com.oracle.truffle.api", 1225 "com.oracle.truffle.api",
1279 "JVMCI_HOTSPOT" : { 1318 "JVMCI_HOTSPOT" : {
1280 "path" : "build/jvmci-hotspot.jar", 1319 "path" : "build/jvmci-hotspot.jar",
1281 "subDir" : "graal", 1320 "subDir" : "graal",
1282 "sourcesPath" : "build/jvmci-hotspot.src.zip", 1321 "sourcesPath" : "build/jvmci-hotspot.src.zip",
1283 "dependencies" : [ 1322 "dependencies" : [
1284 "com.oracle.jvmci.hotspot", 1323 "com.oracle.jvmci.hotspot.amd64",
1324 "com.oracle.jvmci.hotspot.sparc",
1285 "com.oracle.jvmci.hotspot.jfr", 1325 "com.oracle.jvmci.hotspot.jfr",
1286 ], 1326 ],
1287 "distDependencies" : [ 1327 "distDependencies" : [
1288 "JVMCI_API", 1328 "JVMCI_API",
1289 ], 1329 ],