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

Commits on Mar 29, 2016

  1. [Truffle] Use current ruby for executing jruby_eclipse

    @eregon
    eregon committed Mar 29, 2016
    Copy the full SHA
    902a466 View commit details

  2. [Truffle] Eclipse launcher: mimic better the command line produced by… 

    … jruby.bash
    @eregon
    eregon committed Mar 29, 2016
    Copy the full SHA
    1d8c464 View commit details
Showing with 11 additions and 1 deletion.
  1. +11 −1 tool/jruby_eclipse
12 changes: 11 additions & 1 deletion tool/jruby_eclipse
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/ruby
#!/usr/bin/env ruby
# A JRuby launcher, in Ruby, and using the class files from Eclipse
# Currently needs the core and stdlib jar, so build them again when they change.

@@ -49,6 +49,15 @@ bootclasspath = []
classpath = []

bootclasspath << "#{JRUBY}/lib/jruby.jar"
# add other jars in lib to classpath for command-line execution
ignore = %w[jruby.jar jruby-truffle.jar jruby-complete.jar]
Dir.glob("#{JRUBY}/lib/*.jar") { |jar|
basename = File.basename(jar)
unless ignore.include?(basename)
classpath << jar
end
}

if rest.include?('-X+T')
bootclasspath += TRUFFLEJARS
classpath << SNAKEYAMLJAR
@@ -63,6 +72,7 @@ unless VERIFY_JRUBY
end

args = [java]
args << "-Xss2048k"
args << "-Djffi.boot.library.path=#{JRUBY}/lib/jni"
args << "-Xbootclasspath/a:" + bootclasspath.join(':')
args << "-classpath" << classpath.join(':') unless classpath.empty?