Mercurial > hg > graal-compiler
diff mx/projects @ 13745:978587c91373
Merge
| author | Tom Rodriguez <tom.rodriguez@oracle.com> |
|---|---|
| date | Thu, 23 Jan 2014 16:35:57 -0800 |
| parents | bfd61161d752 |
| children | 2d0be2eca035 |
line wrap: on
line diff
--- a/mx/projects Thu Jan 23 16:15:04 2014 -0800 +++ b/mx/projects Thu Jan 23 16:35:57 2014 -0800 @@ -24,9 +24,15 @@ library@DACAPO_SCALA@path=lib/dacapo-scala-0.1.0-20120216.jar 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 -library@OKRA@path=lib/okra-1.2.jar -library@OKRA@sourcePath=lib/okra-1.2.jar -library@OKRA@urls=http://cr.openjdk.java.net/~tdeneau/okra-1.2.jar +library@OKRA@path=lib/okra-1.5.jar +library@OKRA@urls=http://cr.openjdk.java.net/~tdeneau/okra-1.5.jar +library@OKRA@sourcePath=lib/okra-1.5-src.jar +library@OKRA@sourceUrls=http://cr.openjdk.java.net/~tdeneau/okra-1.5-src.jar + +library@OKRA_WITH_SIM@path=lib/okra-1.5-with-sim.jar +library@OKRA_WITH_SIM@urls=http://cr.openjdk.java.net/~tdeneau/okra-1.5-with-sim.jar +library@OKRA_WITH_SIM@sourcePath=lib/okra-1.5-with-sim-src.jar +library@OKRA_WITH_SIM@sourceUrls=http://cr.openjdk.java.net/~tdeneau/okra-1.5-with-sim-src.jar library@JRUBYPARSER@path=lib/jrubyparser-0.5.0.jar library@JRUBYPARSER@urls=http://repo1.maven.org/maven2/org/jruby/jrubyparser/0.5.0/jrubyparser-0.5.0.jar @@ -611,7 +617,7 @@ # graal.compiler.hsail.test.infra - HSAIL compiler test infrastructure project@com.oracle.graal.compiler.hsail.test.infra@subDir=graal project@com.oracle.graal.compiler.hsail.test.infra@sourceDirs=src -project@com.oracle.graal.compiler.hsail.test.infra@dependencies=com.oracle.graal.hotspot.hsail,JUNIT +project@com.oracle.graal.compiler.hsail.test.infra@dependencies=com.oracle.graal.hotspot.hsail,JUNIT,OKRA_WITH_SIM project@com.oracle.graal.compiler.hsail.test.infra@checkstyle=com.oracle.graal.graph project@com.oracle.graal.compiler.hsail.test.infra@javaCompliance=1.7