autobuild 0.6 → 0.6.2

data/CHANGES

@@ -1,5 +1,26 @@
 = Autobuild ChangeLog
 
+== Version 0.6.2
+
+Small changes
+
+* added the Ruby package, which does an import and builds all C extensions
+* added the pkgconfig package, which allows to use an already-installed package
+  if this packages can be found through pkg-config
+* check that working copies that are already checked out are from the right
+  source (for CVS and Subversion)
+
+== Version 0.6.1
+
+Bugfixes
+
+* fix dependency handling for Genom modules. In particular, we add 
+  dependencies between the module generation and the installed
+  genom files (includes, canvas, and the genom executable). Information
+  is taken from the pkg-config file
+* new package types: InstalledPkgConfig, to reuse pkg-config based packages
+  installed by another autobuild script
+
 == Version 0.6
 
 Use a Ruby-based DSL instead of YAML config files. It is waaaaaay more

data/Manifest.txt

@@ -0,0 +1,34 @@
+bin/autobuild
+CHANGES
+lib/autobuild/config.rb
+lib/autobuild/environment.rb
+lib/autobuild/exceptions.rb
+lib/autobuild/import/cvs.rb
+lib/autobuild/import/darcs.rb
+lib/autobuild/import/svn.rb
+lib/autobuild/importer.rb
+lib/autobuild/import/tar.rb
+lib/autobuild/package.rb
+lib/autobuild/packages/autotools.rb
+lib/autobuild/packages/genom.rb
+lib/autobuild/packages/import.rb
+lib/autobuild/packages/pkgconfig.rb
+lib/autobuild/packages/ruby.rb
+lib/autobuild/pkgconfig.rb
+lib/autobuild.rb
+lib/autobuild/reporting.rb
+lib/autobuild/subcommand.rb
+lib/autobuild/timestamps.rb
+Manifest.txt
+Rakefile
+README.txt
+samples/demo.rb
+test/data/cvsroot.tar
+test/data/svnroot.tar
+test/data/tarimport.tar.gz
+test/test_import_cvs.rb
+test/test_import_svn.rb
+test/test_import_tar.rb
+test/test_subcommand.rb
+test/tools.rb
+TODO

data/Rakefile

@@ -1,164 +1,21 @@
-# Rakefile for Autobuild
-
-# Copyright 2005 by Aslak Hellesoy (aslak.hellesoy@gmail.org)
-# All rights reserved.
-
-# This file is may be distributed under an MIT style license.  See
-# MIT-LICENSE for details.
+require 'rubygems'
+require 'hoe'
 
 $:.unshift('lib')
-require 'meta_project'
-require 'rake/gempackagetask'
-require 'rake/contrib/rubyforgepublisher'
-require 'rake/contrib/xforge'
-require 'rake/clean'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-# Versioning scheme: MAJOR.MINOR.PATCH
-# MAJOR bumps when API is broken backwards
-# MINOR bumps when the API is broken backwards in a very slight/subtle (but not fatal) way
-# -OR when a new release is made and propaganda is sent out.
-# PATCH is bumped for every API addition and/or bugfix (ideally for every commit)
-# Later DamageControl can bump PATCH automatically.
-#
-# REMEMBER TO KEEP PKG_VERSION IN SYNC WITH THE CHANGES FILE!
-PKG_NAME = "autobuild"
-UNIX_NAME = "autobuild"
-PKG_VERSION = "0.6"
-PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
-PKG_FILES = FileList[
-  'bin/*',
-  '[A-Z]*',
-  'lib/**/*.rb', 
-  'doc/**/*'
-]
 
-task :default => [:gem]
-
-# Create a task to build the RDOC documentation tree.
-rd = Rake::RDocTask.new("rdoc") do |rdoc|
-  rdoc.rdoc_dir = 'html'
-  rdoc.title    = "Autobuild"
-  rdoc.options << '--main' << 'README'
-  rdoc.rdoc_files.include('README', 'CHANGES', 'TODO')
-  rdoc.rdoc_files.include('lib/**/*.rb', 'doc/**/*.rdoc')
-  rdoc.rdoc_files.exclude('doc/**/*_attrs.rdoc')
-end
-
-# ====================================================================
-# Create a task that will package the Rake software into distributable
-# tar, zip and gem files.
-
-spec = Gem::Specification.new do |s|
-  
-  #### Basic information.
-
-  s.name = PKG_NAME
-  s.version = PKG_VERSION
-  s.summary = 'Rake-based utility to build and install multiple packages with dependencies'
-  s.description = <<-EOF
+Hoe.new('autobuild', "0.6.2") do |p|
+    p.author = "Sylvain Joyeux"
+    p.email = "sylvain.joyeux@m4x.org"
+    p.summary = 'Rake-based utility to build and install multiple packages with dependencies'
+    p.url = "http://autobuild.rubyforge.org"
+    p.description = <<-EOF
     Autobuild imports, configures, builds and installs various kinds of software packages.
     It can be used in software development to make sure that nothing is broken in the 
     build process of a set of packages, or can be used as an automated installation tool.
-  EOF
-
-  #### Documentation and testing.
-
-  s.has_rdoc = true
-  s.extra_rdoc_files = rd.rdoc_files.reject { |fn| fn =~ /\.rb$/ }.to_a
-  s.rdoc_options <<
-    '--title' <<  'Autobuild' <<
-    '--main' << 'README'
-
-  #### Author and project details.
-
-  s.author = "Sylvain Joyeux"
-  s.email = "sylvain.joyeux@m4x.org"
-  s.homepage = "http://autobuild.rubyforge.org"
-  s.rubyforge_project = "autobuild"
-
-  #### Advanced project information
-  s.platform = Gem::Platform::RUBY
-  s.require_paths << "lib"
-  s.add_dependency('rake', '>= 0.7.0')
-  s.add_dependency('rmail')
-  s.add_dependency('daemons')
-  s.files = PKG_FILES.to_a
-  s.test_files = FileList['test/*' ]
-  s.executables = 'autobuild'
-end
-
-# Fix 1.8.4 - 1.8.3 issue
-class << spec
-    def to_yaml
-        out = super 
-        out = '--- ' + out unless out =~ /^---/ 
-        out 
-    end
-end
-
-desc "Build Gem"
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
+    EOF
+    p.changes = p.paragraphs_of("CHANGES", 1).join("\n\n")
+    p.extra_deps << ['rake', '>= 0.7.0']
+    p.extra_deps << ['rmail']
+    p.extra_deps << ['daemons']
 end
 
-# Support Tasks ------------------------------------------------------
-
-desc "Look for TODO and FIXME tags in the code"
-task :todo do
-  Pathname.new(File.dirname(__FILE__)).egrep(/#.*(FIXME|TODO|TBD|DEPRECATED)/) do |match|
-    puts match
-  end
-end
-
-task :release => [:verify_env_vars, :release_files, :publish_doc, :tag] # :publish_news, 
-
-task :verify_env_vars do
-  raise "RUBYFORGE_USER environment variable not set!" unless ENV['RUBYFORGE_USER']
-  raise "RUBYFORGE_PASSWORD environment variable not set!" unless ENV['RUBYFORGE_PASSWORD']
-end
-
-task :publish_doc do
-  publisher = Rake::RubyForgePublisher.new(UNIX_NAME, ENV['RUBYFORGE_USER'])
-  publisher.upload
-end
-
-desc "Release files on RubyForge"
-task :release_files => [:gem] do
-  release_files = FileList[
-    "pkg/#{PKG_FILE_NAME}.gem"
-  ]
-
-  Rake::XForge::Release.new(MetaProject::Project::XForge::RubyForge.new(UNIX_NAME)) do |release|
-    # Never hardcode user name and password in the Rakefile!
-    release.user_name = ENV['RUBYFORGE_USER']
-    release.password = ENV['RUBYFORGE_PASSWORD']
-    release.files = release_files.to_a
-    release.release_name = "Autobuild #{PKG_VERSION}"
-    # The rest of the options are defaults (among others, release_notes and release_changes, parsed from CHANGES)
-  end
-end
-
-desc "Publish news on RubyForge"
-task :publish_news => [:gem] do
-  release_files = FileList[
-    "pkg/#{PKG_FILE_NAME}.gem"
-  ]
-
-  Rake::XForge::NewsPublisher.new(MetaProject::Project::XForge::RubyForge.new(UNIX_NAME)) do |news|
-    # Never hardcode user name and password in the Rakefile!
-    news.user_name = ENV['RUBYFORGE_USER']
-    news.password = ENV['RUBYFORGE_PASSWORD']
-  end
-end
-
-desc "Tag all the svn files with the latest release number (REL=x.y.z)"
-task :tag do
-  puts "Tagging release"
-  base_url = %{svn+ssh://#{RUBYFORGE_USER}@rubyforge.org/var/svn/autobuild}
-  sh %{svn cp #{base_url}/trunk/autobuild #{base_url}/tags/release/#{PKG_VERSION}}
-end
-
-

data/bin/autobuild

@@ -27,7 +27,9 @@ begin
 	    Reporting << MailReporter.new(Autobuild.mail)
 	end
 
-        ['import', 'prepare', 'build'].each do |phase|
+	targets = ['import']
+	targets += ['prepare', 'build'] if Autobuild.do_build
+        targets.each do |phase|
             if packages.empty?
                 Rake::Task[phase].invoke
             else

data/lib/autobuild/import/cvs.rb

@@ -23,9 +23,15 @@ module Autobuild
         private
 
         def update(package)
-            Dir.chdir(package.srcdir) {
+            Dir.chdir(package.srcdir) do
+		root = File.open("#{package.srcdir}/CVS/Root") { |io| io.read }.chomp
+		mod  = File.open("#{package.srcdir}/CVS/Repository") { |io| io.read }.chomp
+
+		if root != @root || mod != @module
+		    raise ArgumentError, "checkout in #{package.srcdir} is from #{root}:#{mod}, was expecting #{@root}:#{@mod}"
+		end
                 Subprocess.run(package.name, :import, @program, 'up', *@options_up)
-            }
+	    end
         end
 
         def checkout(package)

data/lib/autobuild/import/svn.rb

@@ -15,6 +15,12 @@ module Autobuild
 
         def update(package)
             Dir.chdir(package.srcdir) {
+		url = IO.popen("svn info") { |io| io.readlines }.grep(/^URL: /).first.chomp
+		url =~ /URL: (.+)/
+		source = $1
+		if source != @source
+		    raise ArgumentError, "current checkout found at #{package.srcdir} is from #{source}, was expecting #{@source}"
+		end
                 Subprocess.run(package.name, :import, @program, 'up', *@options_up)
             }
         end

data/lib/autobuild/packages/autotools.rb

@@ -53,6 +53,7 @@ module Autobuild
 
         def initialize(options)
             @using = Hash.new
+	    @configureflags = []
 
             super
 
@@ -93,7 +94,7 @@ module Autobuild
                 configure
             end
 
-            source_tree srcdir, builddir
+            source_tree srcdir, /^#{Regexp.quote(builddir)}/
             file buildstamp => [ srcdir, "#{builddir}/config.status" ] do 
                 ensure_dependencies_installed
                 build

data/lib/autobuild/packages/genom.rb

@@ -1,5 +1,6 @@
 require 'autobuild/packages/autotools'
 require 'open3'
+require 'autobuild/pkgconfig'
 
 module Autobuild
     def self.genom(opts, &proc)
@@ -35,13 +36,18 @@ module Autobuild
 
         # Extracts dependencies using the requires: field in the .gen file
         def get_requires
+	    apionly = genomflags.find { |f| f == '-a' }
             cpp = Autobuild.tool(:cpp)
             Open3.popen3("#{cpp} #{cpp_options.join(" ")} #{srcdir}/#{name}.gen") do |cin, out, err|
                 out.each_line { |line|
-                    if line =~ /^\s*requires\s*:\s*([\w\-]+(?:\s*,\s*[\w\-]+)*);/
-                        $1.split(/, /).each { |name| depends_on name }
-                    elsif line =~ /^\s*requires/
-                        puts "failed to match #{line}"
+                    if line =~ /^\s*(codels_)?requires\s*:\s*([\w\-]+(?:\s*,\s*[\w\-]+)*);/
+			# Remove the codels_requires lines if -a is given to genom
+			unless $1 == "codels_" && apionly
+			    $2.split(/, /).each { |name| depends_on name }
+			end
+                    elsif line =~ /^\s*(?:codels_)?requires/
+			# Check that the regexp is not too strict
+                        STDERR.puts "failed to match #{line}"
                     end
                 }
             end
@@ -64,18 +70,40 @@ module Autobuild
 	    file genomstamp => packages.map { |p| Package[p].installstamp }
 	end
 
+	# Make the genom-stamp file depend on
+	#   * genom includes
+	#   * genom canvas
+	#   * the genom binary itself
+	def genom_dependencies
+	    # Get the genom pkg-config
+	    if Package['genom']
+		'genom'
+	    else
+		genom_pkg = PkgConfig.new('genom')
+
+		includedir = File.join(genom_pkg.includedir, 'genom')
+		source_tree includedir
+
+		canvasdir = File.join(genom_pkg.prefix, "share", "genom", genom_pkg.version);;
+		source_tree canvasdir
+
+		binary = File.join(genom_pkg.exec_prefix, "bin", "genom")
+		file binary
+
+		[binary, includedir, canvasdir]
+	    end
+	end
+
         def regen
             cmdline = [ 'genom', "#{name}.gen", *genomflags ]
 
             file buildstamp => genomstamp
+	    file genomstamp => genom_dependencies
             file genomstamp => srcdir do
                 Dir.chdir(srcdir) do
                     Subprocess.run(name, 'genom', *cmdline)
 		end
             end
-            if Package['genom']
-                file genomstamp => Package['genom'].installstamp
-            end
 
             acuser = File.join(srcdir, "configure.ac.user")
             file File.join(srcdir, 'configure') => acuser do

data/lib/autobuild/packages/import.rb

@@ -12,12 +12,11 @@ module Autobuild
         end
         def initialize(target)
             super
-            source_tree srcdir, installstamp
+            source_tree srcdir, /^#{Regexp.quote(installstamp)}/
             file installstamp => srcdir do 
                 touch_stamp installstamp
             end
         end
-        def prepare; end
     end
 end
 

data/lib/autobuild/packages/pkgconfig.rb

@@ -0,0 +1,24 @@
+require 'autobuild/pkgconfig'
+
+module Autobuild
+    class InstalledPkgConfig < Package
+	def initialize(name)
+	    @pkgconfig = PkgConfig.new(name)
+	    @prefix = @pkgconfig.prefix
+	    super
+	end
+
+	def installstamp
+	    std_stamp = super
+	    if File.file?(std_stamp)
+		std_stamp
+	    else
+		raise "#{name} is either not installed or has not been built by autobuild (#{std_stamp} not found)"
+	    end
+	end
+    end
+    def installed_pkgconfig(name, &block)
+        InstalledPkgConfig.new(name, &block)
+    end
+end
+ 

data/lib/autobuild/packages/ruby.rb

@@ -0,0 +1,53 @@
+require 'autobuild/timestamps'
+require 'autobuild/package'
+require 'enumerator'
+
+module Autobuild
+    def self.ruby(spec, &proc)
+        RubyPackage.new(spec, &proc)
+    end
+    
+    class RubyPackage < Package
+	# The list of all extension directories
+	attr_reader :extdir
+
+        def installstamp
+            "#{srcdir}/#{STAMPFILE}"
+        end
+        def initialize(target)
+            super
+            source_tree srcdir, [/Makefile$/, /\.(?:so|o)$/]
+            file installstamp => srcdir do 
+                touch_stamp installstamp
+            end
+        end
+
+	def prepare
+	    @extdir = Find.enum_for(:find, srcdir).
+		grep(/extconf.rb$/).
+		map { |f| File.dirname(f) }
+
+	    extdir.each do |dir|
+		file "#{dir}/Makefile" => "#{dir}/extconf.rb" do
+		    Dir.chdir(dir) do
+			Subprocess.run(name, 'ext', Autobuild.tool('ruby'), 'extconf.rb')
+		    end
+		end
+	    end
+	end
+
+	def extstamp(dir); "#{dir}/ext-#{STAMPFILE}" end
+	def build
+	    extdir.each do |dir|
+		source_tree dir, [/Makefile$/, /\.(?:so|o)$/]
+		file extstamp(dir) => dir do
+		    Dir.chdir(dir) do
+			Subprocess.run(name, 'ext', Autobuild.tool('make'))
+			touch_stamp extstamp(dir)
+		    end
+		end
+	    end
+	end
+    end
+end
+