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

Commits on Sep 25, 2015

  1. [Truffle] Produce a java command more smiliar to the bash script.

    @eregon
    eregon committed Sep 25, 2015
    Copy the full SHA
    dbccd22 View commit details

  2. [Truffle] Enable system assertions for specs. 

    * Since Truffle is on the bootclasspath, assertions are ignored
  unless -esa or -ea:com.oracle.truffle... is specified.
  -esa is chosen so other bootclasspath assertions (like jruby's)
  are also enabled.
    @eregon
    eregon committed Sep 25, 2015
    Copy the full SHA
    bfce7bc View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 spec/truffle/truffle.mspec
  2. +2 −2 tool/jruby_eclipse
2 changes: 1 addition & 1 deletion spec/truffle/truffle.mspec
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ class MSpecScript
set :target, File.expand_path("../../../bin/jruby#{windows? ? '.bat' : ''}", __FILE__)

if ARGV[-2..-1] != %w[-t ruby] # No flags for MRI
set :flags, %w[-X+T -J-ea -J-Xmx2G]
set :flags, %w[-X+T -J-ea -J-esa -J-Xmx2G]
end

set :language, [
4 changes: 2 additions & 2 deletions tool/jruby_eclipse
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ bootclasspath = []
classpath = []

bootclasspath << "#{JRUBY}/lib/jruby.jar"
bootclasspath << "#{JRUBY}/lib/jruby-stdlib-9.0.0.0-SNAPSHOT.jar"
classpath << "#{JRUBY}/lib/jruby-stdlib-9.0.0.0-SNAPSHOT.jar"
if rest.include?('-X+T')
bootclasspath << TRUFFLEJAR
classpath << "#{JRUBY}/truffle/build.eclipse"
@@ -37,7 +37,7 @@ end
args = [java]
args << "-Djffi.boot.library.path=#{JRUBY}/lib/jni"
args << "-Xbootclasspath/a:" + bootclasspath.join(':')
args << "-cp" << classpath.join(':') unless classpath.empty?
args << "-classpath" << classpath.join(':') unless classpath.empty?

args << "-Djruby.home=#{JRUBY}"
args << "-Djruby.lib=#{JRUBY}/lib"