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

Commits on Jun 2, 2016

  1. Copy the full SHA
    a476a7a View commit details
  2. Copy the full SHA
    c7accc2 View commit details
Showing with 29 additions and 20 deletions.
  1. +28 −19 tool/jruby_eclipse
  2. +1 −1 tool/jt.rb
47 changes: 28 additions & 19 deletions tool/jruby_eclipse
Original file line number Diff line number Diff line change
@@ -25,26 +25,33 @@ java = ENV["JAVACMD"] || "java"

java_flags = []
rest = []

ARGV.concat ENV["JRUBY_OPTS"].to_s.split(' ')
ARGV.each { |arg|
case arg
when /^-Xmx/, "-ea"
java_flags << arg
when /^-J-G:\+/
java_flags << "-D#{GRAAL_OPTIONS_PREFIX}#{$'}=true"
when /^-J-G:-/
java_flags << "-D#{GRAAL_OPTIONS_PREFIX}#{$'}=false"
when /^-J-G:/
java_flags << "-D#{GRAAL_OPTIONS_PREFIX}#{$'}"
when /^-J/
java_flags << arg[2..-1]
when /^-Xtruffle./
java_flags << "-Djruby.#{arg[2..-1]}"
else
rest << arg
extra_classpath = []

parse_options = lambda do |args|
until args.empty?
case arg = args.shift
when /^-Xmx/, "-ea"
java_flags << arg
when /^-J-G:\+/
java_flags << "-D#{GRAAL_OPTIONS_PREFIX}#{$'}=true"
when /^-J-G:-/
java_flags << "-D#{GRAAL_OPTIONS_PREFIX}#{$'}=false"
when /^-J-G:/
java_flags << "-D#{GRAAL_OPTIONS_PREFIX}#{$'}"
when /^-J-(cp|classpath)$/
extra_classpath << args.shift
when /^-J/
java_flags << arg[2..-1]
when /^-Xtruffle./
java_flags << "-Djruby.#{arg[2..-1]}"
else
rest << arg
end
end
}
end

parse_options.call(ARGV)
parse_options.call(ENV["JRUBY_OPTS"].to_s.split(' '))

bootclasspath = []
classpath = []
@@ -73,6 +80,8 @@ unless VERIFY_JRUBY
classpath.clear
end

classpath += extra_classpath

args = [java]
args << "-Xss2048k"
args << "-Djffi.boot.library.path=#{JRUBY}/lib/jni"
2 changes: 1 addition & 1 deletion tool/jt.rb
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ def self.find_sulong_graal(dir)
searches = [
"#{dir}/../jvmci/jdk*/product/bin/java",
"#{dir}/../graal-core/mx.imports/binary/jvmci/jdk*/product/bin/java"
]
].map { |path| File.expand_path(path) }

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