-
-
Notifications
You must be signed in to change notification settings - Fork 925
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Truffle] JT: Updates for GraalVM 0.11.
- 9.4.12.0
- 9.4.11.0
- 9.4.10.0
- 9.4.9.0
- 9.4.8.0
- 9.4.7.0
- 9.4.6.0
- 9.4.5.0
- 9.4.4.0
- 9.4.3.0
- 9.4.2.0
- 9.4.1.0
- 9.4.0.0
- 9.3.15.0
- 9.3.14.0
- 9.3.13.0
- 9.3.12.0
- 9.3.11.0
- 9.3.10.0
- 9.3.9.0
- 9.3.8.0
- 9.3.7.0
- 9.3.6.0
- 9.3.5.0
- 9.3.4.0
- 9.3.3.0
- 9.3.2.0
- 9.3.1.0
- 9.3.0.0
- 9.2.21.0
- 9.2.20.1
- 9.2.20.0
- 9.2.19.0
- 9.2.18.0
- 9.2.17.0
- 9.2.16.0
- 9.2.15.0
- 9.2.14.0
- 9.2.13.0
- 9.2.12.0
- 9.2.11.1
- 9.2.11.0
- 9.2.10.0
- 9.2.9.0
- 9.2.8.0
- 9.2.7.0
- 9.2.6.0
- 9.2.5.0
- 9.2.4.1
- 9.2.4.0
- 9.2.3.0
- 9.2.2.0
- 9.2.1.0
- 9.2.0.0
- 9.1.17.0
- 9.1.16.0
- 9.1.15.0
- 9.1.14.0
- 9.1.13.0
- 9.1.12.0
- 9.1.11.0
- 9.1.10.0
- 9.1.9.0
- 9.1.8.0
- 9.1.7.0
- 9.1.6.0
- 9.1.5.0
- 9.1.4.0
- 9.1.3.0
- 9.1.2.0
- 9.1.1.0
- 9.1.0.0
Showing
1 changed file
with
15 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,7 @@ | |
require 'fileutils' | ||
require 'digest/sha1' | ||
|
||
GRAALVM_VERSION = "0.10" | ||
GRAALVM_VERSION = "0.11" | ||
|
||
JRUBY_DIR = File.expand_path('../..', __FILE__) | ||
|
||
|
@@ -37,22 +37,24 @@ def self.truffle_version | |
end | ||
end | ||
|
||
def self.find_graal | ||
graal_locations = [ | ||
ENV['GRAAL_BIN'], | ||
ENV["GRAAL_BIN_#{mangle_for_env(git_branch)}"], | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
eregon
Author
Member
|
||
"GraalVM-#{GRAALVM_VERSION}/jre/bin/javao", | ||
"../GraalVM-#{GRAALVM_VERSION}/jre/bin/javao", | ||
"../../GraalVM-#{GRAALVM_VERSION}/jre/bin/javao", | ||
].compact.map { |path| File.expand_path(path, JRUBY_DIR) } | ||
def self.graal_locations | ||
from_env = ENV['GRAAL_BIN'] | ||
yield from_env if from_env | ||
|
||
not_found = -> { | ||
raise "couldn't find graal - download it as described in https://github.com/jruby/jruby/wiki/Downloading-GraalVM and extract it into the JRuby repository or parent directory" | ||
rel_java_bin = "bin/java" # "jre/bin/javao" | ||
%w[dk re].each { |kind| | ||
["", "../", "../../"].each { |prefix| | ||
path = "#{prefix}graalvm-#{GRAALVM_VERSION}-#{kind}/#{rel_java_bin}" | ||
yield File.expand_path(path, JRUBY_DIR) | ||
} | ||
} | ||
end | ||
|
||
graal_locations.find(not_found) do |location| | ||
File.executable?(location) | ||
def self.find_graal | ||
graal_locations do |location| | ||
return location if File.executable?(location) | ||
end | ||
raise "couldn't find graal - download it as described in https://github.com/jruby/jruby/wiki/Downloading-GraalVM and extract it into the JRuby repository or parent directory" | ||
end | ||
|
||
def self.find_graal_js | ||
|
What's wrong with the
GRAAL_BIN_TRUFFLE_HEAD
etc variables? I used those so that I could always find the right Graal for the right branch. What do you do instead?