Skip to content

Commit 6b1fc8a

Browse files
committed
Use ruby-core-tasks
1 parent 9954dab commit 6b1fc8a

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff 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'
1112
end

Rakefile

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ require "rdoc/task"
44

55
name = "stringio"
66

7+
helper = Bundler::GemHelper.instance
8+
79
case RUBY_ENGINE
810
when "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"
1821
when "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
2325
else
2426
task :compile
2527
end
2628

2729
Rake::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"]
3734
end
3835

39-
helper = Bundler::GemHelper.instance
4036
RDoc::Task.new do |rdoc|
4137
rdoc.rdoc_files.push("COPYING", "LICENSE.txt",
4238
"NEWS.md", "README.md",

0 commit comments

Comments
 (0)