@@ -2,3 +2,4 @@ *.swo *.swp pkg/ +coverage/ .gitignore @@ -1,7 +1,7 @@ # # The recipe for integrating amalgalite into the ruby build # -Crate::GemIntegration.new("amalgalite", "0.4.0") do |t| - t.upstream_source = "http://www.copiousfreetime.org/gems/gems/amalgalite-0.4.0.gem" - t.upstream_sha1 = "410ddb2e96c74ff12d8542079fcb5d7951b267e4" +Crate::GemIntegration.new("amalgalite", "0.4.3") do |t| + t.upstream_source = "http://www.copiousfreetime.org/gems/gems/amalgalite-0.4.3.gem" + t.upstream_sha1 = "569c497f56bfe95d6a7abe4834f5372394857b5a" end data/recipes/amalgalite/amalgalite.rake @@ -1,14 +1,14 @@ # # Crate recipe for ruby version 1.2.3 # -Crate::Ruby.new( "ruby", "1.8.6-p114") do |t| +Crate::Ruby.new( "ruby", "1.8.6-p287") do |t| t.depends_on( "openssl" ) t.depends_on( "zlib" ) t.integrates( "amalgalite" ) - t.upstream_source = "ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p114.tar.gz" - t.upstream_md5 = "500a9f11613d6c8ab6dcf12bec1b3ed3" + t.upstream_source = "ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p287.tar.gz" + t.upstream_md5 = "f6cd51001534ced5375339707a757556" ENV["CPPFLAGS"]= "-I#{File.join( t.install_dir, 'usr', 'include')}" ENV["LDFLAGS"] = "-L#{File.join( t.install_dir, 'usr', 'lib' )}" data/recipes/ruby/ruby.rake @@ -66,7 +66,7 @@ module Crate end # - # each of the key value pairs indicates an matching path (the key) from the + # each of the key value pairs indicates a matching path (the key) from the # gemspec that should be installed into the designated destiation path (the # value) # lib/crate/gem_integration.rb @@ -149,11 +149,11 @@ module Crate end # - # Iterate over all the feils in the Crate project template directory and + # Iterate over all the files in the Crate project template directory and # store them in a hash # def project_files - keep = %r/.rake$|Rakefile$|.patch$/ + keep = %r/.rake$|Rakefile$|.patch$|.c$/ strip_path = %r/\A#{data}?/o paths = Hash.new { |h,k| h[k] = [] } Find.find( data ) do |path| lib/crate/main.rb @@ -1,5 +1,7 @@ require 'rake' require 'rake/tasklib' +require 'amalgalite' +require 'amalgalite/requires' module Crate # @@ -25,6 +27,9 @@ module Crate # default 'fakeroot' attr_accessor :install_dir + # the directory where the final products are stored + attr_accessor :dist_dir + # The list of extensions to compile attr_reader :extensions @@ -35,6 +40,7 @@ module Crate @recipe_dir = File.join( @project_root, 'recipes' ) @build_dir = File.join( @project_root, 'build' ) @install_dir = File.join( @project_root, 'fakeroot' ) + @dist_dir = File.join( @project_root, 'dist' ) yield self if block_given? ::Crate.project = self define @@ -52,6 +58,10 @@ module Crate @install_dir = File.join( project_root, id ) end + def dist_dir=( dd ) + @dist_dir = File.join( project_root, dd ) + end + def extensions=( list ) @extensions = list.select { |l| l.index("#").nil? } end @@ -76,16 +86,84 @@ module Crate end # + # Load upthe compile params we may need to compile the project. This method + # is usless until after the :ruby task has been completed + # + def compile_params + unless @compile_params + @compile_params = {} + Dir.chdir( ::Crate.ruby.pkg_dir ) do + %w[ CC CFLAGS XCFLAGS LDFLAGS CPPFLAGS LIBS ].each do |p| + @compile_params[p] = %x( ./miniruby -I. -rrbconfig -e 'puts Config::CONFIG["#{p}"]' ).strip + end + end + end + return @compile_params + end + + # + # Compile the crate_boot stub to an object file + # + def compile_crate_boot + compile_options = %w[ CFLAGS XCFLAGS CPPFLAGS ].collect { |c| compile_params[c] }.join(' ') + cmd = "#{compile_params['CC']} #{compile_options} -I#{Crate.ruby.pkg_dir} -o crate_boot.o -c crate_boot.c" + logger.debug cmd + sh cmd + ::CLEAN << "crate_boot.o" + end + + # + # Run the link command to create the final executable + # + def link_project + link_options = %w[ CFLAGS XCFLAGS LDFLAGS ].collect { |c| compile_params[c] }.join(' ') + Dir.chdir( ::Crate.ruby.pkg_dir ) do + dot_a = FileList[ "**/*.a" ] + dot_o = [ "ext/extinit.o", File.join( project_root, "crate_boot.o" )] + libs = compile_params['LIBS'] + cmd = "#{compile_params['CC']} #{link_options} #{dot_o.join(' ')} #{dot_a.join(' ')} -o #{File.join( dist_dir, name) }" + logger.debug cmd + sh cmd + end + end + + # # define the project task # def define + lib_db = File.join( dist_dir, "lib.db" ) + directory dist_dir + + task :pack_ruby => dist_dir do + logger.info "Storing rubylib in #{lib_db}" + ::Amalgalite::Requires.store_dir_in_db( File.join( ::Crate.ruby.pkg_dir, "lib" ), :dbfile => lib_db ) + end + + task :pack_amalgalite => dist_dir do + cmd = "~/Projects/amalgalite/bin/amalgalite-pack-into-db --force #{lib_db}" + logger.info cmd + sh "#{cmd} > /dev/null" + end + + file "crate_boot.o" => "crate_boot.c" do + compile_crate_boot + end + + app_path = File.join( dist_dir, name ) + file app_path => [ "crate_boot.o", dist_dir ] do + link_project + end + desc "Build #{name}" - task :default => [ :ruby, main_c ] do + #task :default => [ :ruby ] do + task :default => [ app_path, :pack_amalgalite, :pack_ruby ] do logger.info "Build #{name}" - #logger.info ::Crate.ruby.inspect + compile_crate_boot + link_project end ::CLEAN << self.install_dir ::CLEAN << "project.log" + ::CLEAN << self.dist_dir load_rakefiles end lib/crate/project.rb @@ -4,7 +4,7 @@ require 'crate/gem_integration' module Crate class Ruby < Dependency # - # Create a Crate Ruby with the given name and version + # Create a Crate Ruby with the given name and version # def initialize( name = nil, version = nil ) @name = name lib/crate/ruby.rb @@ -2,4 +2,4 @@ require 'rubygems' require 'spec' $: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib")) -require 'assimilate' +require 'crate' spec/spec_helper.rb 3ddfbdb6f52a87264f0ad9af3c796158cb1aa613 Jeremy Hinegardner jeremy@hinegardner.org http://github.com/copiousfreetime/crate/commit/7b2907c80b65371cd4fd2a0c27bf97272a99b3ca 7b2907c80b65371cd4fd2a0c27bf97272a99b3ca 2008-10-22T23:57:27-07:00 2008-10-22T23:57:27-07:00 savepoint 4429b28d1ec5b0d30573879485e5a565ce201e74 Jeremy Hinegardner jeremy@hinegardner.org