Update for MinGW-x64

Author: sodabrew

Rakefile

@@ -2,10 +2,10 @@
 require 'rake'
 
 # Load custom tasks (careful attention to define tasks before prerequisites)
+load 'tasks/vendor_mysql.rake'
 load 'tasks/rspec.rake'
 load 'tasks/compile.rake'
 load 'tasks/generate.rake'
 load 'tasks/benchmarks.rake'
-load 'tasks/vendor_mysql.rake'
 
 task :default => :spec

tasks/compile.rake

@@ -1,21 +1,13 @@
 require "rake/extensiontask"
 
-CONNECTOR_VERSION = "6.0.2" #"mysql-connector-c-noinstall-6.0.2-win32.zip"
-CONNECTOR_MIRROR = ENV['CONNECTOR_MIRROR'] || ENV['MYSQL_MIRROR'] || "http://mysql.he.net/"
-
 def gemspec
   @clean_gemspec ||= eval(File.read(File.expand_path('../../mysql2.gemspec', __FILE__)))
 end
 
 Rake::ExtensionTask.new("mysql2", gemspec) do |ext|
-  # reference where the vendored MySQL got extracted
-  connector_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', "mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32"))
-
-  # DRY options feed into compile or cross-compile process
-  windows_options = [
-    "--with-mysql-include=#{connector_lib}/include",
-    "--with-mysql-lib=#{connector_lib}/lib"
-  ]
+  # Expand the path because the build dir is 3-4 levels deep in tmp/platform/version/
+  connector_dir = File.expand_path("../../vendor/#{CONNECTOR_DIR}", __FILE__)
+  windows_options = [ "--with-mysql-dir=#{connector_dir}" ]
 
   # automatically add build options to avoid need of manual input
   if RUBY_PLATFORM =~ /mswin|mingw/ then
@@ -39,7 +31,7 @@ Rake::ExtensionTask.new("mysql2", gemspec) do |ext|
   At the time of building this gem, the necessary DLL files where available
   in the following download:
 
-  http://dev.mysql.com/get/Downloads/Connector-C/mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32.zip/from/pick
+  http://dev.mysql.com/get/Downloads/Connector-C/#{CONNECTOR_ZIP}/from/pick
 
   And put lib\\libmysql.dll file in your Ruby bin directory, for example C:\\Ruby\\bin
 
@@ -69,3 +61,21 @@ end
 if Rake::Task.task_defined?(:cross)
   Rake::Task[:cross].prerequisites << "lib/mysql2/mysql2.rb"
 end
+
+# DevKit task following the example of Luis Lavena's test-ruby-c-extension
+task :devkit do
+  begin
+    require "devkit"
+  rescue LoadError => e
+    abort "Failed to activate RubyInstaller's DevKit required for compilation."
+  end
+end
+
+if RUBY_PLATFORM =~ /mingw|mswin/ then
+  Rake::Task['compile'].prerequisites.unshift 'vendor:mysql'
+  Rake::Task['compile'].prerequisites.unshift 'devkit'
+else
+  if Rake::Task.tasks.map {|t| t.name }.include? 'cross'
+    Rake::Task['cross'].prerequisites.unshift 'vendor:mysql'
+  end
+end

tasks/vendor_mysql.rake

@@ -1,40 +1,36 @@
 require 'rake/clean'
 require 'rake/extensioncompiler'
 
+CONNECTOR_VERSION = "6.1.5" #"mysql-connector-c-6.1.5-win32.zip"
+CONNECTOR_PLATFORM = RUBY_PLATFORM =~ /x64/ ? "winx64" : "win32"
+CONNECTOR_DIR = "mysql-connector-c-#{CONNECTOR_VERSION}-#{CONNECTOR_PLATFORM}"
+CONNECTOR_ZIP = "mysql-connector-c-#{CONNECTOR_VERSION}-#{CONNECTOR_PLATFORM}.zip"
+
 # download mysql library and headers
 directory "vendor"
 
-file "vendor/mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32.zip" => ["vendor"] do |t|
-  url = "http://dev.mysql.com/get/Downloads/Connector-C/mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32.zip/from/#{CONNECTOR_MIRROR}/"
+file "vendor/#{CONNECTOR_ZIP}" => ["vendor"] do |t|
+  url = "http://cdn.mysql.com/Downloads/Connector-C/#{CONNECTOR_ZIP}"
   when_writing "downloading #{t.name}" do
     cd File.dirname(t.name) do
-      sh "wget -c #{url} || curl -C - -O #{url}"
+      sh "curl -C - -O #{url} || wget -c #{url}"
     end
   end
 end
 
-file "vendor/mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32/include/mysql.h" => ["vendor/mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32.zip"] do |t|
+file "vendor/#{CONNECTOR_DIR}/include/mysql.h" => ["vendor/#{CONNECTOR_ZIP}"] do |t|
   full_file = File.expand_path(t.prerequisites.last)
   when_writing "creating #{t.name}" do
     cd "vendor" do
-      sh "unzip #{full_file} mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32/bin/** mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32/include/** mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32/lib/**"
+      sh "unzip #{full_file} #{CONNECTOR_DIR}/bin/** #{CONNECTOR_DIR}/include/** #{CONNECTOR_DIR}/lib/**"
     end
     # update file timestamp to avoid Rake perform this extraction again.
     touch t.name
   end
 end
 
 # clobber expanded packages
-CLOBBER.include("vendor/mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32")
+CLOBBER.include("vendor/#{CONNECTOR_DIR}")
 
 # vendor:mysql
-task 'vendor:mysql' => ["vendor/mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32/include/mysql.h"]
-
-# hook into cross compilation vendored mysql dependency
-if RUBY_PLATFORM =~ /mingw|mswin/ then
-  Rake::Task['compile'].prerequisites.unshift 'vendor:mysql'
-else
-  if Rake::Task.tasks.map {|t| t.name }.include? 'cross'
-    Rake::Task['cross'].prerequisites.unshift 'vendor:mysql'
-  end
-end
+task 'vendor:mysql' => "vendor/#{CONNECTOR_DIR}/include/mysql.h"