Merge pull request #104 from larskanis/x64-mingw32-lars

More Windows x64 support

Author: luislavena

Gemfile

@@ -0,0 +1,15 @@
+# -*- ruby -*-
+
+# DO NOT EDIT THIS FILE. Instead, edit Rakefile, and run `rake bundler:gemfile`.
+
+source "https://rubygems.org/"
+
+
+gem "minitest", "~>5.0", :group => [:development, :test]
+gem "rdoc", "~>4.0", :group => [:development, :test]
+gem "rake-compiler", "~>0.9.1", :group => [:development, :test]
+gem "mini_portile", "~>0.2.2", :group => [:development, :test]
+gem "hoe-bundler", "~>1.0", :group => [:development, :test]
+gem "hoe", "~>3.7", :group => [:development, :test]
+
+# vim: syntax=ruby

tasks/gem.rake

@@ -6,7 +6,7 @@ rescue LoadError
   require 'hoe'
 end
 
-Hoe.plugin :debugging, :doofus, :git, :minitest
+Hoe.plugin :debugging, :doofus, :git, :minitest, :bundler
 
 HOE = Hoe.spec 'sqlite3' do
   developer           'Jamis Buck', 'jamis@37signals.com'
@@ -23,9 +23,10 @@ HOE = Hoe.spec 'sqlite3' do
   spec_extras[:extensions] = ["ext/sqlite3/extconf.rb"]
   spec_extras[:license] = "MIT"
 
-  extra_dev_deps << ['rake-compiler', "~> 0.8.2"]
+  extra_dev_deps << ['rake-compiler', "~> 0.9.1"]
   extra_dev_deps << ["mini_portile", "~> 0.2.2"]
   extra_dev_deps << ["minitest", "~> 5.0"]
+  extra_dev_deps << ["hoe-bundler", "~> 1.0"]
 
   clean_globs.push('**/test.db')
 end

tasks/native.rake

@@ -4,11 +4,12 @@ require 'rake/extensiontask'
 # NOTE: version used by cross compilation of Windows native extension
 # It do not affect compilation under other operating systems
 # The version indicated is the minimum DLL suggested for correct functionality
-BINARY_VERSION = "3.7.13"
-URL_VERSION    = "3071300"
+BINARY_VERSION = "3.7.17"
+URL_VERSION    = "3071700"
+URL_PATH       = "/2013"
 
 # build sqlite3_native C extension
-Rake::ExtensionTask.new('sqlite3_native', HOE.spec) do |ext|
+RUBY_EXTENSION = Rake::ExtensionTask.new('sqlite3_native', HOE.spec) do |ext|
   # where to locate the extension
   ext.ext_dir = 'ext/sqlite3'
 
@@ -26,8 +27,7 @@ Rake::ExtensionTask.new('sqlite3_native', HOE.spec) do |ext|
     ext.config_options << "--enable-local"
   else
     ext.cross_compile = true
-    ext.cross_platform = ['i386-mswin32-60', 'i386-mingw32']
-    ext.cross_config_options << "--enable-local"
+    ext.cross_platform = ['i386-mswin32-60', 'i386-mingw32', 'x64-mingw32']
   end
 end
 

tasks/vendor_sqlite3.rake

@@ -2,17 +2,17 @@ require "rake/clean"
 require "rake/extensioncompiler"
 require "mini_portile"
 
-$recipes = {}
+CLOBBER.include("ports")
 
-$recipes[:sqlite3] = MiniPortile.new "sqlite3", BINARY_VERSION
-$recipes[:sqlite3].files << "http://sqlite.org/sqlite-autoconf-#{URL_VERSION}.tar.gz"
+directory "ports"
 
-namespace :ports do
-  directory "ports"
+def define_sqlite_task(platform, host)
+  recipe = MiniPortile.new "sqlite3", BINARY_VERSION
+  recipe.files << "http://sqlite.org#{URL_PATH}/sqlite-autoconf-#{URL_VERSION}.tar.gz"
+  recipe.host = host
 
-  desc "Install port sqlite3 #{$recipes[:sqlite3].version}"
-  task :sqlite3 => ["ports"] do
-    recipe = $recipes[:sqlite3]
+  desc "Compile sqlite3 for #{platform} (#{host})"
+  task "ports:sqlite3:#{platform}" => ["ports"] do |t|
     checkpoint = "ports/.#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
 
     unless File.exist?(checkpoint)
@@ -22,30 +22,66 @@ namespace :ports do
       recipe.cook
       touch checkpoint
     end
-
-    recipe.activate
   end
+
+  recipe
 end
 
+# native sqlite3 compilation
+define_sqlite_task RUBY_PLATFORM, RbConfig::CONFIG["host"]
+
+# trick to test local compilation of sqlite3
+if ENV["USE_MINI_PORTILE"] == "true"
+  # fake recipe so we can build a directory to it
+  recipe = MiniPortile.new "sqlite3", BINARY_VERSION
+  recipe.host = RbConfig::CONFIG["host"]
+
+  RUBY_EXTENSION.config_options << "--with-opt-dir=#{recipe.path}"
+
+  # compile sqlite3 first
+  Rake::Task["compile"].prerequisites.unshift "ports:sqlite3:#{RUBY_PLATFORM}"
+end
+
+# force compilation of sqlite3 when working natively under MinGW
 if RUBY_PLATFORM =~ /mingw/
-  Rake::Task['compile'].prerequisites.unshift "ports:sqlite3"
+  Rake::Task['compile'].prerequisites.unshift "ports:sqlite3:#{RUBY_PLATFORM}"
 end
 
-if ENV["USE_MINI_PORTILE"] == "true"
-  Rake::Task["compile"].prerequisites.unshift "ports:sqlite3"
+# iterate over all cross-compilation platforms and define the proper
+# sqlite3 recipe for it.
+if RUBY_EXTENSION.cross_compile
+  config_path = File.expand_path("~/.rake-compiler/config.yml")
+  if File.exist?(config_path)
+    # obtains platforms from rake-compiler's config.yml
+    config_file = YAML.load_file(config_path)
+
+    Array(RUBY_EXTENSION.cross_platform).each do |platform|
+      # obtain platform from rbconfig file
+      config_key = config_file.keys.sort.find { |key|
+        key.start_with?("rbconfig-#{platform}-")
+      }
+      rbfile = config_file[config_key]
+
+      # skip if rbconfig cannot be read
+      next unless File.exist?(rbfile)
+
+      host = IO.read(rbfile).match(/CONFIG\["CC"\] = "(.*)"/)[1].sub(/\-gcc/, '')
+      recipe = define_sqlite_task(platform, host)
+
+      RUBY_EXTENSION.cross_config_options << {
+        platform => "--with-opt-dir=#{recipe.path}"
+      }
+
+      # pre-compile sqlite3 port when cross-compiling
+      task :cross => "ports:sqlite3:#{platform}"
+    end
+  else
+    warn "rake-compiler configuration doesn't exist, but is required for ports"
+  end
 end
 
 task :cross do
   ["CC", "CXX", "LDFLAGS", "CPPFLAGS", "RUBYOPT"].each do |var|
     ENV.delete(var)
   end
-  host = ENV.fetch("HOST", Rake::ExtensionCompiler.mingw_host)
-  $recipes.each do |_, recipe|
-    recipe.host = host
-  end
-
-  # hook compile task with dependencies
-  Rake::Task["compile"].prerequisites.unshift "ports:sqlite3"
 end
-
-CLOBBER.include("ports")