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: fa97f3055ffa
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 81d0abcc9f4a
Choose a head ref
  • 16 commits
  • 1 file changed
  • 2 contributors

Commits on May 6, 2016

  1. Copy the full SHA
    ee9e666 View commit details

Commits on May 9, 2016

  1. Copy the full SHA
    205160a View commit details

Commits on May 11, 2016

  1. Merge branch 'master' into truffle-head

    # Conflicts:
    #	.travis.yml
    chrisseaton committed May 11, 2016
    Copy the full SHA
    980cba3 View commit details
  2. Copy the full SHA
    81673e7 View commit details
  3. Copy the full SHA
    dc775e6 View commit details
  4. Copy the full SHA
    dba66a0 View commit details
  5. Copy the full SHA
    2b3ab95 View commit details

Commits on May 12, 2016

  1. Copy the full SHA
    e18bcc0 View commit details
  2. Copy the full SHA
    97a88fc View commit details
  3. [Truffle] Debug Travis.

    chrisseaton committed May 12, 2016
    Copy the full SHA
    17d3a6b View commit details
  4. [Truffle] Debug Travis.

    chrisseaton committed May 12, 2016
    Copy the full SHA
    7d8b675 View commit details
  5. [Truffle] Debug Travis.

    chrisseaton committed May 12, 2016
    Copy the full SHA
    1e3a6a4 View commit details
  6. [Truffle] Debug Travis.

    chrisseaton committed May 12, 2016
    Copy the full SHA
    0196675 View commit details
  7. [Truffle] Debug Travis.

    chrisseaton committed May 12, 2016
    Copy the full SHA
    36ccf10 View commit details
  8. Copy the full SHA
    1931fcf View commit details
  9. Copy the full SHA
    81d0abc View commit details
Showing with 12 additions and 5 deletions.
  1. +12 −5 tool/jt.rb
17 changes: 12 additions & 5 deletions tool/jt.rb
Original file line number Diff line number Diff line change
@@ -66,9 +66,17 @@ def self.find_graal
end

def self.find_sulong_graal(dir)
jvmci = File.expand_path("../jvmci", dir)
Dir["#{jvmci}/jdk*/product/bin/java"].first or
raise "couldn't find the Java build in the Sulong repository - you need to check it out and build it"
searches = [
"#{dir}/../jvmci/jdk*/product/bin/java",
"#{dir}/../graal-core/mx.imports/binary/jvmci/jdk*/product/bin/java"
]

searches.each do |search|
java = Dir[search].first
return java if java
end

raise "couldn't find the Java build in the Sulong repository - you need to check it out and build it"
end

def self.find_graal_js
@@ -387,7 +395,6 @@ def run(*args)
{
'--asm' => '--graal',
'--igv' => '--graal',
'--sulong' => '--graal',
'--bips' => '--graal'
}.each_pair do |arg, dep|
args.unshift dep if args.include?(arg)
@@ -544,7 +551,7 @@ def test_cexts(*args)
end
end
ensure
File.delete output_file
File.delete output_file rescue nil
end
private :test_cexts