Merge branch '1-3-stable'

Author: luislavena

CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 === (in Git)
 
+* Enhancements:
+  * Windows: build against SQLite 3.8.6. Closes #135 [Hubro]
+
+=== 1.3.9 / 2014-02-25
+
 * Bugfixes:
   * Reset exception message. Closes #80
   * Reduce warnings due unused pointers. Closes #89

Gemfile

@@ -5,11 +5,11 @@
 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.5.1", :group => [:development, :test]
+gem "mini_portile", "~>0.6.1", :group => [:development, :test]
+gem "minitest", "~>5.4", :group => [:development, :test]
 gem "hoe-bundler", "~>1.0", :group => [:development, :test]
-gem "hoe", "~>3.7", :group => [:development, :test]
+gem "rake-compiler", "~>0.9.3", :group => [:development, :test]
+gem "rdoc", "~>4.0", :group => [:development, :test]
+gem "hoe", "~>3.12", :group => [:development, :test]
 
 # vim: syntax=ruby

appveyor.yml

@@ -0,0 +1,26 @@
+---
+version: "{build}"
+branches:
+  only:
+    - master
+    - 1-3-stable
+clone_depth: 10
+install:
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - ruby --version
+  - gem --version
+  - gem install bundler --quiet --no-ri --no-rdoc
+  - bundler --version
+  - bundle install
+build_script:
+  - rake native gem
+test_script:
+  - rake test
+artifacts:
+  - path: pkg\*.gem
+
+environment:
+  matrix:
+    - ruby_version: "193"
+    - ruby_version: "200"
+    - ruby_version: "200-x64"

ext/sqlite3/extconf.rb

@@ -9,11 +9,6 @@
 # --with-sqlite3-{dir,include,lib}
 dir_config("sqlite3")
 
-# prioritize local builds
-if enable_config("local", false)
-  $LDFLAGS = ENV.fetch("LDFLAGS", "")
-end
-
 if RbConfig::CONFIG["host_os"] =~ /mswin/
   $CFLAGS << ' -W3'
 end

lib/sqlite3/version.rb

@@ -1,12 +1,12 @@
 module SQLite3
 
-  VERSION = '1.3.8'
+  VERSION = '1.3.9'
 
   module VersionProxy
 
     MAJOR = 1
     MINOR = 3
-    TINY  = 8
+    TINY  = 9
     BUILD = nil
 
     STRING = [ MAJOR, MINOR, TINY, BUILD ].compact.join( "." )

tasks/gem.rake

@@ -24,8 +24,8 @@ HOE = Hoe.spec 'sqlite3' do
 
   spec_extras[:extensions] = ["ext/sqlite3/extconf.rb"]
 
-  extra_dev_deps << ['rake-compiler', "~> 0.9.1"]
-  extra_dev_deps << ["mini_portile", "~> 0.5.1"]
+  extra_dev_deps << ['rake-compiler', "~> 0.9.3"]
+  extra_dev_deps << ["mini_portile", "~> 0.6.1"]
   extra_dev_deps << ["minitest", "~> 5.0"]
   extra_dev_deps << ["hoe-bundler", "~> 1.0"]
 

tasks/native.rake

@@ -5,9 +5,17 @@ require 'rake/extensioncompiler'
 # 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.17"
-URL_VERSION    = "3071700"
-URL_PATH       = "/2013"
+BINARY_VERSION = "3.8.6"
+URL_VERSION    = "3080600"
+URL_PATH       = "/2014"
+
+task :devkit do
+  begin
+    require "devkit"
+  rescue LoadError => e
+    abort "Failed to activate RubyInstaller's DevKit required for compilation."
+  end
+end
 
 # build sqlite3_native C extension
 RUBY_EXTENSION = Rake::ExtensionTask.new('sqlite3_native', HOE.spec) do |ext|
@@ -25,7 +33,6 @@ RUBY_EXTENSION = Rake::ExtensionTask.new('sqlite3_native', HOE.spec) do |ext|
     # define target for extension (supporting fat binaries)
     RUBY_VERSION =~ /(\d+\.\d+)/
     ext.lib_dir = "lib/sqlite3/#{$1}"
-    ext.config_options << "--enable-local"
   else
 
     # detect cross-compiler available

tasks/vendor_sqlite3.rake

@@ -28,7 +28,16 @@ def define_sqlite_task(platform, host)
 end
 
 # native sqlite3 compilation
-define_sqlite_task RUBY_PLATFORM, RbConfig::CONFIG["host"]
+recipe = define_sqlite_task(RUBY_PLATFORM, RbConfig::CONFIG["host"])
+
+# force compilation of sqlite3 when working natively under MinGW
+if RUBY_PLATFORM =~ /mingw/
+  RUBY_EXTENSION.config_options << "--with-opt-dir=#{recipe.path}"
+
+  # also prepend DevKit into compilation phase
+  Rake::Task["compile"].prerequisites.unshift "devkit", "ports:sqlite3:#{RUBY_PLATFORM}"
+  Rake::Task["native"].prerequisites.unshift "devkit", "ports:sqlite3:#{RUBY_PLATFORM}"
+end
 
 # trick to test local compilation of sqlite3
 if ENV["USE_MINI_PORTILE"] == "true"
@@ -42,11 +51,6 @@ if ENV["USE_MINI_PORTILE"] == "true"
   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:#{RUBY_PLATFORM}"
-end
-
 # iterate over all cross-compilation platforms and define the proper
 # sqlite3 recipe for it.
 if RUBY_EXTENSION.cross_compile