@@ -59,5 +59,8 @@ Rake.application.tasks.each do |t| if t.name =~ /:clobber/ then task :clobber => [t.name] end + if t.name =~ /:clean/ then + task :clean => [t.name] + end end Rakefile @@ -52,6 +52,6 @@ end Hitimes::GEM_SPEC_WIN = Hitimes::GEM_SPEC.clone Hitimes::GEM_SPEC_WIN.platform = ::Gem::Platform.new( "i386-mswin32_60" ) Hitimes::GEM_SPEC_WIN.extensions = [] -Hitimes::GEM_SPEC_WIN.files += ["lib/hitimes_ext.so"] +Hitimes::GEM_SPEC_WIN.files += FileList["lib/hitimes/{1.8,1.9}/**.{dll,so}"] Hitimes::SPECS = [ Hitimes::GEM_SPEC, Hitimes::GEM_SPEC_WIN ] gemspec.rb @@ -35,12 +35,25 @@ if pkg_config = Configuration.for_if_exist?("packaging") then task :reinstall => [:uninstall, :repackage, :install] desc "package up a windows gem" - task :package_win => "ext:build_win" do - #cp "ext/hitimes_ext.so", "lib", :verbose => true + task :package_win => :clobber do + Configuration.for("extension").cross_rbconfig.keys.each do |rbconfig| + v = rbconfig.split("-").last + s = v.sub(/\.\d$/,'') + sh "rake ext:build_win-#{v}" + mkdir_p "lib/hitimes/#{s}", :verbose => true + cp "ext/hitimes/hitimes_ext.so", "lib/hitimes/#{s}/", :verbose => true + end + Gem::Builder.new( Hitimes::GEM_SPEC_WIN ).build + mkdir "pkg" mv Dir["*.gem"].first, "pkg" end + task :clobber do + rm_rf "lib/hitimes/1.8" + rm_rf "lib/hitimes/1.9" + end + desc "distribute copiously" task :copious => [:package, :package_win ] do gems = Hitimes::SPECS.collect { |s| "#{s.full_name}.gem" } tasks/distribution.rake @@ -41,10 +41,13 @@ if ext_config = Configuration.for_if_exist?('extension') then end end + win_builds = [] ext_config.cross_rbconfig.keys.each do |v| s = v.split("-").last desc "Build the extension for windows version #{s}" - task "build_win-#{s}" => :clobber do + win_bname = "build_win-#{s}" + win_builds << win_bname + task win_bname => :clean do build_win( s ) end end @@ -55,7 +58,6 @@ if ext_config = Configuration.for_if_exist?('extension') then parts = path.split conf = parts.last Dir.chdir(path.dirname) do |d| - #sh "rake clean" sh "make clean" end end @@ -67,10 +69,10 @@ if ext_config = Configuration.for_if_exist?('extension') then parts = path.split conf = parts.last Dir.chdir(path.dirname) do |d| - #sh "rake clobber" if File.exist?( "Makefile" ) then sh "make distclean" end + rm_f "rbconfig.rb" end end end tasks/extension.rake 9dc281d0ddb1136153c5a87df759be9540f2ec77 Jeremy Hinegardner jeremy@hinegardner.org http://github.com/copiousfreetime/hitimes/commit/46593170c2b6751e864b58208508a9ac0397b3b1 46593170c2b6751e864b58208508a9ac0397b3b1 2009-06-28T16:18:43-07:00 2009-06-28T16:18:43-07:00 Fix up :clean and :clobber tasks 35b57f1c64480566a5e4a135100aad5567f95dc5 Jeremy Hinegardner jeremy@hinegardner.org