rake-compiler 0.8.3 → 0.9.0.pre.1

data/{Isolate → Gemfile}

@@ -1,6 +1,8 @@
+source "https://rubygems.org"
+
 gem "rake"
 
-env :development do
+group :development do
   gem "rspec",    "~> 2.8.0"
   gem "cucumber", "~> 1.1.4"
 end

data/History.txt

@@ -1,3 +1,31 @@
+=== 0.9.0.pre.1 / 2013-05-05
+
+* Enhancements:
+  * Add support for cross-builds and multiple platforms (x86/x64).
+    Pull #74 [larskanis]
+
+      $ rake-compiler cross-ruby VERSION=1.8.7-p371
+      $ rake-compiler cross-ruby VERSION=1.9.3-p392
+      $ rake-compiler cross-ruby VERSION=2.0.0-p0
+      $ rake-compiler cross-ruby VERSION=2.0.0-p0 HOST=x86_64-w64-mingw32
+      $ rake cross compile RUBY_CC_VERSION=1.8.7:1.9.3:2.0.0
+
+      # Rakefile
+      ext.cross_platform = %w[i386-mingw32 x64-mingw32]
+
+  * Support for cross-platform specific options. Pull #74 [larskanis]
+
+      # Rakefile
+      ext.cross_config_options << "--with-common-option"
+      ext.cross_config_options << {"x64-mingw32" => "--enable-64bits"}
+
+* Bugfixes:
+  * Correct fat-gems support caused by RubyGems issues. Pull #76 [knu]
+
+* Deprecations:
+  * Requires minimum Ruby 1.8.7 and RubyGems 1.8.25
+  * Usage of 'i386-mswin32' needs to be changed to 'i386-mswin32-60'
+
 === 0.8.3 / 2013-02-16
 
 * Bugfixes:

data/README.rdoc

@@ -274,9 +274,9 @@ on the Windows host system you're cross-compiling for. An example:
 
   # File: ~/.rake-compiler/config.yml
 
-  rbconfig-1.8.6: /path/to/ruby-1.8.6/rbconfig.rb
-  rbconfig-1.8.7: /path/to/ruby-1.8.7/rbconfig.rb
-  rbconfig-1.9.2: /path/to/ruby-1.9.2/rbconfig.rb
+  rbconfig-i386-mingw32-1.8.6: /path/to/ruby-1.8.6/rbconfig.rb
+  rbconfig-i386-mingw32-1.8.7: /path/to/ruby-1.8.7/rbconfig.rb
+  rbconfig-i386-mingw32-1.9.2: /path/to/ruby-1.9.2/rbconfig.rb
 
 If, instead, you want to build a different Ruby version than the default one, please
 supply a <tt>VERSION</tt>:
@@ -298,7 +298,7 @@ Now, you only need specify a few additional options in your extension definition
 
     Rake::ExtensionTask.new('my_extension', gem_spec) do |ext|
       ext.cross_compile = true                # enable cross compilation (requires cross compile toolchain)
-      ext.cross_platform = 'i386-mswin32'     # forces the Windows platform instead of the default one
+      ext.cross_platform = 'i386-mswin32-60'     # forces the Windows platform instead of the default one
                                               # configure options only for cross compile
       ext.cross_config_options << '--with-something'
 
@@ -312,7 +312,7 @@ By default, cross compilation targets 'i386-mingw32' which is the default GCC
 platform for Ruby.
 
 To target gems for MRI Ruby's current official distribution, please force the
-platform to the one (i386-mswin32) previously shown.
+platform to the one (i386-mswin32-60) previously shown.
 
 === Warning, magician about to do some tricks, don't blink!
 

data/Rakefile

@@ -11,11 +11,5 @@
 # Thank You.
 #
 
-begin
-  require "isolate/now"
-rescue LoadError => e
-  abort "This project requires Isolate to work. Please `gem install isolate` and try again."
-end
-
 # load rakefile extensions (tasks)
 Dir['tasks/*.rake'].sort.each { |f| load f }

data/features/cross-compile.feature

@@ -16,7 +16,8 @@ Feature: Cross-compile C extensions
     Given that all my source files are in place
     And I'm running a POSIX operating system
     And I've installed cross compile toolchain
-    When rake task 'cross compile RUBY_CC_VERSION=1.8.7:1.9.3' is invoked
-    Then rake task 'cross compile RUBY_CC_VERSION=1.8.7:1.9.3' succeeded
+    When rake task 'cross compile RUBY_CC_VERSION=1.8.7:1.9.3:2.0.0' is invoked
+    Then rake task 'cross compile RUBY_CC_VERSION=1.8.7:1.9.3:2.0.0' succeeded
     And binaries for platform 'i386-mingw32' version '1.8' get copied
     And binaries for platform 'i386-mingw32' version '1.9' get copied
+    And binaries for platform 'i386-mingw32' version '2.0' get copied

data/features/cross-package-multi.feature

@@ -11,5 +11,5 @@ Feature: Generate multiple Windows gems from Linux
     And I've already successfully executed rake task 'cross compile'
     When rake task 'cross native gem' is invoked
     Then rake task 'cross native gem' succeeded
-    And gem for platform 'x86-mswin32' get generated
+    And gem for platform 'x86-mswin32-60' get generated
     And gem for platform 'x86-mingw32' get generated

data/features/support/env.rb

@@ -4,3 +4,7 @@ require 'fileutils'
 require 'rbconfig'
 
 ROOT_PATH = File.expand_path(File.join(File.dirname(__FILE__), '../..'))
+
+# get rid of Bundler environment polution
+defined?(Bundler) and
+  ENV.delete("RUBYOPT")

data/features/support/file_template_helpers.rb

@@ -69,7 +69,7 @@ EOF
 require 'rake/extensiontask'
 Rake::ExtensionTask.new("#{extension_name}", SPEC) do |ext|
   ext.cross_compile = true
-  ext.cross_platform = ['x86-mswin32', 'x86-mingw32']
+  ext.cross_platform = ['i386-mswin32-60', 'i386-mingw32']
 end
 EOF
   end

data/lib/rake/extensiontask.rb

@@ -12,7 +12,7 @@ module Rake
     attr_accessor :config_script
     attr_accessor :cross_compile
     attr_accessor :cross_platform
-    attr_accessor :cross_config_options
+    attr_writer :cross_config_options
     attr_accessor :no_native
     attr_accessor :config_includes
 
@@ -73,6 +73,19 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/native compile.
       end
     end
 
+    def cross_config_options(for_platform=nil)
+      return @cross_config_options unless for_platform
+
+      # apply options for this platform, only
+      @cross_config_options.map do |option|
+        if option.kind_of?(Hash)
+          option[for_platform] || []
+        else
+          option
+        end
+      end.flatten
+    end
+
     private
     def define_compile_tasks(for_platform = nil, ruby_ver = RUBY_VERSION)
       # platform usage
@@ -83,14 +96,17 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/native compile.
 
       # tmp_path
       tmp_path = "#{@tmp_dir}/#{platf}/#{@name}/#{ruby_ver}"
+      stage_path = "#{@tmp_dir}/#{platf}/stage"
 
       # cleanup and clobbering
       CLEAN.include(tmp_path)
+      CLEAN.include(stage_path)
       CLOBBER.include("#{lib_path}/#{binary(platf)}")
       CLOBBER.include("#{@tmp_dir}")
 
       # directories we need
       directory tmp_path
+      directory "#{stage_path}/#{lib_path}"
       directory lib_dir
 
       # copy binary from temporary location to final lib
@@ -98,12 +114,36 @@ Rerun `rake` under MRI Ruby 1.8.x/1.9.x to cross/native compile.
       task "copy:#{@name}:#{platf}:#{ruby_ver}" => [lib_path, "#{tmp_path}/#{binary(platf)}"] do
         install "#{tmp_path}/#{binary(platf)}", "#{lib_path}/#{binary(platf)}"
       end
+      # copy binary from temporary location to staging directory
+      task "copy:#{@name}:#{platf}:#{ruby_ver}" => ["#{stage_path}/#{lib_path}", "#{tmp_path}/#{binary(platf)}"] do
+        cp "#{tmp_path}/#{binary(platf)}", "#{stage_path}/#{lib_path}/#{binary(platf)}"
+      end
+
+      # copy other gem files to staging directory
+      if @gem_spec
+        @gem_spec.files.each do |gem_file|
+          # ignore directories and the binary extension
+          next if File.directory?(gem_file) || gem_file == "#{lib_path}/#{binary(platf)}"
+          stage_file = "#{stage_path}/#{gem_file}"
+
+          # copy each file from base to stage directory
+          unless Rake::Task.task_defined?(stage_file) then
+            directory File.dirname(stage_file)
+            file stage_file => [File.dirname(stage_file), gem_file] do
+              cp gem_file, stage_file
+            end
+          end
+
+          # append each file to the copy task
+          task "copy:#{@name}:#{platf}:#{ruby_ver}" => [stage_file]
+        end
+      end
 
       # binary in temporary folder depends on makefile and source files
       # tmp/extension_name/extension_name.{so,bundle}
       file "#{tmp_path}/#{binary(platf)}" => ["#{tmp_path}/Makefile"] + source_files do
         jruby_compile_msg = <<-EOF
-Compiling a native C extension on JRuby. This is discouraged and a 
+Compiling a native C extension on JRuby. This is discouraged and a
 Java extension should be preferred.
         EOF
         warn_once(jruby_compile_msg) if defined?(JRUBY_VERSION)
@@ -122,11 +162,6 @@ Java extension should be preferred.
         include_dirs = ['.'].concat(@config_includes).uniq.join(File::PATH_SEPARATOR)
         cmd = [Gem.ruby, "-I#{include_dirs}"]
 
-        # if fake.rb is present, add to the command line
-        if t.prerequisites.include?("#{tmp_path}/fake.rb") then
-          cmd << '-rfake'
-        end
-
         # build a relative path to extconf script
         abs_tmp_path = (Pathname.new(Dir.pwd) + tmp_path).realpath
         abs_extconf = (Pathname.new(Dir.pwd) + extconf).realpath
@@ -136,7 +171,7 @@ Java extension should be preferred.
 
         # rbconfig.rb will be present if we are cross compiling
         if t.prerequisites.include?("#{tmp_path}/rbconfig.rb") then
-          options.push(*@cross_config_options)
+          options.push(*cross_config_options(platf))
         end
 
         # add options to command
@@ -186,6 +221,7 @@ Java extension should be preferred.
 
       # tmp_path
       tmp_path = "#{@tmp_dir}/#{platf}/#{@name}/#{ruby_ver}"
+      stage_path = "#{@tmp_dir}/#{platf}/stage"
 
       # lib_path
       lib_path = lib_dir
@@ -209,7 +245,8 @@ Java extension should be preferred.
 
           # go through native prerequisites and grab the real extension files from there
           t.prerequisites.each do |ext|
-            ext_files << ext
+            # strip stage path and keep lib/... only
+            ext_files << ext.sub(stage_path+"/", '')
           end
 
           # include the files in the gem specification
@@ -221,20 +258,46 @@ Java extension should be preferred.
           end
 
           # Generate a package for this gem
-          Gem::PackageTask.new(spec) do |pkg|
+          pkg = Gem::PackageTask.new(spec) do |pkg|
             pkg.need_zip = false
             pkg.need_tar = false
+            # Do not copy any files per PackageTask, because
+            # we need the files from the staging directory
+            pkg.package_files.clear
+          end
+
+          # Copy from staging directory to gem package directory.
+          # This is derived from the code of Gem::PackageTask
+          # but uses stage_path as source directory.
+          stage_files = spec.files.map do |gem_file|
+            File.join(stage_path, gem_file)
+          end
+          file pkg.package_dir_path => stage_files do
+            mkdir_p pkg.package_dir rescue nil
+            spec.files.each do |ft|
+              fn = File.join(stage_path, ft)
+              f = File.join(pkg.package_dir_path, ft)
+              fdir = File.dirname(f)
+              mkdir_p(fdir) if !File.exist?(fdir)
+              if File.directory?(fn)
+                mkdir_p(f)
+              else
+                rm_f f
+                safe_ln(fn, f)
+              end
+            end
           end
         end
       end
 
       # add binaries to the dependency chain
-      task "native:#{@gem_spec.name}:#{platf}" => ["#{lib_path}/#{binary(platf)}"]
+      task "native:#{@gem_spec.name}:#{platf}" => ["#{stage_path}/#{lib_dir}/#{binary(platf)}"]
 
       # ensure the extension get copied
       unless Rake::Task.task_defined?("#{lib_path}/#{binary(platf)}") then
         file "#{lib_path}/#{binary(platf)}" => ["copy:#{@name}:#{platf}:#{ruby_ver}"]
       end
+      file "#{stage_path}/#{lib_dir}/#{binary(platf)}" => ["copy:#{@name}:#{platf}:#{ruby_ver}"]
 
       # Allow segmented packaging by platform (open door for 'cross compile')
       task "native:#{platf}" => ["native:#{@gem_spec.name}:#{platf}"]
@@ -290,8 +353,8 @@ Java extension should be preferred.
       # lib_path
       lib_path = lib_dir
 
-      unless rbconfig_file = config_file["rbconfig-#{ruby_ver}"] then
-        warn "no configuration section for specified version of Ruby (rbconfig-#{ruby_ver})"
+      unless rbconfig_file = config_file["rbconfig-#{for_platform}-#{ruby_ver}"] then
+        warn "no configuration section for specified version of Ruby (rbconfig-#{for_platform}-#{ruby_ver})"
         return
       end
 
@@ -308,7 +371,10 @@ Java extension should be preferred.
 
       # copy the file from the cross-ruby location
       file "#{tmp_path}/rbconfig.rb" => [rbconfig_file] do |t|
-        cp t.prerequisites.first, t.name
+        File.open(t.name, 'w') do |f|
+          f.write "require 'fake.rb'\n\n"
+          f.write File.read(t.prerequisites.first)
+        end
       end
 
       # copy mkmf from cross-ruby location

data/spec/lib/rake/extensiontask_spec.rb

@@ -264,7 +264,7 @@ describe Rake::ExtensionTask do
         context 'native:my_gem:{platform}' do
           it 'should depend on binary extension' do
             Rake::ExtensionTask.new('extension_one', @spec)
-            Rake::Task["native:my_gem:#{@platform}"].prerequisites.should include("lib/#{@ext_bin}")
+            Rake::Task["native:my_gem:#{@platform}"].prerequisites.should include("tmp/#{@platform}/stage/lib/#{@ext_bin}")
           end
         end
       end
@@ -278,7 +278,8 @@ describe Rake::ExtensionTask do
         @spec = mock_gem_spec
         @config_file = File.expand_path("~/.rake-compiler/config.yml")
         @ruby_ver = RUBY_VERSION
-        @config_path = mock_config_yml["rbconfig-#{@ruby_ver}"]
+        @platform = 'i386-mingw32'
+        @config_path = mock_config_yml["rbconfig-#{@platform}-#{@ruby_ver}"]
 
         File.stub!(:open).and_yield(mock_fake_rb)
       end
@@ -317,7 +318,7 @@ describe Rake::ExtensionTask do
 
       it 'should warn if no section of config file defines running version of ruby' do
         config = mock(Hash)
-        config.should_receive(:[]).with("rbconfig-#{@ruby_ver}").and_return(nil)
+        config.should_receive(:[]).with("rbconfig-#{@platform}-#{@ruby_ver}").and_return(nil)
         YAML.stub!(:load_file).and_return(config)
         out, err = capture_output do
           Rake::ExtensionTask.new('extension_one') do |ext|
@@ -339,7 +340,7 @@ describe Rake::ExtensionTask do
 
       it 'should allow usage of RUBY_CC_VERSION to indicate a different version of ruby' do
         config = mock(Hash)
-        config.should_receive(:[]).with("rbconfig-1.9.1").and_return('/path/to/ruby/1.9.1/rbconfig.rb')
+        config.should_receive(:[]).with("rbconfig-i386-mingw32-1.9.1").and_return('/path/to/ruby/1.9.1/rbconfig.rb')
         YAML.stub!(:load_file).and_return(config)
 
         ENV['RUBY_CC_VERSION'] = '1.9.1'
@@ -350,8 +351,8 @@ describe Rake::ExtensionTask do
 
       it 'should allow multiple versions be supplied to RUBY_CC_VERSION' do
         config = mock(Hash)
-        config.should_receive(:[]).once.with("rbconfig-1.8.6").and_return('/path/to/ruby/1.8.6/rbconfig.rb')
-        config.should_receive(:[]).once.with("rbconfig-1.9.1").and_return('/path/to/ruby/1.9.1/rbconfig.rb')
+        config.should_receive(:[]).once.with("rbconfig-i386-mingw32-1.8.6").and_return('/path/to/ruby/1.8.6/rbconfig.rb')
+        config.should_receive(:[]).once.with("rbconfig-i386-mingw32-1.9.1").and_return('/path/to/ruby/1.9.1/rbconfig.rb')
         YAML.stub!(:load_file).and_return(config)
 
         ENV['RUBY_CC_VERSION'] = '1.8.6:1.9.1'
@@ -440,15 +441,24 @@ describe Rake::ExtensionTask do
       end
 
       context '(cross for multiple platforms)' do
-        it 'should define task for each supplied platform' do
+        before :each do
           @ext = Rake::ExtensionTask.new('extension_one', @spec) do |ext|
             ext.cross_compile = true
             ext.cross_platform = ['universal-known', 'universal-unknown']
+            ext.cross_config_options << '--with-something'
+            ext.cross_config_options << {'universal-known' => '--with-known'}
           end
+        end
 
+        it 'should define task for each supplied platform' do
           Rake::Task.should have_defined('compile:universal-known')
           Rake::Task.should have_defined('compile:universal-unknown')
         end
+
+        it 'should filter options for each supplied platform' do
+          @ext.cross_config_options('universal-unknown').should eq(%w[--with-something])
+          @ext.cross_config_options('universal-known').should eq(%w[--with-something --with-known])
+        end
       end
     end
   end
@@ -460,18 +470,28 @@ describe Rake::ExtensionTask do
 
   def mock_gem_spec(stubs = {})
     mock(Gem::Specification,
-      { :name => 'my_gem', :platform => 'ruby' }.merge(stubs)
+      { :name => 'my_gem', :platform => 'ruby', :files => [] }.merge(stubs)
     )
   end
 
   def mock_config_yml
     {
-      'rbconfig-1.8.6' => '/some/path/version/1.8/to/rbconfig.rb',
-      'rbconfig-1.8.7' => '/some/path/version/1.8/to/rbconfig.rb',
-      'rbconfig-1.9.1' => '/some/path/version/1.9.1/to/rbconfig.rb',
-      'rbconfig-1.9.2' => '/some/path/version/1.9.1/to/rbconfig.rb',
-      'rbconfig-1.9.3' => '/some/path/version/1.9.1/to/rbconfig.rb',
-      'rbconfig-3.0.0' => '/some/fake/version/3.0.0/to/rbconfig.rb'
+      'rbconfig-i386-mingw32-1.8.6' => '/some/path/version/1.8/to/rbconfig.rb',
+      'rbconfig-universal-unknown-1.8.6' => '/some/path/version/1.8/to/rbconfig.rb',
+      'rbconfig-i386-mingw32-1.8.7' => '/some/path/version/1.8/to/rbconfig.rb',
+      'rbconfig-universal-known-1.8.7' => '/some/path/version/1.8/to/rbconfig.rb',
+      'rbconfig-universal-unknown-1.8.7' => '/some/path/version/1.8/to/rbconfig.rb',
+      'rbconfig-universal-unknown-1.9.1' => '/some/path/version/1.9.1/to/rbconfig.rb',
+      'rbconfig-universal-unknown-1.9.2' => '/some/path/version/1.9.1/to/rbconfig.rb',
+      'rbconfig-universal-unknown-1.9.3' => '/some/path/version/1.9.1/to/rbconfig.rb',
+      'rbconfig-i386-mingw32-1.9.3' => '/some/path/version/1.9.1/to/rbconfig.rb',
+      'rbconfig-universal-known-1.9.3' => '/some/path/version/1.9.1/to/rbconfig.rb',
+      'rbconfig-universal-known-2.0.0' => '/some/path/version/2.0.0/to/rbconfig.rb',
+      'rbconfig-universal-unknown-1.9.3' => '/some/path/version/1.9.1/to/rbconfig.rb',
+      'rbconfig-universal-unknown-2.0.0' => '/some/path/version/2.0.0/to/rbconfig.rb',
+      'rbconfig-i386-mingw32-2.0.0' => '/some/path/version/2.0.0/to/rbconfig.rb',
+      'rbconfig-x64-mingw32-2.0.0' => '/some/path/version/2.0.0/to/rbconfig.rb',
+      'rbconfig-x64-mingw32-3.0.0' => '/some/fake/version/3.0.0/to/rbconfig.rb'
     }
   end
 

data/tasks/bin/cross-ruby.rake

@@ -42,7 +42,7 @@ require 'rake/extensioncompiler'
 
 MAKE = ENV['MAKE'] || %w[gmake make].find { |c| system("#{c} -v > /dev/null 2>&1") }
 USER_HOME = File.expand_path("~/.rake-compiler")
-RUBY_CC_VERSION = "ruby-" << ENV.fetch("VERSION", "1.8.7-p334")
+RUBY_CC_VERSION = "ruby-" << ENV.fetch("VERSION", "1.8.7-p371")
 RUBY_SOURCE = ENV['SOURCE']
 RUBY_BUILD = RbConfig::CONFIG["host"]
 
@@ -60,16 +60,16 @@ end
 
 # define a location where sources will be stored
 directory "#{USER_HOME}/sources/#{RUBY_CC_VERSION}"
-directory "#{USER_HOME}/builds/#{RUBY_CC_VERSION}"
+directory "#{USER_HOME}/builds/#{MINGW_HOST}/#{RUBY_CC_VERSION}"
 
 # clean intermediate files and folders
 CLEAN.include("#{USER_HOME}/sources/#{RUBY_CC_VERSION}")
-CLEAN.include("#{USER_HOME}/builds/#{RUBY_CC_VERSION}")
+CLEAN.include("#{USER_HOME}/builds/#{MINGW_HOST}/#{RUBY_CC_VERSION}")
 
 # remove the final products and sources
 CLOBBER.include("#{USER_HOME}/sources")
 CLOBBER.include("#{USER_HOME}/builds")
-CLOBBER.include("#{USER_HOME}/ruby/#{RUBY_CC_VERSION}")
+CLOBBER.include("#{USER_HOME}/ruby/#{MINGW_HOST}/#{RUBY_CC_VERSION}")
 CLOBBER.include("#{USER_HOME}/config.yml")
 
 # ruby source file should be stored there
@@ -126,7 +126,7 @@ task :mingw32 do
 end
 
 # generate the makefile in a clean build location
-file "#{USER_HOME}/builds/#{RUBY_CC_VERSION}/Makefile" => ["#{USER_HOME}/builds/#{RUBY_CC_VERSION}",
+file "#{USER_HOME}/builds/#{MINGW_HOST}/#{RUBY_CC_VERSION}/Makefile" => ["#{USER_HOME}/builds/#{MINGW_HOST}/#{RUBY_CC_VERSION}",
                                   "#{USER_HOME}/sources/#{RUBY_CC_VERSION}/Makefile.in"] do |t|
 
   options = [
@@ -143,26 +143,26 @@ file "#{USER_HOME}/builds/#{RUBY_CC_VERSION}/Makefile" => ["#{USER_HOME}/builds/
   options << "--with-winsock2" if MAJOR == "1.8"
 
   chdir File.dirname(t.name) do
-    prefix = File.expand_path("../../ruby/#{RUBY_CC_VERSION}")
+    prefix = File.expand_path("../../../ruby/#{MINGW_HOST}/#{RUBY_CC_VERSION}")
     options << "--prefix=#{prefix}"
-    sh File.expand_path("../../sources/#{RUBY_CC_VERSION}/configure"), *options
+    sh File.expand_path("../../../sources/#{RUBY_CC_VERSION}/configure"), *options
   end
 end
 
 # make
-file "#{USER_HOME}/builds/#{RUBY_CC_VERSION}/ruby.exe" => ["#{USER_HOME}/builds/#{RUBY_CC_VERSION}/Makefile"] do |t|
+file "#{USER_HOME}/builds/#{MINGW_HOST}/#{RUBY_CC_VERSION}/ruby.exe" => ["#{USER_HOME}/builds/#{MINGW_HOST}/#{RUBY_CC_VERSION}/Makefile"] do |t|
   chdir File.dirname(t.prerequisites.first) do
     sh MAKE
   end
 end
 
 # make install
-file "#{USER_HOME}/ruby/#{RUBY_CC_VERSION}/bin/ruby.exe" => ["#{USER_HOME}/builds/#{RUBY_CC_VERSION}/ruby.exe"] do |t|
+file "#{USER_HOME}/ruby/#{MINGW_HOST}/#{RUBY_CC_VERSION}/bin/ruby.exe" => ["#{USER_HOME}/builds/#{MINGW_HOST}/#{RUBY_CC_VERSION}/ruby.exe"] do |t|
   chdir File.dirname(t.prerequisites.first) do
     sh "#{MAKE} install"
   end
 end
-task :install => ["#{USER_HOME}/ruby/#{RUBY_CC_VERSION}/bin/ruby.exe"]
+task :install => ["#{USER_HOME}/ruby/#{MINGW_HOST}/#{RUBY_CC_VERSION}/bin/ruby.exe"]
 
 desc "Update rake-compiler list of installed Ruby versions"
 task 'update-config' do
@@ -175,12 +175,19 @@ task 'update-config' do
     config = {}
   end
 
-  files = Dir.glob("#{USER_HOME}/ruby/*/**/rbconfig.rb").sort
+  files = Dir.glob("#{USER_HOME}/ruby/*/*/**/rbconfig.rb").sort
 
   files.each do |rbconfig|
-    version = rbconfig.match(/.*-(\d.\d.\d)/)[1]
-    config["rbconfig-#{version}"] = rbconfig
-    puts "Found Ruby version #{version} (#{rbconfig})"
+    version, platform = rbconfig.match(/.*-(\d.\d.\d).*\/([-\w]+)\/rbconfig/)[1,2]
+    config["rbconfig-#{platform}-#{version}"] = rbconfig
+
+    # fake alternate (binary compatible) i386-mswin32-60 platform
+    if platform == "i386-mingw32"
+      alt_platform = "i386-mswin32-60"
+      config["rbconfig-#{alt_platform}-#{version}"] = rbconfig
+    end
+
+    puts "Found Ruby version #{version} for platform #{platform} (#{rbconfig})"
   end
 
   when_writing("Saving changes into #{config_file}") {

data/tasks/bootstrap.rake

@@ -2,7 +2,7 @@ desc 'Ensure all the cross compiled versions are installed'
 task :bootstrap do
   fail "Sorry, this only works on OSX and Linux" if RUBY_PLATFORM =~ /mswin|mingw/
 
-  versions = %w(1.8.6-p398 1.9.1-p243 1.9.2-p0)
+  versions = %w(1.8.7-p371 1.9.3-p392 2.0.0-p0)
 
   versions.each do |version|
     puts "[INFO] Attempt to cross-compile Ruby #{version}"

data/tasks/gem.rake

@@ -3,7 +3,7 @@ require 'rubygems/package_task'
 GEM_SPEC = Gem::Specification.new do |s|
   # basic information
   s.name        = "rake-compiler"
-  s.version     = "0.8.3"
+  s.version     = "0.9.0.pre.1"
   s.platform    = Gem::Platform::RUBY
 
   # description and details
@@ -11,8 +11,8 @@ GEM_SPEC = Gem::Specification.new do |s|
   s.description = "Provide a standard and simplified way to build and package\nRuby extensions (C, Java) using Rake as glue."
 
   # requirements
-  s.required_ruby_version = ">= 1.8.6"
-  s.required_rubygems_version = ">= 1.3.5"
+  s.required_ruby_version = ">= 1.8.7"
+  s.required_rubygems_version = ">= 1.8.25"
 
   # dependencies
   s.add_dependency  'rake'
@@ -24,7 +24,7 @@ GEM_SPEC = Gem::Specification.new do |s|
   # components, files and paths
   s.files = FileList["features/**/*.{feature,rb}", "bin/rake-compiler",
                       "lib/**/*.rb", "spec/spec.opts", "spec/**/*.rb",
-                      "tasks/**/*.rake", "Rakefile", "Isolate",
+                      "tasks/**/*.rake", "Rakefile", "Gemfile",
                       "*.{rdoc,txt,yml}"]
 
   s.bindir      = 'bin'

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rake-compiler
 version: !ruby/object:Gem::Version 
-  hash: 57
-  prerelease: 
+  hash: 2946513
+  prerelease: 6
   segments: 
   - 0
-  - 8
-  - 3
-  version: 0.8.3
+  - 9
+  - 0
+  - pre
+  - 1
+  version: 0.9.0.pre.1
 platform: ruby
 authors: 
 - Luis Lavena
@@ -15,12 +17,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-16 00:00:00 Z
+date: 2013-05-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: rake
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +32,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  name: rspec
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,12 +48,12 @@ dependencies:
         - 8
         - 0
         version: 2.8.0
-  type: :development
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  name: cucumber
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,8 +64,7 @@ dependencies:
         - 1
         - 4
         version: 1.1.4
-  type: :development
-  version_requirements: *id003
+  requirement: *id003
 description: |-
   Provide a standard and simplified way to build and package
   Ruby extensions (C, Java) using Rake as glue.
@@ -113,7 +115,7 @@ files:
 - tasks/release.rake
 - tasks/rspec.rake
 - Rakefile
-- Isolate
+- Gemfile
 - History.txt
 - LICENSE.txt
 - README.rdoc
@@ -134,23 +136,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 59
+      hash: 57
       segments: 
       - 1
       - 8
-      - 6
-      version: 1.8.6
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 17
+      hash: 5
       segments: 
       - 1
-      - 3
-      - 5
-      version: 1.3.5
+      - 8
+      - 25
+      version: 1.8.25
 requirements: []
 
 rubyforge_project: rake-compiler