do_sqlite3 0.9.6-x86-mswin32-60 → 0.9.9-x86-mswin32-60

data/.gitignore

@@ -0,0 +1,3 @@
+pkg
+*.db
+spec/test.db

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

@@ -1,3 +1,4 @@
+.gitignore
 History.txt
 LICENSE
 Manifest.txt
@@ -5,12 +6,10 @@ README.txt
 Rakefile
 TODO
 ext/do_sqlite3_ext.c
-ext/do_sqlite3_ext.so
 ext/extconf.rb
 lib/do_sqlite3.rb
 lib/do_sqlite3/transaction.rb
 lib/do_sqlite3/version.rb
-lib/sqlite3.dll
 spec/integration/do_sqlite3_spec.rb
 spec/integration/logging_spec.rb
 spec/integration/quoting_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/ext/do_sqlite3_ext.c

@@ -1,5 +1,4 @@
 #include <ruby.h>
-#include <version.h>
 #include <string.h>
 #include <math.h>
 #include <time.h>
@@ -18,6 +17,18 @@
 
 #define TRUE_CLASS CONST_GET(rb_mKernel, "TrueClass")
 
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#endif
+
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(a) RARRAY(a)->len
+#endif
+
 #ifdef _WIN32
 #define do_int64 signed __int64
 #else
@@ -39,7 +50,11 @@ static VALUE cDO_Reader;
 
 static VALUE rb_cDate;
 static VALUE rb_cDateTime;
+
+#ifndef RUBY_19_COMPATIBILITY
 static VALUE rb_cRational;
+#endif
+
 static VALUE rb_cBigDecimal;
 
 static VALUE mSqlite3;
@@ -404,13 +419,13 @@ static VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
 	// 	field_types = rb_ary_new();
 	// }
 
-	if ( field_types == Qnil || 0 == RARRAY(field_types)->len ) {
+	if ( field_types == Qnil || 0 == RARRAY_LEN(field_types) ) {
 		field_types = rb_ary_new();
-	} else if (RARRAY(field_types)->len != field_count) {
+	} else if (RARRAY_LEN(field_types) != field_count) {
 		// Whoops...  wrong number of types passed to set_types.  Close the reader and raise
 		// and error
 		rb_funcall(reader, rb_intern("close"), 0);
-		rb_raise(eSqlite3Error, "Field-count mismatch. Expected %d fields, but the query yielded %d", RARRAY(field_types)->len, field_count);
+		rb_raise(eSqlite3Error, "Field-count mismatch. Expected %ld fields, but the query yielded %d", RARRAY_LEN(field_types), field_count);
 	}
 
 
@@ -454,7 +469,7 @@ static VALUE cReader_next(VALUE self) {
 	field_count = NUM2INT(rb_iv_get(self, "@field_count"));
 
 	field_types = rb_iv_get(self, "@field_types");
-	ft_length = RARRAY(field_types)->len;
+	ft_length = RARRAY_LEN(field_types);
 
 	result = sqlite3_step(reader);
 
@@ -469,7 +484,7 @@ static VALUE cReader_next(VALUE self) {
 			value = native_typecast(sqlite3_column_value(reader, i), sqlite3_column_type(reader, i));
 		}
 		else {
-			value = ruby_typecast(sqlite3_column_value(reader, i), rb_class2name(RARRAY(field_types)->ptr[i]), sqlite3_column_type(reader, i));
+			value = ruby_typecast(sqlite3_column_value(reader, i), rb_class2name(RARRAY_PTR(field_types)[i]), sqlite3_column_type(reader, i));
 		}
 		rb_ary_push(arr, value);
 	}
@@ -508,7 +523,11 @@ void Init_do_sqlite3_ext() {
 
 	rb_funcall(rb_mKernel, rb_intern("require"), 1, rb_str_new2("data_objects"));
 
-	ID_NEW_DATE = RUBY_VERSION_CODE < 186 ? rb_intern("new0") : rb_intern("new!");
+#ifdef RUBY_LESS_THAN_186
+	ID_NEW_DATE = rb_intern("new0");
+#else
+	ID_NEW_DATE = rb_intern("new!");
+#endif
 	ID_LOGGER = rb_intern("logger");
 	ID_DEBUG = rb_intern("debug");
 	ID_LEVEL = rb_intern("level");

data/ext/extconf.rb

@@ -28,6 +28,12 @@ dir_config("sqlite3")
 # NOTE: use GCC flags unless Visual C compiler is used
 $CFLAGS << ' -Wall ' unless RUBY_PLATFORM =~ /mswin/
 
+if RUBY_VERSION < '1.8.6'
+  $CFLAGS << ' -DRUBY_LESS_THAN_186'
+elsif RUBY_VERSION >= '1.9.0'
+  $CFLAGS << ' -DRUBY_19_COMPATIBILITY'
+end
+
 # Do the work
 # create_makefile(extension_name)
 if have_header( "sqlite3.h" ) && have_library( "sqlite3", "sqlite3_open" )

data/lib/do_sqlite3/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Sqlite3
-    VERSION = "0.9.6"
+    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.6
+  version: 0.9.9
 platform: x86-mswin32-60
 authors: 
 - Bernerd Schaefer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-29 00:00:00 -03: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.6
+        version: 0.9.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -44,6 +44,7 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 files: 
+- .gitignore
 - History.txt
 - LICENSE
 - Manifest.txt
@@ -51,21 +52,23 @@ files:
 - Rakefile
 - TODO
 - ext/do_sqlite3_ext.c
-- ext/do_sqlite3_ext.so
 - ext/extconf.rb
 - lib/do_sqlite3.rb
 - lib/do_sqlite3/transaction.rb
 - lib/do_sqlite3/version.rb
-- lib/sqlite3.dll
 - spec/integration/do_sqlite3_spec.rb
 - spec/integration/logging_spec.rb
 - spec/integration/quoting_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/unit/transaction_spec.rb
-has_rdoc: true
+- lib/do_sqlite3_ext.so
+has_rdoc: false
 homepage: http://rubyforge.org/projects/dorb
-post_install_message: 
+post_install_message: |
+  Now download http://www.sqlite.org/sqlitedll-3_6_6_2.zip
+  And place the dll somewhere in your PATH, for example C:\ruby\bin
+
 rdoc_options: 
 - --main
 - README.txt
@@ -87,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dorb
-rubygems_version: 1.3.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A DataObject.rb driver for Sqlite3