Mercurial > hg > truffle
comparison mx/projects @ 8250:edc414f52e2b
Merge.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Tue, 12 Mar 2013 11:38:52 +0100 |
parents | 91982900acee 87cb93643a47 |
children | 65f03d5f98a1 |
comparison
equal
deleted
inserted
replaced
8249:aad7e9f4f71c | 8250:edc414f52e2b |
---|---|
19 library@JACOCOREPORT@path=lib/jacocoreport.jar | 19 library@JACOCOREPORT@path=lib/jacocoreport.jar |
20 library@JACOCOREPORT@urls=http://lafo.ssw.uni-linz.ac.at/jacoco/jacocoreport.jar | 20 library@JACOCOREPORT@urls=http://lafo.ssw.uni-linz.ac.at/jacoco/jacocoreport.jar |
21 | 21 |
22 library@DACAPO_SCALA@path=lib/dacapo-scala-0.1.0-20120216.jar | 22 library@DACAPO_SCALA@path=lib/dacapo-scala-0.1.0-20120216.jar |
23 library@DACAPO_SCALA@urls=http://repo.scalabench.org/snapshots/org/scalabench/benchmarks/scala-benchmark-suite/0.1.0-SNAPSHOT/scala-benchmark-suite-0.1.0-20120216.103539-3.jar | 23 library@DACAPO_SCALA@urls=http://repo.scalabench.org/snapshots/org/scalabench/benchmarks/scala-benchmark-suite/0.1.0-SNAPSHOT/scala-benchmark-suite-0.1.0-20120216.103539-3.jar |
24 | |
25 distribution@GRAAL@path=graal.jar | |
26 distribution@GRAAL@dependencies=com.oracle.graal.hotspot.amd64,com.oracle.graal.hotspot.sparc | |
24 | 27 |
25 # graal.api.runtime | 28 # graal.api.runtime |
26 project@com.oracle.graal.api.runtime@subDir=graal | 29 project@com.oracle.graal.api.runtime@subDir=graal |
27 project@com.oracle.graal.api.runtime@sourceDirs=src | 30 project@com.oracle.graal.api.runtime@sourceDirs=src |
28 project@com.oracle.graal.api.runtime@checkstyle=com.oracle.graal.graph | 31 project@com.oracle.graal.api.runtime@checkstyle=com.oracle.graal.graph |
233 project@com.oracle.graal.compiler.amd64@sourceDirs=src | 236 project@com.oracle.graal.compiler.amd64@sourceDirs=src |
234 project@com.oracle.graal.compiler.amd64@dependencies=com.oracle.graal.compiler,com.oracle.graal.lir.amd64 | 237 project@com.oracle.graal.compiler.amd64@dependencies=com.oracle.graal.compiler,com.oracle.graal.lir.amd64 |
235 project@com.oracle.graal.compiler.amd64@checkstyle=com.oracle.graal.graph | 238 project@com.oracle.graal.compiler.amd64@checkstyle=com.oracle.graal.graph |
236 project@com.oracle.graal.compiler.amd64@javaCompliance=1.7 | 239 project@com.oracle.graal.compiler.amd64@javaCompliance=1.7 |
237 | 240 |
241 # graal.compiler.amd64.test | |
242 project@com.oracle.graal.compiler.amd64.test@subDir=graal | |
243 project@com.oracle.graal.compiler.amd64.test@sourceDirs=src | |
244 project@com.oracle.graal.compiler.amd64.test@dependencies=com.oracle.graal.compiler.test | |
245 project@com.oracle.graal.compiler.amd64.test@checkstyle=com.oracle.graal.graph | |
246 project@com.oracle.graal.compiler.amd64.test@javaCompliance=1.7 | |
247 | |
238 # graal.compiler.ptx | 248 # graal.compiler.ptx |
239 project@com.oracle.graal.compiler.ptx@subDir=graal | 249 project@com.oracle.graal.compiler.ptx@subDir=graal |
240 project@com.oracle.graal.compiler.ptx@sourceDirs=src | 250 project@com.oracle.graal.compiler.ptx@sourceDirs=src |
241 project@com.oracle.graal.compiler.ptx@dependencies=com.oracle.graal.compiler,com.oracle.graal.lir.ptx | 251 project@com.oracle.graal.compiler.ptx@dependencies=com.oracle.graal.compiler,com.oracle.graal.lir.ptx |
242 project@com.oracle.graal.compiler.ptx@checkstyle=com.oracle.graal.graph | 252 project@com.oracle.graal.compiler.ptx@checkstyle=com.oracle.graal.graph |
243 project@com.oracle.graal.compiler.ptx@javaCompliance=1.7 | 253 project@com.oracle.graal.compiler.ptx@javaCompliance=1.7 |
244 | 254 |
245 # graal.compiler.ptx.test | 255 # graal.compiler.ptx.test |
246 project@com.oracle.graal.compiler.ptx.test@subDir=graal | 256 project@com.oracle.graal.compiler.ptx.test@subDir=graal |
247 project@com.oracle.graal.compiler.ptx.test@sourceDirs=src | 257 project@com.oracle.graal.compiler.ptx.test@sourceDirs=src |
248 project@com.oracle.graal.compiler.ptx.test@dependencies=com.oracle.graal.compiler.ptx,com.oracle.graal.compiler.test | 258 project@com.oracle.graal.compiler.ptx.test@dependencies=com.oracle.graal.compiler.ptx,com.oracle.graal.compiler.test,com.oracle.graal.ptx |
249 project@com.oracle.graal.compiler.ptx.test@checkstyle=com.oracle.graal.graph | 259 project@com.oracle.graal.compiler.ptx.test@checkstyle=com.oracle.graal.graph |
250 project@com.oracle.graal.compiler.ptx.test@javaCompliance=1.7 | 260 project@com.oracle.graal.compiler.ptx.test@javaCompliance=1.7 |
251 | 261 |
252 # graal.compiler.sparc | 262 # graal.compiler.sparc |
253 project@com.oracle.graal.compiler.sparc@subDir=graal | 263 project@com.oracle.graal.compiler.sparc@subDir=graal |
326 project@com.oracle.graal.asm.amd64.test@javaCompliance=1.7 | 336 project@com.oracle.graal.asm.amd64.test@javaCompliance=1.7 |
327 | 337 |
328 # graal.asm.ptx | 338 # graal.asm.ptx |
329 project@com.oracle.graal.asm.ptx@subDir=graal | 339 project@com.oracle.graal.asm.ptx@subDir=graal |
330 project@com.oracle.graal.asm.ptx@sourceDirs=src | 340 project@com.oracle.graal.asm.ptx@sourceDirs=src |
331 project@com.oracle.graal.asm.ptx@dependencies=com.oracle.graal.asm,com.oracle.graal.ptx | 341 project@com.oracle.graal.asm.ptx@dependencies=com.oracle.graal.asm |
332 project@com.oracle.graal.asm.ptx@checkstyle=com.oracle.graal.graph | 342 project@com.oracle.graal.asm.ptx@checkstyle=com.oracle.graal.graph |
333 project@com.oracle.graal.asm.ptx@javaCompliance=1.7 | 343 project@com.oracle.graal.asm.ptx@javaCompliance=1.7 |
334 | 344 |
335 # graal.asm.sparc | 345 # graal.asm.sparc |
336 project@com.oracle.graal.asm.sparc@subDir=graal | 346 project@com.oracle.graal.asm.sparc@subDir=graal |