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: cebf2109929c
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9ba2869a3224
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 7, 2016

  1. [Truffle] Update to Truffle 0.14 and GraalVM 0.12

    @chrisseaton
    chrisseaton committed Jun 7, 2016
    Copy the full SHA
    95bdc20 View commit details

  2. Merge branch 'master' into truffle-head 

    # Conflicts:
#	ci.hocon
#	truffle/pom.rb
#	truffle/pom.xml
    @chrisseaton
    chrisseaton committed Jun 7, 2016
    Copy the full SHA
    2e89d40 View commit details

  3. [Truffle] Need to check GRAAL_BIN_branch before GRAAL_BIN

    @chrisseaton
    chrisseaton committed Jun 7, 2016
    Copy the full SHA
    9ba2869 View commit details
Showing with 5 additions and 5 deletions.
  1. +3 −3 tool/jt.rb
  2. +1 −1 truffle/pom.rb
  3. +1 −1 truffle/pom.xml
6 changes: 3 additions & 3 deletions tool/jt.rb
View file
Original file line number Diff line number Diff line change
@@ -42,11 +42,11 @@ def self.truffle_version
end

def self.graal_locations
from_env = ENV['GRAAL_BIN']
yield File.expand_path(from_env) if from_env

from_branch = ENV["GRAAL_BIN_#{mangle_for_env(git_branch)}"]
yield File.expand_path(from_branch) if from_branch

from_env = ENV['GRAAL_BIN']
yield File.expand_path(from_env) if from_env

rel_java_bin = "bin/java" # "jre/bin/javao"
['', '../', '../../'].each do |prefix|
2 changes: 1 addition & 1 deletion truffle/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@

properties( 'polyglot.dump.pom' => 'pom.xml',
'polyglot.dump.readonly' => true,
'truffle.version' => 'b16acf4a3e294ffb5a58d10e19a072d0f3ec35e4-SNAPSHOT',
'truffle.version' => '4cedec080054e9be81d8f6fdf7a2fa37587afde6-SNAPSHOT',
'jruby.basedir' => '${basedir}/..',
'maven.test.skip' => 'true' )

2 changes: 1 addition & 1 deletion truffle/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ DO NOT MODIFIY - GENERATED CODE
<jruby.basedir>${basedir}/..</jruby.basedir>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<truffle.version>b16acf4a3e294ffb5a58d10e19a072d0f3ec35e4-SNAPSHOT</truffle.version>
<truffle.version>4cedec080054e9be81d8f6fdf7a2fa37587afde6-SNAPSHOT</truffle.version>
</properties>
<dependencies>
<dependency>