autobuild 0.6.5 → 0.6.6

data/Changes.txt

@@ -1,3 +1,14 @@
+== Version 0.6.6
+
+* add Package#post_install: executes either a block or an external
+  command after the package has been installed
+* allow to reference pkg-config packages not built by autobuild.
+  The .pc file is then used as installation stamp file
+* the configure.ac.user file generated by Genom may not be present
+  in the RCS. Do not expect it to be there after import.
+* removed the Ruby package. If there are extensions to build, better
+  have a post_install script to do that
+
 == Version 0.6.5
 
 * add Autobuild.default_packages

data/Manifest.txt

@@ -18,7 +18,6 @@ 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/reporting.rb
 lib/autobuild/subcommand.rb

data/TODO

@@ -2,4 +2,9 @@ TODO list for Autobuild
   * create HTML log pages
   * use Logger to be able to remove all non-error output
   * test patch support (which has not been used for long) and document it in the README
+  * add a disable_packages attribute to Autobuild to disable the build of specific
+    packages. This would allow to use autobuild in scripts where the list of packages
+    is asked to the user
+  * add an --interactive option, which could ask to disable/enable packages before doing
+    the build
 

data/lib/autobuild.rb

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

data/lib/autobuild/import/cvs.rb

@@ -23,6 +23,11 @@ module Autobuild
             @options_co = Array[*@options_co]
             super(options)
         end
+
+	# Array of options to give to 'cvs checkout'
+	attr_reader :options_co
+	# Array of options to give to 'cvs update'
+	attr_reader :options_up
         
 	# Returns the module to get
         def modulename; @module end

data/lib/autobuild/importer.rb

@@ -11,6 +11,10 @@ class Autobuild::Importer
     # More options are specific to each importer type.
     def initialize(options); @options = options end
 
+    def patches
+	@options[:patches] ||= []
+    end
+
     # Performs the import of +package+
     def import(package)
         srcdir = package.srcdir
@@ -71,10 +75,10 @@ class Autobuild::Importer
                 unapply(package, p) 
             end
 
-            @options[:patch].to_a.each { |p| 
+            patches.to_a.each do |p| 
                 apply(package, p) 
                 cur_patches << p
-            }
+	    end
         ensure
             File.open(patchlist(package), 'w+') do |f|
                 f.write(cur_patches.join("\n"))

data/lib/autobuild/package.rb

@@ -25,8 +25,13 @@ class Autobuild::Package
     # it is relative to Autobuild.prefix. Defaults to ''
     attr_writer :prefix
     
-    # The importer object for this package
-    attr_accessor :import
+    # Sets importer object for this package. Defined for backwards compatibility.
+    # Use the #importer attribute instead
+    def import=(value)
+	@importer = value
+    end
+    # Sets an importer object for this package
+    attr_accessor :importer
 
     # The list of packages this one depends upon
     attr_reader :dependencies
@@ -61,7 +66,19 @@ class Autobuild::Package
         yield(self) if block_given?
         
         # Declare the installation stampfile
-        file installstamp
+        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
+	    end
+	end
         task "#{name}-build" => installstamp
         task :build => "#{name}-build"
 
@@ -84,9 +101,19 @@ class Autobuild::Package
         task :default => name
     end
 
-    def import; @import.import(self) if @import end
+    def import; @importer.import(self) if @importer end
     def prepare; end
 
+    def post_install(*args, &block)
+	if args.empty?
+	    @post_install = block
+	elsif !block
+	    @post_install = args
+	else
+	    raise ArgumentError, "cannot set both arguments and block"
+	end
+    end
+
     # This package depends on +packages+
     def depends_on(*packages)
         packages.each do |p|
@@ -96,7 +123,7 @@ class Autobuild::Package
                 raise ConfigException.new(name), "package #{p} not defined"
             end
             file installstamp => Package[p].installstamp
-	    task "#{name}-import" => "#{p}-import"
+	    task "#{name}-import"  => "#{p}-import"
 	    task "#{name}-prepare" => "#{p}-prepare"
             @dependencies << p
         end

data/lib/autobuild/packages/autotools.rb

@@ -90,6 +90,8 @@ module Autobuild
         end
 
         def prepare
+	    configureflags.flatten!
+
 	    # Check if config.status has been generated with the
 	    # same options than the ones in configureflags
 	    config_status = "#{builddir}/config.status"
@@ -102,7 +104,7 @@ module Autobuild
 
 		# Add the --prefix option to the configureflags array
 		testflags = ["--prefix=#{prefix}"] + Array[*configureflags]
-		old_opt = options.find { |o| !testflags.include?(o) }
+		old_opt = options.find   { |o| !testflags.include?(o) }
 		new_opt = testflags.find { |o| !options.include?(o) }
 		if old_opt || new_opt
 		    File.rm_f config_status # to force reconfiguration

data/lib/autobuild/packages/genom.rb

@@ -25,6 +25,8 @@ module Autobuild
         # Called before running the rake tasks and
         # after all imports have been made
         def prepare
+	    genomflags.flatten!
+
             super
 	    get_requires
         end
@@ -59,7 +61,9 @@ module Autobuild
         # Alias this package to the ones defined in the EXTRA_PKGCONFIG 
         # flag in configure.ac.user
         def get_provides
-            File.open(File.join(srcdir, 'configure.ac.user')) do |f|
+	    configure_ac_user = File.join(srcdir, 'configure.ac.user')
+	    return unless File.readable?(configure_ac_user)
+            File.open(configure_ac_user) do |f|
                 f.each_line { |line|
                     if line =~ /^\s*EXTRA_PKGCONFIG\s*=\s*"?([\w\-]+(?:\s+[\w\-]+)*)"?/
                         $1.split(/\s+/).each { |pkg| provides pkg }

data/lib/autobuild/packages/pkgconfig.rb

@@ -2,19 +2,24 @@ require 'autobuild/pkgconfig'
 
 module Autobuild
     class InstalledPkgConfig < Package
+	attr_reader :pkgconfig
+	attr_reader :prefix
+
 	def initialize(name)
 	    @pkgconfig = PkgConfig.new(name)
-	    @prefix = @pkgconfig.prefix
+	    @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)"
+	    return std_stamp if File.file?(std_stamp)
+
+	    pcfile = File.join(pkgconfig.prefix, "lib", "pkgconfig", "opencv.pc")
+	    if !File.file?(pcfile)
+		raise "cannot find the .pc file for #{name}, tried #{pcfile}"
 	    end
+	    pcfile
 	end
     end
     def installed_pkgconfig(name, &block)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 0.6.5
-date: 2007-02-14 00:00:00 +01:00
+  version: 0.6.6
+date: 2007-04-24 00:00:00 +02:00
 summary: Rake-based utility to build and install multiple packages with dependencies
 require_paths: 
 - lib
@@ -49,7 +49,6 @@ files:
 - 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/reporting.rb
 - lib/autobuild/subcommand.rb
@@ -113,5 +112,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.7
+        version: 1.2.0
     version: 

data/lib/autobuild/packages/ruby.rb

@@ -1,53 +0,0 @@
-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
-