autobuild 0.6.6 → 0.6.7

data/Changes.txt

@@ -1,3 +1,20 @@
+== Version 0.6.7
+
+* put install-stamp files into logdir, to clean up the installation prefix
+* added Autobuild.post_install: run an external program or call a block after
+  all packages have been successfully built
+* bugfix: darcs get expects that the path to the destination directory already
+  exists. Create it ourselves if it does not exist.
+* bugfix: when computing the timestamp of a source tree, exclude .svn and _darcs
+  directories
+* bugfix: 'opencv.pc' were searched in PkgConfig packages instead of the
+  actual .pc file ...
+* bugfix: installed_pkgconfig is supposed to be a singleton method of Autobuild
+* bugfix: "darcs get" expects that the path leading to the destination
+  directory exists. Create it.
+* bugfix: fix handling of Genom's requires lists: we were previously expecting
+  packages to be exactly separated by ', '
+
 == Version 0.6.6
 
 * add Package#post_install: executes either a block or an external

data/README.txt

@@ -1,8 +1,6 @@
-Autobuild
-    http://autobuild.rubyforge.org
-
-Copyright (c) 2006-2007
-    Sylvain Joyeux <sylvain.joyeux@m4x.org>
+Copyright (c) 2006-2007 Sylvain Joyeux <sylvain.joyeux@m4x.org>
+* http://www.rubyforge.org/projects/autobuild [project page]
+* http://autobuild.rubyforge.org/autobuild [API documentation]
 
 This work is licensed under the GPLv2 license. See License.txt for details
 

data/lib/autobuild.rb

@@ -3,6 +3,6 @@ require 'autobuild/reporting'
 require 'autobuild/package'
 
 module Autobuild
-    VERSION = "0.6.6" unless defined? Autobuild::VERSION
+    VERSION = "0.6.7" unless defined? Autobuild::VERSION
 end
 

data/lib/autobuild/config.rb

@@ -46,6 +46,31 @@ module Autobuild
         send("#{name}=", value)
     end
 
+    def self.post_install(*args, &block)
+	if args.empty?
+	    @post_install_handler = block
+	elsif !block
+	    @post_install_handler = args
+	else
+	    raise ArgumentError, "cannot set both arguments and block"
+	end
+    end
+    attr_reader :post_install_handler
+
+    def self.apply_post_install(info)
+	return unless info
+
+	case info
+	when Array
+	    args = info.dup
+	    tool = Autobuild.tool(args.shift)
+
+	    Autobuild::Subprocess.run name, 'post-install', tool, *args
+	when Proc
+	    info.call
+	end
+    end
+
     @mail = Hash.new
     class << self
 	# Mailing configuration. It is a hash with the following keys (as symbols)

data/lib/autobuild/import/darcs.rb

@@ -32,6 +32,11 @@ module Autobuild
         end
 
         def checkout(package) # :nodoc:
+	    basedir = File.dirname(package.srcdir)
+	    unless File.directory?(basedir)
+		FileUtils.mkdir_p(basedir)
+	    end
+
 	    Subprocess.run(package.name, :import, @program, 
 	       'get', '--set-scripts-executable', @source, package.srcdir, *@get)
         end

data/lib/autobuild/package.rb

@@ -45,7 +45,7 @@ class Autobuild::Package
     # has finished. The path is absolute
     #
     # A package is sucessfully built when it is installed
-    def installstamp; "#{prefix}/#{name}-#{STAMPFILE}" end
+    def installstamp; "#{Autobuild.logdir}/#{name}-#{STAMPFILE}" end
 
     def initialize(spec)
         @dependencies   = Array.new
@@ -68,15 +68,7 @@ class Autobuild::Package
         # Declare the installation stampfile
         file installstamp do
 	    Dir.chdir(srcdir) do
-		case @post_install
-		when Array
-		    args = @post_install.dup
-		    tool = Autobuild.tool(args.shift)
-
-		    Autobuild::Subprocess.run name, 'post-install', tool, *args
-		when Proc
-		    @post_install.call
-		end
+		Autobuild.apply_post_install(@post_install)
 	    end
 	end
         task "#{name}-build" => installstamp

data/lib/autobuild/packages/genom.rb

@@ -48,7 +48,7 @@ module Autobuild
                     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 }
+			    $2.split(/,/).each { |name| depends_on name.strip }
 			end
                     elsif line =~ /^\s*(?:codels_)?requires/
 			# Check that the regexp is not too strict

data/lib/autobuild/packages/pkgconfig.rb

@@ -15,14 +15,14 @@ module Autobuild
 	    std_stamp = super
 	    return std_stamp if File.file?(std_stamp)
 
-	    pcfile = File.join(pkgconfig.prefix, "lib", "pkgconfig", "opencv.pc")
+	    pcfile = File.join(pkgconfig.prefix, "lib", "pkgconfig", "#{name}.pc")
 	    if !File.file?(pcfile)
 		raise "cannot find the .pc file for #{name}, tried #{pcfile}"
 	    end
 	    pcfile
 	end
     end
-    def installed_pkgconfig(name, &block)
+    def self.installed_pkgconfig(name, &block)
         InstalledPkgConfig.new(name, &block)
     end
 end

data/lib/autobuild/timestamps.rb

@@ -39,7 +39,7 @@ module Autobuild
     class SourceTreeTask < Rake::Task
         attr_accessor :exclude
         def timestamp
-            tree_timestamp(name, %r#(?:^|/)CVS$#, *@exclude)
+            tree_timestamp(name, %r#(?:^|/)(?:CVS|_darcs|\.svn)$#, *@exclude)
         end
     end
     def source_tree(path, exclude = [], &block)

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 0.6.6
-date: 2007-04-24 00:00:00 +02:00
+  version: 0.6.7
+date: 2007-05-05 00:00:00 +02:00
 summary: Rake-based utility to build and install multiple packages with dependencies
 require_paths: 
 - lib
 email: sylvain.joyeux@m4x.org
-homepage: "    http://autobuild.rubyforge.org"
+homepage: "* http://www.rubyforge.org/projects/autobuild [project page]"
 rubyforge_project: autobuild
-description: == What's autobuild ? 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.  Autobuild config files are Ruby scripts which configure rake to * imports the package from a SCM or (optionnaly) updates it * configures it. This phase can handle code generation, configuration (for instance for autotools-based packages), ... * build * install  It takes the dependencies between packages into account in its build process, updates the needed environment variables (+PKG_CONFIG_PATH+, +PATH+, +LD_LIBRARY_PATH+, ...)
+description: Autobuild config files are Ruby scripts which configure rake to * imports the package from a SCM or (optionnaly) updates it * configures it. This phase can handle code generation, configuration (for instance for autotools-based packages), ... * build * install  It takes the dependencies between packages into account in its build process, updates the needed environment variables (+PKG_CONFIG_PATH+, +PATH+, +LD_LIBRARY_PATH+, ...)  == WARNING for 0.5 users Old configuration files used with autobuild 0.5 aren't accepted by Autobuild 0.6. Since 0.6, Autobuild uses Ruby for configuration (just like rake does)
 autorequire: 
 default_executable: 
 bindir: bin