do_sqlite3 0.9.8 → 0.9.9

data/History.txt

@@ -1 +1,8 @@
+== 0.9.9 2008-11-27
+* Improvements
+  * Added cross compile rake tasks for Windows gems [Jonathan Stott, Luis Lavena]
+  * Added initial support for Ruby 1.9 [John Harrison]
 
+* Bug Fixes
+  * Removed sqlite3.dll from source gem [Dan Kubb]
+  * Removed hard coded .bundle from source [Dirkjan Bussink]

data/Manifest.txt

@@ -8,7 +8,6 @@ TODO
 ext/do_sqlite3_ext.c
 ext/extconf.rb
 lib/do_sqlite3.rb
-lib/do_sqlite3/sqlite3.dll
 lib/do_sqlite3/transaction.rb
 lib/do_sqlite3/version.rb
 spec/integration/do_sqlite3_spec.rb

data/Rakefile

@@ -18,10 +18,10 @@ GEM_NAME = "do_sqlite3"
 GEM_VERSION = DataObjects::Sqlite3::VERSION
 GEM_DEPENDENCIES = [["data_objects", GEM_VERSION]]
 
+# TODO: remove duplicates from here that are already listed in .gitignore
 clean = %w(o bundle log a gem dSYM obj pdb lib def exp DS_Store)
 
 unless ENV["WINDOWS"]
-  clean << "so" 
   GEM_EXTRAS = { :extensions => %w[ ext/extconf.rb ], :has_rdoc => false }
 else
   GEM_EXTRAS = {}
@@ -35,7 +35,15 @@ PROJECT_DESCRIPTION = PROJECT_SUMMARY = "A DataObject.rb driver for Sqlite3"
 
 DRIVER = true
 
-require ROOT.parent + 'tasks/hoe'
+if (tasks_dir = ROOT.parent + 'tasks').directory?
+  require tasks_dir + 'hoe'
+
+  # use .gitignore to identify files to clean up
+  File.read(ROOT.parent + '.gitignore').split(/\s+/).each do |pattern|
+    next if pattern.include?('/') && !pattern.gsub!(/\A(?:\.\/)?#{ROOT.basename}(?:\/|\z)/, './')
+    GEM_CLEAN.concat(Dir.glob(pattern.include?('/') ? pattern : "**/#{pattern}"))
+  end
+end
 
 # Installation
 
@@ -90,3 +98,107 @@ namespace :ci do
 end
 
 task :ci => ["ci:spec"]
+
+
+# Windows specific stuff. (for cross-compiling a release)
+# You have been warned.
+# Thanks to Luis Lavena for helping through the writing of this.
+# will eventually be replaced with: http://github.com/luislavena/rake-compiler
+
+# use the do directory for the cross-compile stuff
+CCROOT = ROOT.parent
+
+SQLITE_VERSION = '3_6_6_2'
+
+MINGW_PATH = ENV['MINGW_PATH'] || "/usr/i586-mingw32msvc"
+
+if (tasks_dir = ROOT.parent + 'tasks').directory?
+  require tasks_dir + 'win32'
+
+  SQLITE_DIR = "#{CROSS}/sqlite-#{SQLITE_VERSION}"
+
+  namespace :build do
+
+    task :externals => "win32:sqlite3"
+
+    namespace :win32 do
+
+      desc "Creates cross compiled sqlite3 libraries"
+      task :sqlite3 => ["#{SQLITE_DIR}/include/sqlite3.h", "#{SQLITE_DIR}/lib/libsqlite3.a"]
+
+      directory SQLITE_DIR
+      directory "#{SQLITE_DIR}/include"
+      directory "#{SQLITE_DIR}/lib"
+
+      file "#{SQLITE_DIR}/include/sqlite3.h" => ["#{SQLITE_DIR}/include", "#{STASH}/sqlite-amalgamation-#{SQLITE_VERSION}.zip"] do |t|
+        when_writing "creating sqlite3.h" do
+          cd(t.prerequisites[0]) do
+            sh "unzip #{t.prerequisites[1]}"
+            touch t.name
+          end
+        end
+      end
+
+      file "#{SQLITE_DIR}/lib/libsqlite3.a" => ["#{SQLITE_DIR}/lib", "#{SQLITE_DIR}/sqlite3.dll"] do |t|
+        when_writing "creating libsqlite3.a" do
+          sh "#{MINGW_PATH}/bin/dlltool --dllname #{SQLITE_DIR}/sqlite3.dll --def #{SQLITE_DIR}/sqlite3.def --output-lib #{t.name}"
+        end
+      end
+
+      file "#{SQLITE_DIR}/sqlite3.dll" => [SQLITE_DIR, "#{STASH}/sqlitedll-#{SQLITE_VERSION}.zip"] do |t|
+        when_writing "creating sqlite3.dll" do
+          cd(SQLITE_DIR) do
+            sh "unzip #{t.prerequisites[1]}"
+            touch t.name
+          end
+        end
+      end
+
+      # download files
+      file "#{STASH}/sqlite-amalgamation-#{SQLITE_VERSION}.zip" => STASH do |t|
+        download_file(STASH, "http://www.sqlite.org/#{File.basename(t.name)}")
+      end
+
+      file "#{STASH}/sqlitedll-#{SQLITE_VERSION}.zip" => STASH do |t|
+        download_file(STASH, "http://www.sqlite.org/#{File.basename(t.name)}")
+      end
+
+      # The extension.  This is a task so it's rebuilt each time it is run, so we're sure to have a windows
+      # compiled extension.
+      task "lib/do_sqlite3_ext.so" => [:clean, "build:externals"] + FileList["ext/extconf.rb", "ext/*.c", "ext/*.h"] do
+        when_writing "Creating compiled extension" do
+          cd('ext') do
+            ruby " -I #{CROSS}/lib/ruby/1.8/i386-mingw32/ extconf.rb -- --with-sqlite3-dir=#{SQLITE_DIR}"
+            sh 'make'
+          end
+          mv 'ext/do_sqlite3_ext.so', 'lib'
+        end
+      end
+
+      task :extension => "lib/do_sqlite3_ext.so"
+
+    end
+  end
+
+  namespace :gem do
+    namespace :win32 do
+      desc "Package pre-compiled win32 gem"
+      task :package => "pkg/#{GEM_NAME}-#{GEM_VERSION}-x86-mswin32-60.gem"
+
+      file "pkg/#{GEM_NAME}-#{GEM_VERSION}-x86-mswin32-60.gem" => ["build:win32:extension", "pkg"] + HOE.spec.files do |t|
+        spec = HOE.spec.dup
+        spec.extensions = nil
+        spec.files += Dir['lib/**.so']
+        spec.platform = 'x86-mswin32-60'
+        spec.post_install_message = <<-eos
+Now download http://www.sqlite.org/sqlitedll-#{SQLITE_VERSION}.zip
+And place the dll somewhere in your PATH, for example C:\\ruby\\bin
+      eos
+        when_writing "Building win32 do_sqlite3 gem" do
+          Gem::Builder.new(spec).build
+        end
+        mv File.basename(t.name), t.name
+      end
+    end
+  end
+end

data/lib/do_sqlite3.rb

@@ -4,10 +4,10 @@
 # of the actual extension file.
 if RUBY_PLATFORM.match(/mingw|mswin/i)
   libdir = File.expand_path(File.dirname(__FILE__)).gsub(File::SEPARATOR, File::ALT_SEPARATOR)
-  ENV['PATH'] = File.join(libdir, "do_sqlite3;") + ENV['PATH']
+  ENV['PATH'] = "#{libdir};" + ENV['PATH']
 end
 
 require 'rubygems'
 require 'data_objects'
-require File.expand_path(File.join(File.dirname(__FILE__), 'do_sqlite3_ext.bundle'))
-require File.expand_path(File.join(File.dirname(__FILE__), 'do_sqlite3', 'transaction'))
+require 'do_sqlite3_ext'
+require 'do_sqlite3/transaction'

data/lib/do_sqlite3/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Sqlite3
-    VERSION = "0.9.8"
+    VERSION = "0.9.9"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: do_sqlite3
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - Bernerd Schaefer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-24 00:00:00 -08:00
+date: 2008-11-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.8
+        version: 0.9.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -54,7 +54,6 @@ files:
 - ext/do_sqlite3_ext.c
 - ext/extconf.rb
 - lib/do_sqlite3.rb
-- lib/do_sqlite3/sqlite3.dll
 - lib/do_sqlite3/transaction.rb
 - lib/do_sqlite3/version.rb
 - spec/integration/do_sqlite3_spec.rb