Mercurial > hg > truffle
comparison mx/suite.py @ 21562:47bebae7454f
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 28 May 2015 21:58:33 +0200 |
parents | be896a1983c0 28cbfacd0518 |
children | a880844225e4 |
comparison
equal
deleted
inserted
replaced
21561:ce2113326bc8 | 21562:47bebae7454f |
---|---|
164 | 164 |
165 "com.oracle.jvmci.hotspot" : { | 165 "com.oracle.jvmci.hotspot" : { |
166 "subDir" : "graal", | 166 "subDir" : "graal", |
167 "sourceDirs" : ["src"], | 167 "sourceDirs" : ["src"], |
168 "dependencies" : [ | 168 "dependencies" : [ |
169 "com.oracle.jvmci.runtime", | 169 "com.oracle.jvmci.hotspotvmconfig", |
170 "com.oracle.jvmci.options", | |
171 "com.oracle.jvmci.debug", | |
170 "com.oracle.jvmci.common", | 172 "com.oracle.jvmci.common", |
171 "com.oracle.jvmci.hotspotvmconfig", | 173 "FINDBUGS", |
172 "com.oracle.jvmci.debug", | |
173 "com.oracle.jvmci.options", | |
174 "FINDBUGS" | |
175 ], | 174 ], |
176 "annotationProcessors" : [ | 175 "annotationProcessors" : [ |
177 "com.oracle.jvmci.hotspotvmconfig.processor", | 176 "com.oracle.jvmci.hotspotvmconfig.processor", |
178 ], | 177 ], |
179 "checkstyle" : "com.oracle.graal.graph", | 178 "checkstyle" : "com.oracle.graal.graph", |
346 "checkstyle" : "com.oracle.graal.graph", | 345 "checkstyle" : "com.oracle.graal.graph", |
347 "javaCompliance" : "1.8", | 346 "javaCompliance" : "1.8", |
348 "workingSets" : "Graal,HotSpot", | 347 "workingSets" : "Graal,HotSpot", |
349 }, | 348 }, |
350 | 349 |
351 "com.oracle.graal.hotspot.sourcegen" : { | |
352 "subDir" : "graal", | |
353 "sourceDirs" : ["src"], | |
354 "dependencies" : ["com.oracle.graal.hotspot"], | |
355 "checkstyle" : "com.oracle.graal.graph", | |
356 "javaCompliance" : "1.8", | |
357 "workingSets" : "Graal,HotSpot", | |
358 }, | |
359 | |
360 "com.oracle.graal.hotspot.jfr" : { | 350 "com.oracle.graal.hotspot.jfr" : { |
361 "subDir" : "graal", | 351 "subDir" : "graal", |
362 "sourceDirs" : ["src"], | 352 "sourceDirs" : ["src"], |
363 "dependencies" : [ | 353 "dependencies" : [ |
364 "com.oracle.graal.hotspot", | 354 "com.oracle.graal.hotspot", |
423 }, | 413 }, |
424 | 414 |
425 "com.oracle.jvmci.options" : { | 415 "com.oracle.jvmci.options" : { |
426 "subDir" : "graal", | 416 "subDir" : "graal", |
427 "sourceDirs" : ["src"], | 417 "sourceDirs" : ["src"], |
418 "dependencies" : [ | |
419 "com.oracle.jvmci.runtime", | |
420 ], | |
428 "checkstyle" : "com.oracle.graal.graph", | 421 "checkstyle" : "com.oracle.graal.graph", |
429 "javaCompliance" : "1.8", | 422 "javaCompliance" : "1.8", |
430 "workingSets" : "Graal", | 423 "workingSets" : "Graal", |
431 }, | 424 }, |
432 | 425 |
859 | 852 |
860 "com.oracle.graal.compiler.common" : { | 853 "com.oracle.graal.compiler.common" : { |
861 "subDir" : "graal", | 854 "subDir" : "graal", |
862 "sourceDirs" : ["src"], | 855 "sourceDirs" : ["src"], |
863 "dependencies" : [ | 856 "dependencies" : [ |
864 "com.oracle.jvmci.common", | |
865 "com.oracle.jvmci.code", | |
866 "com.oracle.jvmci.options", | 857 "com.oracle.jvmci.options", |
867 "com.oracle.jvmci.debug", | 858 "com.oracle.jvmci.debug", |
859 "com.oracle.jvmci.common", | |
868 ], | 860 ], |
869 "annotationProcessors" : ["com.oracle.jvmci.options.processor"], | 861 "annotationProcessors" : ["com.oracle.jvmci.options.processor"], |
870 "checkstyle" : "com.oracle.graal.graph", | 862 "checkstyle" : "com.oracle.graal.graph", |
871 "javaCompliance" : "1.8", | 863 "javaCompliance" : "1.8", |
872 "workingSets" : "Graal,Java", | 864 "workingSets" : "Graal,Java", |