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: 5ed3d4759fd0
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 16de7a3b44cf
Choose a head ref
  • 3 commits
  • 9 files changed
  • 2 contributors

Commits on Oct 16, 2015

  1. Copy the full SHA
    007e2ce View commit details

Commits on Oct 17, 2015

  1. Copy the full SHA
    7f40a1d View commit details
  2. Copy the full SHA
    16de7a3 View commit details
Showing with 30 additions and 854 deletions.
  1. +1 −0 .gitignore
  2. +2 −1 lib/pom.rb
  3. +13 −0 lib/pom.xml
  4. +0 −622 lib/ruby/stdlib/racc/parser.rb
  5. +0 −219 lib/ruby/stdlib/racc/rdoc/grammar.en.rdoc
  6. +2 −1 pom.rb
  7. +1 −0 pom.xml
  8. +0 −1 tool/globals_2_2_2.rb
  9. +11 −10 tool/truffle/jruby_truffle_runner/lib/jruby+truffle_runner.rb
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -53,6 +53,7 @@ lib/ruby/stdlib/org/
lib/ruby/stdlib/readline/*readline*.jar
lib/ruby/stdlib/ripper.jar
lib/ruby/stdlib/rubygems/defaults/jruby_native.rb
lib/ruby/stdlib/racc*
lib/ruby/stdlib/rake*
lib/ruby/stdlib/rdoc*
lib/ruby/stdlib/test*
3 changes: 2 additions & 1 deletion lib/pom.rb
Original file line number Diff line number Diff line change
@@ -28,7 +28,8 @@ def version
ImportedGem.new( 'power_assert', 'power_assert.version', true ),
ImportedGem.new( 'psych', '2.0.15', true ),
ImportedGem.new( 'json', 'json.version', true ),
ImportedGem.new( 'jar-dependencies', '0.1.15', true )
ImportedGem.new( 'jar-dependencies', '0.1.15', true ),
ImportedGem.new( 'racc', 'racc.version', true)
]

project 'JRuby Lib Setup' do
13 changes: 13 additions & 0 deletions lib/pom.xml
Original file line number Diff line number Diff line change
@@ -161,6 +161,19 @@ DO NOT MODIFIY - GENERATED CODE
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>racc</artifactId>
<version>${racc.version}</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
<groupId>rubygems</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>ruby-maven</artifactId>
622 changes: 0 additions & 622 deletions lib/ruby/stdlib/racc/parser.rb

This file was deleted.

219 changes: 0 additions & 219 deletions lib/ruby/stdlib/racc/rdoc/grammar.en.rdoc

This file was deleted.

3 changes: 2 additions & 1 deletion pom.rb
Original file line number Diff line number Diff line change
@@ -79,7 +79,8 @@
'main.basedir' => '${project.basedir}',
'joda.time.version' => '2.8.2',
'test-unit.version' => '3.0.3',
'power_assert.version' => '0.2.3' )
'power_assert.version' => '0.2.3',
'racc.version' => '1.4.13' )

modules [ 'truffle', 'core', 'lib' ]

1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -107,6 +107,7 @@ DO NOT MODIFIY - GENERATED CODE
<properties>
<rspec-core.version>3.3.2</rspec-core.version>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<racc.version>1.4.13</racc.version>
<its.j2ee>j2ee*/pom.xml</its.j2ee>
<jruby.basedir>${project.basedir}</jruby.basedir>
<minitest.version>5.4.1</minitest.version>
1 change: 0 additions & 1 deletion tool/globals_2_2_2.rb
Original file line number Diff line number Diff line change
@@ -42,7 +42,6 @@
profile.rb
profiler.rb
pstore.rb
racc
rbconfig
resolv-replace.rb
resolv.rb
21 changes: 11 additions & 10 deletions tool/truffle/jruby_truffle_runner/lib/jruby+truffle_runner.rb
Original file line number Diff line number Diff line change
@@ -18,7 +18,8 @@
class JRubyTruffleRunner
attr_reader :options

EXECUTABLE = 'jruby+truffle'
EXECUTABLE = File.basename($PROGRAM_NAME)
BRANDING = EXECUTABLE.include?('jruby') ? 'JRuby+Truffle' : 'RubyTruffle'
LOCAL_CONFIG_FILE = '.jruby+truffle.yaml'

begin
@@ -47,7 +48,7 @@ class JRubyTruffleRunner
debug_option: ['--debug-option OPTION', 'Debug JVM option', assign_new_value,
'-J-agentlib:jdwp=transport=dt_socket,server=y,address=%d,suspend=y'],
truffle_bundle_path: ['--truffle-bundle-path NAME', 'Bundle path', assign_new_value, '.jruby+truffle_bundle'],
jruby_truffle_path: ['--jruby-truffle-path PATH', 'Path to JRuby+Truffle bin/jruby', assign_new_value,
interpreter_path: ['--interpreter-path PATH', "Path to #{BRANDING} interpreter executable", assign_new_value,
'../jruby/bin/jruby'],
graal_path: ['--graal-path PATH', 'Path to Graal', assign_new_value, '../graalvm-jdk1.8.0/bin/java'],
mock_load_path: ['--mock-load-path PATH', 'Path of mocks & monkey-patches (prepended in $:, relative to --truffle_bundle_path)',
@@ -61,10 +62,10 @@ class JRubyTruffleRunner
},
run: {
help: ['-h', '--help', 'Show this message', assign_new_value, false],
test: ['-t', '--test', 'Do not use Truffle use plain JRuby', assign_new_value, false],
test: ['-t', '--test', "Use conventional JRuby instead of #{BRANDING}", assign_new_value, false],
graal: ['-g', '--graal', 'Run on graal', assign_new_value, false],
build: ['-b', '--build', 'Run `jt build` in JRuby', assign_new_value, false],
rebuild: ['--rebuild', 'Run `jt rebuild` in JRuby', assign_new_value, false],
build: ['-b', '--build', 'Run `jt build` using conventional JRuby', assign_new_value, false],
rebuild: ['--rebuild', 'Run `jt rebuild` using conventional JRuby', assign_new_value, false],
debug: ['-d', '--debug', 'JVM remote debugging', assign_new_value, false],
require: ['-r', '--require FILE', 'Files to require, same as Ruby\'s -r', add_to_array, []],
require_pattern: ['--require-pattern DIR_GLOB_PATTERN', 'Files matching the pattern will be required', apply_pattern, nil],
@@ -87,7 +88,7 @@ class JRubyTruffleRunner
Usage: #{EXECUTABLE} [options] [subcommand [subcommand-options]]
Subcommands are: #{(OPTION_DEFINITIONS.keys - [:global]).map(&:to_s).join(', ')}
Allows to execute gem/app on JRuby+Truffle until it's more complete. Environment
Allows to execute gem/app on #{BRANDING} until it's more complete. Environment
has to be set up first with setup subcommand then run subcommand can be used.
Run #{EXECUTABLE} readme to see README.
@@ -99,15 +100,15 @@ class JRubyTruffleRunner
Usage: #{EXECUTABLE} [options] setup [subcommand-options]
Creates environment for running gem/app on JRuby+Truflle.
Creates environment for running gem/app on #{BRANDING}.
TXT

run_help = <<-TXT.gsub(/^ {6}/, '')
Usage: #{EXECUTABLE} [options] run [subcommand-options] -- [ruby-options]
Runs file, -e expr, etc in setup environment on JRuby+Truffle
Runs file, -e expr, etc in setup environment on #{BRANDING}
(options after -- are interpreted by ruby not by this tool)
Examples: #{EXECUTABLE} run -- a_file.rb
#{EXECUTABLE} run -- -S irb
@@ -301,7 +302,7 @@ def subcommand_setup(vm_options, rest)
end

def subcommand_run(vm_options, rest)
jruby_path = Pathname("#{@options[:global][:jruby_truffle_path]}/../..")
jruby_path = Pathname("#{@options[:global][:interpreter_path]}/../..")

unless jruby_path.absolute?
jruby_path = jruby_path.relative_path_from(Pathname('.'))
@@ -336,7 +337,7 @@ def subcommand_run(vm_options, rest)
env['JAVACMD'] = @options[:global][:graal_path] if @options[:run][:graal]

cmd = [(env unless env.empty?),
@options[:global][:jruby_truffle_path],
@options[:global][:interpreter_path],
*cmd_options,
executable,
*rest