[Truffle] Use our preferred version of Truffle, even with latest Graal.

jruby · Sep 12, 2016 · bec3e5d · bec3e5d
1 parent 553b5c1
commit bec3e5d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/ci.hocon b/ci.hocon
@@ -1,3 +1,6 @@
+// Must be the same as in truffle/pom.rb and mx.jruby/suite.py
+truffle-version: 387cbe478688e84d211aa534b7b93d47709cadd9
+
 jt: [ruby, tool/jt.rb]
 
 common: {
@@ -42,9 +45,12 @@ labsjdk: {
   }
 }
 
-# Allow a version mismatch with truffle to prefer the language truffle version
+// 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}, "&&"]
+
 graal-core: ${labsjdk} {
   setup: ${common.setup} [
     [mv, mx.jruby, temp_mx],
@@ -53,7 +59,8 @@ graal-core: ${labsjdk} {
     ${clone_graal} ["https://github.com/graalvm/graal-core.git", graal-core],
     [cd, graal-core],
     [mx, sforceimports],
-    [mx, build],
+    [cd, ../truffle] ${use-language-truffle} [cd, ../graal-core],
+    [mx, --java-home, "$JVMCI_JAVA_HOME", build],
     [cd, ../..],
     [mv, temp_mx, mx.jruby]
   ]
@@ -73,7 +80,8 @@ graal-enterprise: ${labsjdk} {
     ${clone_graal} ["https://github.com/graalvm/graal-enterprise.git", graal-enterprise],
     [cd, graal-enterprise/graal-enterprise],
     [mx, sforceimports],
-    [mx, build],
+    [cd, ../../truffle] ${use-language-truffle} [cd, ../graal-enterprise/graal-enterprise],
+    [mx, --java-home, "$JVMCI_JAVA_HOME", build],
     [cd, ../../..],
     [mv, temp_mx, mx.jruby]
   ]

diff --git a/mx.jruby/suite.py b/mx.jruby/suite.py
@@ -30,6 +30,7 @@ def mavenLib(mavenDep, sha1):
         "suites": [
             {
                 "name": "truffle",
+                # Must be the same as in truffle/pom.rb and ci.hocon
                 "version": "387cbe478688e84d211aa534b7b93d47709cadd9",
                 "urls": [
                     {"url": "https://github.com/graalvm/truffle.git", "kind": "git"},

diff --git a/truffle/pom.rb b/truffle/pom.rb
@@ -9,6 +9,7 @@
 
   properties( 'polyglot.dump.pom' => 'pom.xml',
               'polyglot.dump.readonly' => true,
+              # Must be the same as in mx.jruby/suite.py and ci.hocon
               'truffle.version' => '0.17',
               'jruby.basedir' => '${basedir}/..',
               'maven.test.skip' => 'true' )