Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 84a785ce6fe8
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a549aba37b3a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 21, 2016

  1. [Truffle] JT: Update to match the new pom.

    @eregon
    eregon committed Apr 21, 2016
    Copy the full SHA
    fef8cfb View commit details

  2. [Truffle] JT: Updates for GraalVM 0.11.

    @eregon
    eregon committed Apr 21, 2016
    2
    Copy the full SHA
    a549aba View commit details
Showing with 16 additions and 14 deletions.
  1. +16 −14 tool/jt.rb
30 changes: 16 additions & 14 deletions tool/jt.rb
View file
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__)

@@ -31,28 +31,30 @@ module Utilities

def self.truffle_version
File.foreach("#{JRUBY_DIR}/truffle/pom.rb") do |line|
if /\btruffle_version = '(\d+\.\d+(?:-SNAPSHOT)?)'/ =~ line
if /'truffle\.version' => '(\d+\.\d+(?:-SNAPSHOT)?)'/ =~ line
break $1
end
end
end

def self.find_graal
graal_locations = [
ENV['GRAAL_BIN'],
ENV["GRAAL_BIN_#{mangle_for_env(git_branch)}"],
"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