File tree Expand file tree Collapse file tree 2 files changed +9
-12
lines changed
Expand file tree Collapse file tree 2 files changed +9
-12
lines changed Original file line number Diff line number Diff line change @@ -8,4 +8,5 @@ group :development do
88 gem 'ruby-maven' , :platforms => :jruby
99 gem 'test-unit'
1010 gem 'test-unit-ruby-core'
11+ gem 'ruby-core-tasks' , github : 'ruby/ruby-core-tasks'
1112end
Original file line number Diff line number Diff line change @@ -4,6 +4,8 @@ require "rdoc/task"
44
55name = "stringio"
66
7+ helper = Bundler ::GemHelper . instance
8+
79case RUBY_ENGINE
810when "jruby"
911 require 'rake/javaextensiontask'
@@ -13,30 +15,24 @@ when "jruby"
1315 ext . target_version = '1.8'
1416 ext . ext_dir = 'ext/java'
1517 end
18+ libs = [ extask . lib_dir ]
1619
1720 task :build => "#{ extask . lib_dir } /#{ extask . name } .jar"
1821when "ruby"
19- require 'rake/extensiontask'
20- extask = Rake ::ExtensionTask . new ( name ) do |x |
21- x . lib_dir << "/#{ RUBY_VERSION } /#{ x . platform } "
22- end
22+ require "ruby-core/extensiontask"
23+ libs = RubyCore ::ExtensionTask . new ( helper . gemspec ) . libs
24+ task :test => :compile
2325else
2426 task :compile
2527end
2628
2729Rake ::TestTask . new ( :test ) do |t |
28- if extask
29- ENV [ "RUBYOPT" ] = "-I" + [ extask . lib_dir , "test/lib" ] . join ( File ::PATH_SEPARATOR )
30- t . libs << extask . lib_dir
31- else
32- ENV [ "RUBYOPT" ] = "-Itest/lib"
33- end
34- t . libs << "test/lib"
30+ t . libs . push ( *libs , "test/lib" )
31+ ENV [ "RUBYOPT" ] = "-I" + t . libs . join ( File ::PATH_SEPARATOR )
3532 t . ruby_opts << "-rhelper"
3633 t . test_files = FileList [ "test/**/test_*.rb" ]
3734end
3835
39- helper = Bundler ::GemHelper . instance
4036RDoc ::Task . new do |rdoc |
4137 rdoc . rdoc_files . push ( "COPYING" , "LICENSE.txt" ,
4238 "NEWS.md" , "README.md" ,
You can’t perform that action at this time.
0 commit comments