From 9bf278936fafa04ae3ef577270c1e12878810095 Mon Sep 17 00:00:00 2001 From: George Ogata Date: Mon, 14 Mar 2011 10:26:23 -0400 Subject: [PATCH] Fix extension building tasks. --- .gitignore | 15 +++++---------- Rakefile | 11 +++++------ looksee.gemspec | 4 ++-- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 4b81b1c..c18f32f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,17 +3,12 @@ lib/looksee/mri.bundle lib/looksee/rbx.bundle lib/looksee/jruby.jar -ext/mri/Makefile -ext/mri/*.o -ext/mri/*.so -ext/mri/*.bundle -ext/mri/*.dll +ext/Makefile -ext/rbx/Makefile -ext/rbx/*.o -ext/rbx/*.so -ext/rbx/*.bundle -ext/rbx/*.dll +ext/*.o +ext/*.so +ext/*.bundle +ext/*.dll ext/jruby/**/*.class diff --git a/Rakefile b/Rakefile index 9b7145b..01a148d 100644 --- a/Rakefile +++ b/Rakefile @@ -1,10 +1,9 @@ require 'ritual' -case (Object.const_defined?(:RUBY_ENGINE) ? RUBY_ENGINE : 'ruby') -when 'ruby' - extension :mri -when 'rbx' - extension :rbx -when 'jruby' +ruby_engine = (Object.const_defined?(:RUBY_ENGINE) ? RUBY_ENGINE : 'ruby') +if ruby_engine == 'jruby' extension :jruby, :type => :jruby +else + name = ruby_engine == 'ruby' ? 'mri' : ruby_engine + extension :build_as => "ext/#{name}", :install_as => "lib/looksee/#{name}" end diff --git a/looksee.gemspec b/looksee.gemspec index 6962ad3..bc43500 100644 --- a/looksee.gemspec +++ b/looksee.gemspec @@ -22,8 +22,8 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.specification_version = 3 - s.add_development_dependency 'ritual', '>= 0.2.0' - s.add_development_dependency 'rspec', '>= 2.0.0' + s.add_development_dependency 'ritual', '0.2.1' + s.add_development_dependency 'rspec', '2.5.0' s.add_development_dependency 'mocha' s.add_development_dependency 'wirble' end