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

Commits on Jul 27, 2015

  1. Revert "fixes commandline execution of internal java -cp ... org.jrub… 

    …y.Main command"

This reverts commit 917d0e7.
    @mkristian
    mkristian committed Jul 27, 2015
    Copy the full SHA
    c211baa View commit details

  2. fixes commandline execution of internal java -cp ... org.jruby.Main c… 

    …ommand

it is a regression from 1.7.21 since gems with native extensions (thrift-0.9.2.0)
can not be installed with jruby-complete anymore. this patch treats the command
as series of arguments in case of the internal "jruby" command gets executed.

Sponsored by Lookout Inc.
    @mkristian
    mkristian committed Jul 27, 2015
    Copy the full SHA
    cde5bbb View commit details
Showing with 1 addition and 7 deletions.
  1. +0 −5 core/src/main/java/org/jruby/util/ShellLauncher.java
  2. +1 −2 lib/ruby/shared/rubygems/defaults/jruby.rb
5 changes: 0 additions & 5 deletions core/src/main/java/org/jruby/util/ShellLauncher.java
View file
Original file line number Diff line number Diff line change
@@ -1178,11 +1178,6 @@ public void verifyExecutableForShell() {
execArgs[0] = shell;
execArgs[1] = shell.endsWith("sh") ? "-c" : "/c";

// HACK to get the builtin command right
if (cmdline.startsWith("\"java -cp") && cmdline.contains("org.jruby.Main\"")) {
cmdline = cmdline.replace("\"java -cp", "java -cp")
.replace("org.jruby.Main\"", "org.jruby.Main");
}
if (Platform.IS_WINDOWS) {
// that's how MRI does it too
execArgs[2] = "\"" + cmdline + "\"";
3 changes: 1 addition & 2 deletions lib/ruby/shared/rubygems/defaults/jruby.rb
View file
Original file line number Diff line number Diff line change
@@ -12,8 +12,7 @@ class << self
def ruby
ruby_path = original_ruby
if jarred_path?(ruby_path)
# use quote as the original_ruby does it
ruby_path = "\"#{org.jruby.util.ClasspathLauncher.jrubyCommand(JRuby.runtime)}\""
ruby_path = "#{org.jruby.util.ClasspathLauncher.jrubyCommand(JRuby.runtime)}"
end
ruby_path
end