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

Commits on Aug 19, 2015

  1. Bump Truffle version.

    @nirvdrum
    nirvdrum committed Aug 19, 2015
    Copy the full SHA
    dd8a80f View commit details

  2. Updated jt to work with new JVMCI Graal builds.

    @nirvdrum
    nirvdrum committed Aug 19, 2015
    Copy the full SHA
    7fcefac View commit details
Showing with 16 additions and 9 deletions.
  1. +12 −5 tool/jt.rb
  2. +1 −1 truffle/pom.rb
  3. +3 −3 truffle/pom.xml
17 changes: 12 additions & 5 deletions tool/jt.rb
View file
Original file line number Diff line number Diff line change
@@ -59,19 +59,26 @@ def self.mangle_for_env(name)
name.upcase.tr('-', '_')
end

def self.find_graal_parent
File.expand_path('../../../../../graal', find_graal)
end

def self.find_graal_mx
mx = File.expand_path('../../../../mx.sh', find_graal)
raise "couldn't find mx.sh - set GRAAL_BIN, and you need to use a checkout of Graal, not a build" unless File.executable?(mx)
mx = File.expand_path('../../../../../mx/mx', find_graal)
raise "couldn't find mx - set GRAAL_BIN, and you need to use a checkout of Graal, not a build" unless File.executable?(mx)
mx
end

def self.igv_running?
`ps a`.lines.any? { |p| p.include? 'mxtool/mx.py igv' }
`ps a`.lines.any? { |p| p.include? 'mx/mx.py igv' }
end

def self.ensure_igv_running
unless igv_running?
spawn "#{find_graal_mx} igv", pgroup: true
Dir.chdir(find_graal_parent) do
spawn "#{find_graal_mx} igv", pgroup: true
end

sleep 5
puts
puts
@@ -272,7 +279,7 @@ def run(*args)
if args.delete('--igv')
warn "warning: --igv might not work on master - if it does not, use truffle-head instead which builds against latest graal" if Utilities.git_branch == 'master'
Utilities.ensure_igv_running
jruby_args += %w[-J-G:Dump=TrufflePartialEscape]
jruby_args += %w[-J-Djvmci.options=Dump=TrufflePartialEscape]
end

if ENV["JRUBY_ECLIPSE"] == "true"
2 changes: 1 addition & 1 deletion truffle/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
repository( :url => 'http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/',
:id => 'truffle' )

truffle_version = 'ff531952a91ce80e497416d86acd76373d423da1-SNAPSHOT'
truffle_version = '0556c0056d7170bd00bba293082ca4ed4a511f51-SNAPSHOT'
jar 'com.oracle.truffle:truffle-api:' + truffle_version
jar 'com.oracle.truffle:truffle-dsl-processor:' + truffle_version, :scope => 'provided'
jar 'com.oracle.truffle:truffle-tck:' + truffle_version, :scope => 'test'
6 changes: 3 additions & 3 deletions truffle/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -31,18 +31,18 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>com.oracle.truffle</groupId>
<artifactId>truffle-api</artifactId>
<version>ff531952a91ce80e497416d86acd76373d423da1-SNAPSHOT</version>
<version>0556c0056d7170bd00bba293082ca4ed4a511f51-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.oracle.truffle</groupId>
<artifactId>truffle-dsl-processor</artifactId>
<version>ff531952a91ce80e497416d86acd76373d423da1-SNAPSHOT</version>
<version>0556c0056d7170bd00bba293082ca4ed4a511f51-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.oracle.truffle</groupId>
<artifactId>truffle-tck</artifactId>
<version>ff531952a91ce80e497416d86acd76373d423da1-SNAPSHOT</version>
<version>0556c0056d7170bd00bba293082ca4ed4a511f51-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>