Mercurial > hg > graal-compiler
changeset 22176:2378eaca447a
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 09 Jul 2015 00:18:57 +0200 |
parents | 42ee3b572280 (current diff) a19ed9118dc4 (diff) |
children | 8f62f2bae04e |
files | mx.graal/suite.py |
diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Thu Jul 09 00:11:05 2015 +0200 +++ b/.hgignore Thu Jul 09 00:18:57 2015 +0200 @@ -6,6 +6,7 @@ ^jdk1.(7|8).0 ^java64/ ^work/ +^mx.imports/ \.checkstyle$ \.classpath \.factorypath
--- a/mx.graal/suite.py Thu Jul 09 00:11:05 2015 +0200 +++ b/mx.graal/suite.py Thu Jul 09 00:18:57 2015 +0200 @@ -13,11 +13,11 @@ }, { "name" : "truffle", - "version" : "6efd3e3389adfcc1f43e07be8f0aae2cb8cd5499", + "version" : "f878f9778548f684c6f8b88e1bb7d3b49d40ce4c", "urls" : [ {"url" : "https://lafo.ssw.uni-linz.ac.at/hg/truffle-mx2", "kind" : "hg"}, # Disable reference to snapshots until they are built from truffle-mx2 or truffle-mx2 is renamed to truffle - #{"url" : "http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots", "kind" : "binary", "version-adjust" : "0.8-{version}-SNAPSHOT"}, + #{"url" : "http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots", "kind" : "binary"}, ] }, ] @@ -782,6 +782,7 @@ "com.oracle.graal.compiler.test", "truffle:TRUFFLE_SL", ], + "annotationProcessors" : ["truffle:TRUFFLE_DSL_PROCESSOR"], "checkstyle" : "com.oracle.graal.graph", "javaCompliance" : "1.8", "workingSets" : "Graal,Truffle,Test",