@@ -1,7 +1,7 @@ = Amalgalite Changelog -== Version +== Version 0.10.0 -=== Enhacnements +=== Enhancements * Update to Sqlite 3.6.15 ** fix errors returned by define_aggregate and define_function based upon 3.6.15 update HISTORY @@ -57,5 +57,8 @@ Rake.application.tasks.each do |t| if t.name =~ /:clobber/ then task :clobber => [t.name] end + if t.name =~ /:clean/ then + task :clean => [t.name] + end end Rakefile @@ -25,6 +25,7 @@ Amalgalite::GEM_SPEC = Gem::Specification.new do |spec| spec.add_development_dependency("rake", "~> 0.8.4") spec.add_development_dependency("configuration", "~> 0.0.5") spec.add_development_dependency("rspec", "~> 1.2.2") + spec.add_development_dependency("rake-compiler", "~> 0.5.0") if ext_conf = Configuration.for_if_exist?("extension") then spec.extensions << ext_conf.configs @@ -51,6 +52,5 @@ end Amalgalite::GEM_SPEC_WIN = Amalgalite::GEM_SPEC.clone Amalgalite::GEM_SPEC_WIN.platform = ::Gem::Platform.new( "i386-mswin32_60" ) Amalgalite::GEM_SPEC_WIN.extensions = [] -Amalgalite::GEM_SPEC_WIN.files += ["lib/amalgalite3.so"] Amalgalite::SPECS = [ Amalgalite::GEM_SPEC, Amalgalite::GEM_SPEC_WIN ] gemspec.rb @@ -17,11 +17,11 @@ namespace :announce do mail.puts mail.puts info[:title] mail.puts - mail.puts " #{info[:urls]}" - mail.puts mail.puts "{{ Release notes for Version #{Amalgalite::VERSION} }}" - mail.puts + mail.puts mail.puts info[:release_notes] + mail.puts + mail.puts " #{info[:urls]}" mail.puts mail.puts "=== Installation" mail.puts tasks/announce.rake @@ -27,7 +27,7 @@ Configuration.for('packaging') { proj_conf = Configuration.for('project') files { bin FileList["bin/*"] - ext FileList["ext/*.{c,h,rb}"] + ext FileList["ext/amalgalite/*.{c,h,rb}"] examples FileList["examples/*"] lib FileList["lib/**/*.rb"] test FileList["spec/**/*.rb", "test/**/*.rb"] @@ -91,8 +91,8 @@ Configuration.for('rdoc') { # Extensions #----------------------------------------------------------------------- Configuration.for('extension') { - #configs Configuration.for('packaging').files.ext.find_all { |x| %w[ mkrf_conf.rb extconf.rb ].include?(File.basename(x)) } configs Configuration.for('packaging').files.ext.find_all { |x| %w[ extconf.rb ].include?(File.basename(x)) } + cross_rbconfig YAML.load_file( File.expand_path("~/.rake-compiler/config.yml")) } #----------------------------------------------------------------------- tasks/config.rb @@ -31,23 +31,37 @@ if pkg_config = Configuration.for_if_exist?("packaging") then puts Amalgalite::GEM_SPEC.to_ruby end + desc "dump gemspec for win" + task :gemspec_win do + puts Hitimes::GEM_SPEC_WIN.to_ruby + end + desc "reinstall gem" task :reinstall => [:uninstall, :repackage, :install] - desc "package the windows gem" - task :package_win => "ext:build_win" do - cp "ext/amalgalite3.so", "lib", :verbose => true - Gem::Builder.new( Amalgalite::GEM_SPEC_WIN ).build + desc "package up a windows gem" + task :package_win => :clean do + Configuration.for("extension").cross_rbconfig.keys.each do |rbconfig| + v = rbconfig.split("-").last + s = v.sub(/\.\d$/,'') + sh "rake ext:build_win-#{v}" + mkdir_p "lib/amalgalite/#{s}", :verbose => true + cp "ext/amalgalite/amalgalite3.so", "lib/amalgalite/#{s}/", :verbose => true + end + + Amalgalite::GEM_SPEC_WIN.files += FileList["lib/amalgalite/{1.8,1.9}/**.{dll,so}"] + Gem::Builder.new( Amalgalite::GEM_SPEC_WIN ).build + mkdir "pkg" unless File.directory?( 'pkg' ) mv Dir["*.gem"].first, "pkg" end desc "distribute copiously" task :copious => [:package, :package_win] do - gems = Amalgalite::SPECS.collect { |s| "#{s.full_name}.gem" } - Rake::SshFilePublisher.new('jeremy@copiousfreetime.org', + gems = Amalgalite::SPECS.collect { |s| "#{s.full_name}.gem" } + Rake::SshFilePublisher.new('jeremy@copiousfreetime.org', '/var/www/vhosts/www.copiousfreetime.org/htdocs/gems/gems', 'pkg', *gems).upload - sh "ssh jeremy@copiousfreetime.org rake -f /var/www/vhosts/www.copiousfreetime.org/htdocs/gems/Rakefile" + sh "ssh jeremy@copiousfreetime.org rake -f /var/www/vhosts/www.copiousfreetime.org/htdocs/gems/Rakefile" end - end + end end tasks/distribution.rake @@ -36,33 +36,35 @@ if ext_config = Configuration.for_if_exist?('extension') then end end - desc "Build the extensions for windows" - task :build_win => :clobber do - ext_config.configs.each do |extension| - path = Pathname.new( extension ) + def build_win( version = "1.8.6" ) + ext_config = Configuration.for("extension") + rbconfig = ext_config.cross_rbconfig["rbconfig-#{version}"] + raise ArgumentError, "No cross compiler for version #{version}, we have #{ext_config.cross_rbconfig.keys.join(",")}" unless rbconfig + ruby_exe = if version =~ /1\.8/ then + "ruby" + else + "ruby1.9" + end + Amalgalite::GEM_SPEC.extensions.each do |extension| + path = Pathname.new(extension) parts = path.split conf = parts.last - mingw_rbconfig = path.dirname.parent.realpath + "rbconfig-mingw.rb" - Dir.chdir( path.dirname ) do |d| - cp mingw_rbconfig, "rbconfig.rb" - sh "ruby -I. extconf.rb" + Dir.chdir(path.dirname) do |d| + cp "#{rbconfig}", "rbconfig.rb" + sh "#{ruby_exe} -I. extconf.rb" sh "make" - rm_f "rbconfig.rb" end end end - desc "Build the extension for ruby1.9" - task :build19 => :clobber do - ext_config.configs.each do |extension| - path = Pathname.new( extension ) - parts = path.split - conf = parts.last - Dir.chdir( path.dirname ) do |d| - sh "ruby1.9 -I. extconf.rb" - sh "make" - end - + win_builds = [] + ext_config.cross_rbconfig.keys.each do |v| + s = v.split("-").last + desc "Build the extension for windows version #{s}" + win_bname = "build_win-#{s}" + win_builds << win_bname + task win_bname => :clean do + build_win( s ) end end @@ -72,8 +74,9 @@ if ext_config = Configuration.for_if_exist?('extension') then parts = path.split conf = parts.last Dir.chdir(path.dirname) do |d| - #sh "rake clean" - sh "make clean" + if File.exist?( "Makfeile" ) then + sh "make clean" + end rm_f "rbconfig.rb" end end @@ -85,7 +88,6 @@ if ext_config = Configuration.for_if_exist?('extension') then parts = path.split conf = parts.last Dir.chdir(path.dirname) do |d| - #sh "rake clobber" if File.exist?( "Makefile") then sh "make distclean" end tasks/extension.rake f74546c24b85712a36a6b4c0d92c50969bff23b0 Jeremy Hinegardner jeremy@hinegardner.org http://github.com/copiousfreetime/amalgalite/commit/d3d618051e054d801e3d2d66b8f0fd95272977fb d3d618051e054d801e3d2d66b8f0fd95272977fb 2009-06-28T17:38:14-07:00 2009-06-28T17:38:14-07:00 moving to fat binary packaging 4ca7a9ad464f7afe93d3ccf4ae95b101a19d87b6 Jeremy Hinegardner jeremy@hinegardner.org