Skip to content

Commit 2e2532d

Browse files
committed
Move JRuby's ext and loader script
* ext/java => ext/jruby * lib/jruby/strscan.rb => ext/jruby/lib/strscan.rb * Changes to Rakefile and gemspec for new locations Fixes #38
1 parent 2efdb8e commit 2e2532d

5 files changed

Lines changed: 2 additions & 2 deletions

File tree

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if RUBY_ENGINE == "jruby"
2121
require 'maven/ruby/maven'
2222
ext.source_version = '1.8'
2323
ext.target_version = '1.8'
24-
ext.ext_dir = 'ext/java'
24+
ext.ext_dir = 'ext/jruby'
2525
end
2626
elsif RUBY_ENGINE == "ruby"
2727
require 'rake/extensiontask'

ext/java/org/jruby/ext/strscan/RubyStringScanner.java renamed to ext/jruby/org/jruby/ext/strscan/RubyStringScanner.java

File renamed without changes.

ext/java/org/jruby/ext/strscan/StringScannerLibrary.java renamed to ext/jruby/org/jruby/ext/strscan/StringScannerLibrary.java

File renamed without changes.

strscan.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
1717
s.description = "Provides lexical scanning operations on a String."
1818

1919
if RUBY_ENGINE == 'jruby'
20-
s.require_paths = %w{lib/jruby lib}
20+
s.require_paths = %w{ext/jruby/lib lib}
2121
s.files = %w{lib/strscan.jar lib/jruby/strscan.rb}
2222
s.platform = "java"
2323
else

0 commit comments

Comments
 (0)