[Truffle] Use the truffle version from the language.

jruby · Aug 26, 2016 · f213c8f · f213c8f
1 parent 24baa5b
commit f213c8f
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/ci.hocon b/ci.hocon
@@ -1,8 +1,16 @@
+# Configuration values
+
+# Must be the same as in truffle/pom.rb and mx.jruby/suite.py
+truffle-version: 5e141bd0895239307edb5a4c64eaccb7d37409ef
+
 jt: [ruby, tool/jt.rb]
 
 # Allow a version mismatch with truffle to prefer the language truffle version
 clone_graal: [mx, --version-conflict-resolution, ignore, sclone, --kind, git]
 
+# Use Truffle version of the language
+use-language-truffle: ["&&", git, fetch, "&&", git, reset, --hard, ${truffle-version}, "&&"]
+
 common-setup: [
   [mx, sclone, --kind, git, "https://github.com/jruby/jruby-build-pack.git", jruby-build-pack],
   [cp, bin/jruby.bash, bin/jruby],
@@ -53,6 +61,7 @@ graal-core: {
     ${clone_graal} ["https://github.com/graalvm/graal-core.git", graal-core],
     [cd, graal-core],
     [mx, sforceimports],
+    [cd, ../truffle] ${use-language-truffle} [cd, ../graal-core],
     [mx, --java-home, "$JVMCI_JAVA_HOME", build],
     [cd, ../..],
     [mv, temp_mx, mx.jruby]
@@ -81,6 +90,7 @@ graal-enterprise: {
     ${clone_graal} ["https://github.com/graalvm/graal-enterprise.git", graal-enterprise],
     [cd, graal-enterprise/graal-enterprise],
     [mx, sforceimports],
+    [cd, ../../truffle] ${use-language-truffle} [cd, ../graal-enterprise/graal-enterprise],
     [mx, --java-home, "$JVMCI_JAVA_HOME", build],
     [cd, ../../..],
     [mv, temp_mx, mx.jruby]
@@ -315,6 +325,7 @@ test-cexts: {
     [mx, sclone, --kind, git, "https://github.com/graalvm/sulong.git", sulong],
     [cd, sulong],
     [mx, sforceimports],
+    [cd, ../truffle] ${use-language-truffle} [cd, ../sulong],
     [mx, --java-home, "$JVMCI_JAVA_HOME", build],
     [cd, ../..],
     [mv, temp_mx, mx.jruby]
@@ -366,6 +377,7 @@ sulong-benchmarks: {
     [mx, sclone, --kind, git, "https://github.com/graalvm/sulong.git", sulong],
     [cd, sulong],
     [mx, sforceimports],
+    [cd, ../truffle] ${use-language-truffle} [cd, ../sulong],
     [mx, --java-home, "$JVMCI_JAVA_HOME", build],
     [cd, ../..],
     [mv, temp_mx, mx.jruby],