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

Commits on Apr 7, 2016

  1. Copy the full SHA
    745ca33 View commit details
  2. 1
    Copy the full SHA
    2fc27e3 View commit details
5 changes: 3 additions & 2 deletions lib/ruby/truffle/jruby+truffle/lib/runner.rb
Original file line number Diff line number Diff line change
@@ -461,11 +461,12 @@ def subcommand_run(rest)
('-Xtruffle.exceptions.print_java=true' if @options[:run][:jexception])
]

cmd_options = [
bundler_setup = "./#{@options[:global][:truffle_bundle_path]}/bundler/setup.rb"
cmd_options = [
*(truffle_options unless @options[:run][:no_truffle]),
(format(@options[:global][:debug_option], @options[:global][:debug_port]) if @options[:run][:debug]),
*ruby_options,
'-r', "./#{@options[:global][:truffle_bundle_path]}/bundler/setup.rb",
*(['-r', bundler_setup] if File.exist? bundler_setup),
*@options[:run][:load_path].flat_map { |v| ['-I', v] },
*@options[:run][:require].flat_map { |v| ['-r', v] }
].compact
3 changes: 1 addition & 2 deletions lib/ruby/truffle/mri/rake/ext/module.rb
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
# require_relative '../../../stdlib/rake/ext/' + File.basename(__FILE__)
# File above is empty and causes error
require_relative '../../../stdlib/rake/ext/' + File.basename(__FILE__)
1,247 changes: 1 addition & 1,246 deletions lib/ruby/truffle/mri/rubygems.rb

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion lib/ruby/truffle/mri/rubygems/core_ext/kernel_gem.rb

This file was deleted.

1 change: 0 additions & 1 deletion lib/ruby/truffle/mri/rubygems/core_ext/kernel_require.rb

This file was deleted.

1,245 changes: 1,245 additions & 0 deletions lib/ruby/truffle/stdlib/rubygems.rb

Large diffs are not rendered by default.

73 changes: 0 additions & 73 deletions lib/ruby/truffle/stdlib/rubygems/core_ext/kernel_gem.rb

This file was deleted.

139 changes: 0 additions & 139 deletions lib/ruby/truffle/stdlib/rubygems/core_ext/kernel_require.rb

This file was deleted.

File renamed without changes.
2 changes: 2 additions & 0 deletions lib/ruby/truffle/truffle/rubygems/core_ext/kernel_gem.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# JRuby+Truffle doesn't need these hacks.
# require_relative '../../../stdlib/rubygems/core_ext/' + File.basename(__FILE__)
2 changes: 2 additions & 0 deletions lib/ruby/truffle/truffle/rubygems/core_ext/kernel_require.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# JRuby+Truffle doesn't need these hacks.
# require_relative '../../../stdlib/rubygems/core_ext/' + File.basename(__FILE__)
File renamed without changes.
3 changes: 2 additions & 1 deletion tool/truffle/strip_stdlib.rb
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
file = Pathname(file)
next arr if File.directory? file
content = File.read(file)
unless content =~ /require_relative ('|")([^'"]*)('|")( ?\+ ?File\.basename\(__FILE__\))?/
unless content =~ /^require_relative ('|")([^'"]*)('|")( ?\+ ?File\.basename\(__FILE__\))?/
puts "File #{file} has unmatched content: #{content.inspect}"
next arr
end
@@ -34,6 +34,7 @@
# pp needed_files

to_delete = stdlib_files - needed_files
to_delete.delete_if { |f| File.directory?(f) || f =~ /README\.md/ }

if ARGV[0] == 'delete'