@@ -2,9 +2,10 @@ pkg/* doc/* coverage/* tags -lib/amalgalite3.so -ext/Makefile -ext/rbconfig.rb +lib/amalgalite/1.8/amalgalite3.so +lib/amalgalite/1.9/amalgalite3.so +ext/amalgalite/Makefile +ext/amalgalite/rbconfig.rb examples/*.db tmp/* *~ .gitignore @@ -1,5 +1,4 @@ Next Release: - - fat binary for 1.8/1.9 dual compatibility - type conversion for manifest typing? how to allow it through? - table name and column name in a type map? TODO.taskpaper @@ -20,4 +20,4 @@ $CFLAGS = $CFLAGS.gsub(/-g/,'') $CFLAGS = $CFLAGS.gsub(/-Wall/,'') #$CFLAGS += " -Wall" -create_makefile('amalgalite3') +create_makefile('amalgalite/amalgalite3') ext/amalgalite/extconf.rb @@ -16,6 +16,12 @@ module Amalgalite class Error < ::StandardError; end end +# support for fat binaries on windows +if RUBY_PLATFORM =~ /(mswin|mingw)/i then + require "amalgalite/#{RUBY_VERSION.sub(/\.\d$/,'')}/amalgalite3" +else + require "amalgalite/amalgalite3" +end require 'amalgalite/aggregate' require 'amalgalite/blob' require 'amalgalite/boolean' lib/amalgalite.rb @@ -2,7 +2,6 @@ # Copyright (c) 2008 Jeremy Hinegardner # All rights reserved. See LICENSE and/or COPYING for details. #++ -require 'amalgalite/amalgalite3' require 'amalgalite/statement' require 'amalgalite/trace_tap' require 'amalgalite/profile_tap' lib/amalgalite/database.rb @@ -1,4 +1,3 @@ -require 'amalgalite/amalgalite3' require 'amalgalite/version' require 'amalgalite/sqlite3/version' require 'amalgalite/sqlite3/constants' lib/amalgalite/sqlite3.rb @@ -2,8 +2,6 @@ # Copyright (c) 2008 Jeremy Hinegardner # All rights reserved. See LICENSE and/or COPYING for details. #++ - -require 'amalgalite/amalgalite3' module Amalgalite::SQLite3 module Constants module Helpers lib/amalgalite/sqlite3/constants.rb @@ -1,4 +1,3 @@ -require 'amalgalite/amalgalite3' require 'amalgalite/sqlite3/constants' module Amalgalite::SQLite3 class Database lib/amalgalite/sqlite3/database/status.rb @@ -1,4 +1,3 @@ -require 'amalgalite/amalgalite3' require 'amalgalite/sqlite3/constants' module Amalgalite::SQLite3 lib/amalgalite/sqlite3/status.rb @@ -2,7 +2,6 @@ # Copyright (c) 2008 Jeremy Hinegardner # All rights reserved. See LICENSE and/or COPYING for details. #++ -require 'amalgalite/amalgalite3' module Amalgalite module SQLite3 module Version lib/amalgalite/sqlite3/version.rb @@ -3,7 +3,6 @@ # All rights reserved. See LICENSE and/or COPYING for details. #++ # -require 'amalgalite/amalgalite3' require 'date' require 'arrayfields' require 'ostruct' lib/amalgalite/statement.rb @@ -2,7 +2,6 @@ # Copyright (c) 2008 Jeremy Hinegardner # All rights reserved. See LICENSE and/or COPYING for details. #++ -require 'amalgalite/amalgalite3' module Amalgalite ## # TypeMap defines the protocol used between Ruby and SQLite for mapping lib/amalgalite/type_map.rb @@ -8,8 +8,8 @@ module Amalgalite module Version MAJOR = 0 - MINOR = 9 - BUILD = 1 + MINOR = 10 + BUILD = 0 # # return the Version as an array of MAJOR, MINOR, BUILD lib/amalgalite/version.rb @@ -33,7 +33,7 @@ if pkg_config = Configuration.for_if_exist?("packaging") then desc "dump gemspec for win" task :gemspec_win do - puts Hitimes::GEM_SPEC_WIN.to_ruby + puts Amalgalite::GEM_SPEC_WIN.to_ruby end desc "reinstall gem" @@ -55,8 +55,15 @@ if pkg_config = Configuration.for_if_exist?("packaging") then mv Dir["*.gem"].first, "pkg" end + task :clobber do + rm_rf 'lib/amalgalite/1.8' + rm_rf 'lib/amalgalite/1.9' + end + + task :prep => [:clean, :package, :package_win ] + desc "distribute copiously" - task :copious => [:package, :package_win] do + task :copious => :prep do gems = Amalgalite::SPECS.collect { |s| "#{s.full_name}.gem" } Rake::SshFilePublisher.new('jeremy@copiousfreetime.org', '/var/www/vhosts/www.copiousfreetime.org/htdocs/gems/gems', tasks/distribution.rake @@ -24,7 +24,7 @@ if ext_config = Configuration.for_if_exist?('extension') then end desc "Build the SQLite extension version #{current_sqlite_version}" - task :build do + task :build => :clean do ext_config.configs.each do |extension| path = Pathname.new(extension) parts = path.split tasks/extension.rake b3f429605e13659142354edc7c3f6d806b1a357b Jeremy Hinegardner jeremy@hinegardner.org http://github.com/copiousfreetime/amalgalite/commit/7c3cdba407798c874d87f51278efd79269a9fa99 7c3cdba407798c874d87f51278efd79269a9fa99 2009-06-28T18:15:13-07:00 2009-06-28T18:15:13-07:00 fix requires for fat binary support 95358c2313b74bb1ea54fcc501a17947532c648a Jeremy Hinegardner jeremy@hinegardner.org