autobuild 0.3 → 0.4

data/README

@@ -13,19 +13,20 @@ It takes the dependencies between packages into account in its build process.
 1.  This section is not used at all by autobuild. It is only here to define references 
     used in the reste of the config file
 
-        variables:
-          - &openrobots ':ext:sjoyeux@cvs.laas.fr/cvs/openrobots'
-          - &openprs_cvs ':ext:sjoyeux@cvs.laas.fr:/usr/local/openprs/CVS-Repository'
-          - &compilers [ "CC=gcc-3.3", "CXX=g++-3.3" ]
-          - &global_prefix /home/doudou/laas/openrobots
-
-2.  <tt>autobuild-config</tt> holds the configuration of the build tool itself. See the
+        defines:
+          openrobots: ':ext:sjoyeux@cvs.laas.fr/cvs/openrobots'
+          openprs_cvs: ':ext:sjoyeux@cvs.laas.fr:/usr/local/openprs/CVS-Repository'
+          global_prefix: /home/doudou/laas/openrobots
+          srcdir: ${global_prefix}/tools
+          prefix: ${global_prefix}/build/tools
+
+2.  <tt>autobuild</tt> holds the configuration of the build tool itself. See the
     <b>Autobuild configuration</b> section for the available configuration options.
 
-        autobuild-config:
-          srcdir: &srcdir /home/doudou/laas/openrobots/tools
-          prefix: &prefix /home/doudou/laas/openrobots/build/tools
-          clean-log: true
+        autobuild:
+          srcdir: $srcdir
+          prefix: $prefix
+          clean_log: true
         
           mail:
             to: sjoyeux@laas.fr
@@ -47,11 +48,10 @@ It takes the dependencies between packages into account in its build process.
 
         packages:
 
-5.  options in <tt>common-config</tt> are merged in each package configuration. See 
+5.  options in <tt>common</tt> are merged in each package configuration. See 
     <b>Configuring packages</b> for the detailed merging rules.
 
-            common-config:
-                configureflags: *compilers
+            config:
                 prefix: ""
 
 6.  Tell autobuild to build the pocolibs package. Two common options here: 
@@ -64,7 +64,7 @@ It takes the dependencies between packages into account in its build process.
             pocolibs:
                 type: autotools
                 import: cvs
-                source: [ *openrobots, pocolibs ]
+                source: [ $openrobots, pocolibs ]
 
    
 7. Autobuild takes the dependencies between packages into account. Just list in +depends+ 
@@ -73,7 +73,7 @@ It takes the dependencies between packages into account in its build process.
             genom:
                 type: autotools
                 import: cvs
-                source: [ *openrobots, genom ]
+                source: [ $openrobots, genom ]
                 depends: pocolibs
 
 
@@ -92,11 +92,11 @@ each element is a section:
 
 In the documentation, I'll sometime use paths to reference the config options. For instance, 
 +option1+ is <tt>section1/option1</tt>. The +to+ option in the configuration example
-is <tt>autobuild-config/mail/to</tt>
+is <tt>autobuild/mail/to</tt>
   
 Autobuild uses three sections:
 
-<b>autobuild-config</b>::   main autobuild configuration. See <b>Autobuild configuration</b> below
+<b>autobuild</b>::   main autobuild configuration. See <b>Autobuild configuration</b> below
 *programs*::                the programs used by importers and builders. See each tool 
                             documentation for the list of used options
 *packages*::                the list of packages to build. See <b>Package configuration</b> below
@@ -104,12 +104,12 @@ Autobuild uses three sections:
                             this section can be used later in other parts of the config files using
                             the $key or ${key} notation
 
-== Autobuild configuration (<tt>autobuild-config</tt>)
+== Autobuild configuration (<tt>autobuild</tt>)
 === Misc options
 *update*::    if false, do not update the packages that are already imported (default: true). You
               can also use the <tt>--no-update</tt> on the command line
 
-=== Directories (<tt>autobuild-config/srcdir</tt>, <tt>autobuild-config/prefix</tt> and <tt>autobuild-config/logdir</tt>)
+=== Directories (<tt>autobuild/srcdir</tt>, <tt>autobuild/prefix</tt> and <tt>autobuild/logdir</tt>)
 *srcdir*::    the path where programs are to be imported. See <b>Packages configuration</b> for 
               more information on how this option is used.
 *prefix*::    the path where programs are to be installed. See <b>Packages configuration</b> for more 
@@ -117,20 +117,20 @@ Autobuild uses three sections:
 *logdir*::    by default, autobuild does not displays the output of each subcommand it launches. 
               Insteads, it saves this output in log files. These log files are saved in +logdir+. 
               The default value is <tt>prefix/autobuild</tt>
-<b>clean-log</b>:: if we must remove all logfiles before each autobuild run or if we should append to them. The
+<b>clean_log</b>:: if we must remove all logfiles before each autobuild run or if we should append to them. The
                    default is +true+, that is log files are removed. Note that if mailing is active, all log 
                    files are attached to notification mail.
 *nice*::      The priority at which autobuild should launch subprocesses
 
 
-=== Environment (<tt>autobuild-config/environment</tt>)
-The <tt>autobuild-config/environment</tt> section lists the initial values for 
+=== Environment (<tt>autobuild/environment</tt>)
+The <tt>autobuild/environment</tt> section lists the initial values for 
 the environment variables. While packages builders shall update the environment 
 variables as needed, you can have to set up a proper initial environment. Arrays 
 are converted into strings by joining elements by ':'
 
 For instance
-    autobuild-config:
+    autobuild:
           environment:
             PATH: [ "/bin", "/usr/bin" ]
             LD_LIBRARY_PATH:
@@ -143,11 +143,11 @@ sets
     PKG_CONFIG_PATH=""
 
 
-=== Mail (<tt>autobuild-config/mail</tt>)
+=== Mail (<tt>autobuild/mail</tt>)
 If you want to receive a mail when the build has finished (on success and failures), set
 at least the +to+ option, like this:
 
-    autobuild-config:
+    autobuild:
         mail:
             from: autobuild@mymachine.rubyrules.org
             to: myself+autobuild@rubyrules.org
@@ -162,10 +162,10 @@ All log files relative to the current build are attached to the mail.
 
 
 == Configuring packages (<tt>packages/*</tt>)
-=== The <tt>packages/common-config</tt> section
+=== The <tt>packages/config</tt> section
 If you want to add common options in each package, just set it them here. Note that the options
 are /merged/ in the package config. It neither replaces the values in the package nor be replaced
-by them. The merging strategy depends on the way the <tt>common-config</tt> is specified:
+by them. The merging strategy depends on the way the <tt>common</tt> is specified:
 * if it is an array, the package option is converted to an array and the common option is appended
 * if it is a string, the package option is converted to a string and the common option is appended
 with a space inserted between the two
@@ -173,17 +173,17 @@ with a space inserted between the two
 * any other values are forbidden
 
 To ease the config file writing, all options that accept arrays also accept a string when there 
-is only one element. <b>Do not</b> do that in the <tt>common-config</tt> option.
+is only one element. <b>Do not</b> do that in the <tt>common</tt> option.
 
 === Package definition
-All subsections of the <tt>packages/</tt> section but <tt>common-config</tt> are package definitions
+All subsections of the <tt>packages/</tt> section but <tt>common</tt> are package definitions
 The section name is used as the package name. The package definition sets up the importer to get the
 source and the builder to build and install it.
 
 *type*::    the package type. See the <b>Available package types</b> sections
 
 *srcdir*::  where sources are to be imported. If this is a relative path, it is relative to the global
-            <tt>/autobuild-config/srcdir</tt> option. Otherwise, the absolute path is used. If no +srcdir+
+            <tt>/autobuild/srcdir</tt> option. Otherwise, the absolute path is used. If no +srcdir+
             is given, the package name is used, so that the default import dir is 
             <em>global srcdir</em>/<em>package_name</em>.
         
@@ -199,17 +199,16 @@ source and the builder to build and install it.
             Since relative paths for patch files are relative to the autobuild working directory, I recommend 
             you put absolute paths here.
 
-*source*</b>:: 
-            where the importer should get the sources. The format of this options depends on
+*source*::  where the importer should get the sources. The format of this options depends on
             the importer used. See Available importers.
 
 *prefix*::  where the program is to be installed. If this is a relative path, it is relative to the global
-            <tt>/autobuild-config/prefix</tt> option. Otherwise, the absolute path is used. If no prefix
+            <tt>/autobuild/prefix</tt> option. Otherwise, the absolute path is used. If no prefix
             is given, the package name is used, so that the default install dir is 
             <em>global prefix</em>/<em>package name</em>
 
 *depends*::     the array of packages that should be built and installed before this one is built. <tt>depends: [ foo ]</tt>
-                is equivalent to <tt>depends: foo</tt>. To make the use of +depends+ in the <tt>common-config</tt> 
+                is equivalent to <tt>depends: foo</tt>. To make the use of +depends+ in the <tt>common</tt> 
                 section possible, this package name is automatically removed from the package +depends+ array.
 *provides*::    defines aliases for this package. As for +depends+, an array with only element can be replaced
                 by the simple value.
@@ -227,7 +226,7 @@ source and the builder to build and install it.
                 packages:
                     foo:
                         import: svn
-                        source: [ *my_home_repository, /trunk/foo ]
+                        source: [ $my_home_repository, /trunk/foo ]
 
 *svnup*::   options to add to svn up. Defaults to ''
 *svnco*::   options to add to svn co. Defaults to ''
@@ -241,7 +240,7 @@ to set up the importer and +srcdir+. +prefix+ is ignored.
         bar:
             type: import
             import: cvs
-            source: [ *my_repository, "bar" ]
+            source: [ $my_repository, "bar" ]
             srcdir: bar
 
 === Autotools (<tt>type: autotools</tt>)
@@ -286,10 +285,35 @@ The only program used during the build phase is +make+. The make command can too
 The <tt>--daemon</tt> command line options makes autobuild go into daemon mode.
  
 = Changes
+== 0.3 to 0.4
+* added support to split import and build. For instance
+
+    whole_tree:
+        type: import
+        import: cvs
+        source: [ a, repository ]
+
+    package1:
+        type: autotools
+        srcdir: whole_tree/package1
+        depends: whole_tree
+        
+    package2:
+        type: autotools
+        srcdir: whole_tree/package2
+        depends: whole_tree
+        
+  Now works well
+
+* the <tt>autotools</tt> package has now an <tt>autogen</tt> options, which gives a name for the script
+  to run to create the autoconf environment
+* renamed 'genomflags' -> 'genflags'
+* variable interpolation checks for environment variables
+* bugfixes
 == 0.2 to 0.3
 * added support for patching source code. Add patch: [ patches ] to the package configuration
 * renamed autobuild-config, common-config and clean-log to autobuild, common and clean_log. Autobuild
-  warns if it finds one the previous spelling
+  warns if it finds one the previous spelling but ignores it anyway
 
 = Copyright and license
 Author::    Sylvain Joyeux <sylvain.joyeux@m4x.org>

data/bin/autobuild

@@ -8,7 +8,7 @@ require 'optparse'
 
 require 'autobuild/options'
 require 'autobuild/config'
-require 'autobuild/logging'
+require 'autobuild/reporting'
 require 'daemons'
 
 DEFAULT_HTTP_PORT = 2000
@@ -63,19 +63,21 @@ if options.daemonize
     Daemons.daemonize 
 end
 
-File.open(conffile) do |f|
-    Config.load(f, options)
-end
+Reporting.report do
+    begin
+        File.open(conffile) do |f|
+            Config.load(f, options)
+        end
 
-begin
-    if targets.empty?
-        Rake::Task[:default].invoke
-    else
-        targets.each { |t| Rake::Task[t.to_sym].invoke }
+        if targets.empty?
+            Rake::Task[:default].invoke
+        else
+            targets.each { |t| Rake::Task[t.to_sym].invoke }
+        end
+    rescue ConfigException => e
+        e.target = conffile
+        raise
     end
-    success
-rescue BuildException => error
-    error(error, "Error during build of #{error.target}")
-    exit(1)
+    Reporting.success
 end
 

data/lib/autobuild/config-interpolator.rb

@@ -1,3 +1,5 @@
+require 'autobuild/exceptions'
+
 class Regexp
     def each_match(string)
         string = string.to_str
@@ -8,9 +10,17 @@ class Regexp
     end
 end
 
-class UndefinedVariable < Exception
+class UndefinedVariable < ConfigException
     attr_reader :name
-    def initialize(name); @name = name end
+    attr_accessor :reference
+    def initialize(name, reference = [])
+        @name = name 
+        @reference = reference
+    end
+
+    def to_s
+        "undefined variable '#{name}' in #{reference.join('/')}"
+    end
 end
 
 class Interpolator
@@ -37,8 +47,13 @@ class Interpolator
 
             interpolated = Hash.new
             @node.each do |k, v|
-                next if k == VarDefKey
-                interpolated[k] = Interpolator.interpolate(v, self)
+                begin
+                    next if k == VarDefKey
+                    interpolated[k] = Interpolator.interpolate(v, self)
+                rescue UndefinedVariable => e
+                    e.reference.unshift k
+                    raise e
+                end
             end
 
             interpolated
@@ -47,7 +62,12 @@ class Interpolator
             @node.collect { |v| Interpolator.interpolate(v, self) }
 
         else
-            each_interpolation(@node) { |varname| value_of(varname) }
+            begin
+                each_interpolation(@node) { |varname| value_of(varname) }
+            rescue UndefinedVariable => e
+                e.reference.unshift @node.to_str if @node.respond_to?(:to_str)
+                raise e
+            end
         end
     end
 
@@ -59,7 +79,7 @@ class Interpolator
                     value_of(varname)
                 rescue UndefinedVariable => e
                     if e.varname == name
-                        raise "Cyclic reference found in definition of #{name}"
+                        raise ConfigException, "cyclic reference found in definition of '#{name}'"
                     else
                         raise
                     end
@@ -69,8 +89,10 @@ class Interpolator
             @variables[name]
         elsif @parent
             @parent.value_of(name)
+        elsif ENV[name.to_s]
+            ENV[name.to_s]
         else
-            raise UndefinedVariable.new(name), "Interpolated variable #{name} is not defined"
+            raise UndefinedVariable.new(name)
         end
     end
 

data/lib/autobuild/config.rb

@@ -2,7 +2,7 @@ require 'yaml'
 require 'pathname'
 
 require 'autobuild/config-interpolator'
-require 'autobuild/logging'
+require 'autobuild/reporting'
 require 'autobuild/package'
 require 'autobuild/importer'
 
@@ -56,7 +56,7 @@ module Config
         check_backward_compatibility(config)
         config = config.keys_to_sym
         if !config[:autobuild]
-            raise ConfigException, "no autobuild block"
+            raise ConfigException, "no toplevel autobuild config block"
         end
 
         # Merge user_options into the autobuild block
@@ -70,30 +70,20 @@ module Config
             end
         }
 
-        $VERBOSE = config[:verbose]
-        $DEBUG   = config[:debug]
+        $VERBOSE = autobuild_config[:verbose]
+        $trace = $DEBUG   = autobuild_config[:debug]
 
         get_autobuild_config(config)
         get_package_config(config)
-    rescue ConfigException => error
-        error(error, "Error in config file '#{conffile}'")
-        exit(1)
-    rescue ImportException => error
-        error(error, "Error: unable to import #{p}")
-        exit(1)
     end
 
     def self.get_autobuild_config(config)
         $PROGRAMS = (config[:programs] or "make")
         
         autobuild = config[:autobuild]
-        $SRCDIR = autobuild[:srcdir]
-        $PREFIX = autobuild[:prefix]
-        if !$SRCDIR || !$PREFIX
-            raise ConfigException, 'you must at least set srcdir and prefix in the config files'
-        end
-
-        $LOGDIR = (autobuild[:logdir] || "#{$PREFIX}/autobuild")
+        $SRCDIR = File.expand_path(autobuild[:srcdir], Dir.pwd)
+        $PREFIX = File.expand_path(autobuild[:prefix], Dir.pwd)
+        $LOGDIR = File.expand_path(autobuild[:logdir] || "autobuild", $PREFIX)
 
         FileUtils.mkdir_p $SRCDIR if !File.directory?($SRCDIR)
         FileUtils.mkdir_p $LOGDIR if !File.directory?($LOGDIR)
@@ -131,7 +121,7 @@ module Config
         config[:srcdir] ||= name.to_s
         config[:prefix] ||= name.to_s
 
-        # Build the rake rules for this package
+        # Initializes the package
         Package.build(package_type, name, config)
     end
 
@@ -159,6 +149,9 @@ module Config
 
             add_package(p, config)
         end
+
+        # Post-import, pre-build pass
+        Package.each(false) { |name, pkg| pkg.prepare }
     end
 
     private_class_method :get_autobuild_config, :get_package_config, :add_package

data/lib/autobuild/environment.rb

@@ -4,7 +4,7 @@ def pathvar(path, varname)
         if oldpath.empty?
             ENV[varname] = path
         else
-            ENV[varname] = "#{oldpath}:#{path}"
+            ENV[varname] = "#{path}:#{oldpath}"
         end
     end
 end

data/lib/autobuild/exceptions.rb

@@ -0,0 +1,51 @@
+class SubcommandFailed < Exception
+    def mail?;  false end
+    def fatal?; true end
+
+    attr_reader :target, :command, :logfile, :status
+    def initialize(target, command, logfile, status)
+        @target = target
+        @command = command
+        @logfile = logfile
+        @status = status
+    end
+end
+        
+class ConfigException < Exception
+    def mail?;  false end
+    def fatal?; true end
+
+    def initialize(target = nil)
+        @target = target
+    end
+    attr_accessor :target
+end
+
+class PackageException < Exception
+    def mail?; true end
+    def fatal?; true end
+
+    def initialize(target = nil)
+        @target = target
+    end
+    attr_accessor :target
+end
+
+class ImportException < SubcommandFailed
+    def mail?;  true end
+    def fatal?; true end
+
+    def initialize(subcommand)
+        super(subcommand.target, subcommand.command, subcommand.logfile, subcommand.status)
+    end
+end
+
+class BuildException < SubcommandFailed
+    def mail?;  true end
+    def fatal?; true end
+
+    def initialize(subcommand)
+        super(subcommand.target, subcommand.command, subcommand.logfile, subcommand.status)
+    end
+end
+

data/lib/autobuild/import/cvs.rb

@@ -11,6 +11,10 @@ class CVSImporter < Importer
         @co = (options[:cvsco] || '-P')
         super(options)
     end
+    
+    def modulename
+        @module
+    end
 
     private
 
@@ -27,7 +31,6 @@ class CVSImporter < Importer
     def checkout(package)
         head, tail = File.split(package.srcdir)
         cvsroot = @root
-        modulename = @module
            
         FileUtils.mkdir_p(head) if !File.directory?(head)
         Dir.chdir(head) {

data/lib/autobuild/importer.rb

@@ -1,3 +1,5 @@
+require 'autobuild/exceptions'
+
 class Importer
     def initialize(options)
         @options = options
@@ -15,14 +17,14 @@ class Importer
             end
 
         elsif File.exists?(srcdir)
-            raise ImportException, "#{srcdir} exists but is not a directory"
+            raise ConfigException, "#{srcdir} exists but is not a directory"
         else
             begin
                 checkout(package)
                 patch(package)
-            rescue ImportException => error
+            rescue ImportException
                 FileUtils.rm_rf package.srcdir
-                raise error
+                raise
             end
         end
     end

data/lib/autobuild/package.rb

@@ -4,16 +4,32 @@ require 'autobuild/subcommand'
 
 class Package
     @@packages = {}
+    @@provides = {}
 
     attr_reader :dependencies
     attr_reader :target, :srcdir, :prefix
 
     def installstamp; "#{prefix}/#{target}-#{STAMPFILE}" end
-    def self.[](target); @@packages[target] end
 
+    def self.each(with_provides = false, &p)
+        @@packages.each(&p) 
+        @@provides.each(&p) if with_provides
+    end
+    def self.[](target)
+        @@packages[target] or @@provides[target]
+    end
+
+    ## Available options
+    #   srcdir: the source dir. If a relative path, it is based on $SRCDIR
+    #   prefix: the install dir. If a relative path, it is based on $PREFIX
+    #   import: the package importer object
+    #   depends: the list of package name we depend upon
+    #   provides: a list of aliases for this package
+    #
+    # $SRCDIR and $PREFIX are supposed to be valid absolute paths
     def initialize(target, options)
         @target = Package.name2target(target)
-        raise ConfigException, "Package #{target} is already defined" if Package[target]
+        raise ConfigException, "package #{target} is already defined" if Package[target]
             
         @options = options
         @dependencies = Array.new
@@ -50,7 +66,7 @@ class Package
 
     def provides(p)
         p = Package.name2target(p)
-        @@packages[p] = self 
+        @@provides[p] = self 
         puts "Defining #{p} as an alias to #{target}"
         task p => target
 

data/lib/autobuild/packages/autotools.rb

@@ -41,10 +41,12 @@ class Autotools < Package
         super(target, options)
 
         @builddir = options[:builddir]
-        raise ConfigException, "Autotools packages need a non-empty builddir" if (@builddir.nil? || @builddir.empty?)
-        raise ConfigException, "No support for absolute builddirs" if (Pathname.new(@builddir).absolute?)
+        raise ConfigException, "autotools packages need a non-empty builddir" if (@builddir.nil? || @builddir.empty?)
+        raise ConfigException, "absolute builddirs are unsupported" if (Pathname.new(@builddir).absolute?)
         @builddir = File.expand_path(builddir, srcdir)
+    end
 
+    def prepare
         regen_targets
 
         file "#{builddir}/config.status" => "#{srcdir}/configure" do
@@ -72,32 +74,38 @@ class Autotools < Package
         conffile = "#{srcdir}/configure"
         if File.exists?("#{conffile}.ac")
             file conffile => [ "#{conffile}.ac" ]
-        else
+        elsif File.exists?("#{conffile}.in")
             file conffile => [ "#{conffile}.in" ]
+        else
+            raise PackageException.new(target), "neither configure.ac nor configure.in present in #{srcdir}"
         end
         file conffile do
             Dir.chdir(srcdir) {
-                $PROGRAMS['aclocal']     ||= 'aclocal'
-                $PROGRAMS['autoconf']    ||= 'autoconf'
-                $PROGRAMS['autoheader']  ||= 'autoheader'
-                $PROGRAMS['automake']    ||= 'automake'
+                $PROGRAMS[:aclocal]     ||= 'aclocal'
+                $PROGRAMS[:autoconf]    ||= 'autoconf'
+                $PROGRAMS[:autoheader]  ||= 'autoheader'
+                $PROGRAMS[:automake]    ||= 'automake'
 
                 begin
-                    # Autodetect autoconf/aclocal/automake
-                    if @options[:autoconf].nil?
-                        @options[:autoconf] = 
-                            File.exists?(File.join(srcdir, 'configure.in')) ||
-                            File.exists?(File.join(srcdir, 'configure.ac'))
+                    if @options[:autogen]
+                        subcommand(target, 'configure', File.expand_path(@options[:autogen]))
+                    else
+                        # Autodetect autoconf/aclocal/automake
+                        if @options[:autoconf].nil?
+                            @options[:autoconf] = 
+                                File.exists?(File.join(srcdir, 'configure.in')) ||
+                                File.exists?(File.join(srcdir, 'configure.ac'))
+                        end
+                        @options[:aclocal] ||= @options[:autoconf]
+                        if @options[:automake].nil?
+                            @options[:automake] = File.exists?(File.join(srcdir, 'Makefile.am'))
+                        end
+
+                        subcommand(target, 'configure', $PROGRAMS[:aclocal])    if @options[:aclocal]
+                        subcommand(target, 'configure', $PROGRAMS[:autoconf])   if @options[:autoconf]
+                        subcommand(target, 'configure', $PROGRAMS[:autoheader]) if @options[:autoheader]
+                        subcommand(target, 'configure', $PROGRAMS[:automake])   if @options[:automake]
                     end
-                    @options[:aclocal] ||= @options[:autoconf]
-                    if @options[:automake].nil?
-                        @options[:automake] = File.exists?(File.join(srcdir, 'Makefile.am'))
-                    end
-
-                    subcommand(target, 'configure', $PROGRAMS['aclocal'])    if @options[:aclocal]
-                    subcommand(target, 'configure', $PROGRAMS['autoconf'])   if @options[:autoconf]
-                    subcommand(target, 'configure', $PROGRAMS['autoheader']) if @options[:autoheader]
-                    subcommand(target, 'configure', $PROGRAMS['automake'])   if @options[:automake]
                 rescue SubcommandFailed => e
                     raise BuildException.new(e), "failed to build the configure environment of #{target}"
                 end
@@ -107,7 +115,7 @@ class Autotools < Package
 
     def configure
         if File.exists?(builddir) && !File.directory?(builddir)
-            raise BuildException, "#{builddir} already exists but is not a directory"
+            raise ConfigException, "#{builddir} already exists but is not a directory"
         end
 
         FileUtils.mkdir_p builddir if !File.directory?(builddir)
@@ -149,4 +157,3 @@ class Autotools < Package
     end
 end
 
-

data/lib/autobuild/packages/genom.rb

@@ -2,16 +2,15 @@ require 'autobuild/packages/autotools'
 require 'open3'
 
 class GenomModule < Autotools
-    def initialize(target, options)
-        super(target, options)
+    def prepare
+        super
         get_requires
         get_provides
     end
-
     def genomstamp; "#{srcdir}/.genom/genom-stamp" end
 
     def cpp_options
-        @options[:genomflags].to_a.find_all { |opt| opt =~ /^-D/ }
+        @options[:genflags].to_a.find_all { |opt| opt =~ /^-D/ }
     end
 
     def get_requires
@@ -21,7 +20,6 @@ class GenomModule < Autotools
                 if line =~ /^\s*requires\s*:\s*([\w\-]+(?:\s*,\s*[\w\-]+)*);/
                     $1.split(/, /).each { |name| 
                         depends_on name
-                        file genomstamp => Package.name2target(name)
                     }
                 elsif line =~ /^\s*requires/
                     puts "failed to match #{line}"
@@ -30,6 +28,11 @@ class GenomModule < Autotools
         end
     end
 
+    def depends_on(name)
+        super
+        file genomstamp => Package.name2target(name)
+    end
+
     def get_provides
         File.open("#{srcdir}/configure.ac.user") do |f|
             f.each_line { |line|
@@ -44,7 +47,7 @@ class GenomModule < Autotools
         
 
     def regen_targets
-        cmdline = [ 'genom', target ] | @options[:genomflags].to_a
+        cmdline = [ 'genom', target ] | @options[:genflags].to_a
 
         file buildstamp => genomstamp
         file genomstamp => [ :genom, "#{srcdir}/#{target}.gen" ] do
@@ -64,7 +67,7 @@ class GenomModule < Autotools
                 # since the generation takes care of rebuilding configure
                 # if .gen has changed
                 begin
-                    subcommand(target, 'genom', *cmdline)
+                    subcommand(target, 'genom', File.expand_path('autogen'))
                 rescue SubcommandFailed => e
                     raise BuildException.new(e), "failed to generate module #{target}"
                 end

data/lib/autobuild/packages/import.rb

@@ -12,6 +12,7 @@ class ImporterPackage < Package
             touch_stamp installstamp
         end
     end
+    def prepare; end
 
     factory :import, ImporterPackage
 end

data/lib/autobuild/reporting.rb

@@ -0,0 +1,91 @@
+require 'rmail'
+require 'rmail/serialize'
+require 'net/smtp'
+require 'socket'
+
+module Reporting
+    def self.report
+        begin
+            yield
+        rescue Exception => e
+            raise unless e.respond_to?(:target)
+            error(e)
+            exit(1) if e.fatal?
+        end
+    end
+    
+    def self.success
+        message = "Build finished successfully at #{Time.now}"
+        puts message
+        send_mail("Build success", message) if $MAIL
+    end
+
+    def self.error(object)
+        if object.kind_of?(SubcommandFailed)
+            body = <<EOF
+#{object.target}: #{object.message}
+    command '#{object.command}' failed with status #{object.status}
+    see #{File.basename(object.logfile)} for details
+EOF
+
+            message = <<EOF
+#{object.target}: #{object.message}
+    command '#{object.command}' failed with status #{object.status}
+    see #{object.logfile} for details
+EOF
+        else
+            body = message = "#{object.target}: #{object.message}"
+        end
+
+        puts message
+        send_mail("Build failed", body) if $MAIL && object.mail?
+    end
+
+    private
+
+    def self.send_mail(subject, body)
+        from = ($MAIL[:from] || "autobuild@#{Socket.gethostname}")
+        to = $MAIL[:to]
+        smtp = ($MAIL[:smtp]  || "localhost" )
+
+        mail = RMail::Message.new
+        mail.header.date = Time.now
+        mail.header.from = from
+        mail.header.to = to
+        mail.header.subject = subject
+
+        part = RMail::Message.new
+        part.header.set('Content-Type', 'text/plain')
+        part.body = body
+        mail.add_part(part)
+
+        # Attach log files
+        Dir.glob("#{$LOGDIR}/*.log") do |file|
+            mail.add_file(file)
+        end
+
+        # Send the mail
+        smtp = Net::SMTP.new(smtp, Integer($MAIL[:port] || 25))
+        smtp.start {
+            smtp.send_mail RMail::Serialize.write('', mail), from, to
+        }
+    end
+end
+
+
+module RMail
+    class Message
+        def add_file(path, content_type='text/plain')
+            part = RMail::Message.new
+            part.header.set('Content-Type', content_type)
+            part.header.set('Content-Disposition', 'attachment', 'filename' => File.basename(path))
+            part.body = ''
+            File.open(path) do |file|
+                part.body << file.readlines.join("\n")
+            end
+            self.add_part(part)
+        end
+    end
+end
+
+

data/lib/autobuild/subcommand.rb

@@ -1,4 +1,4 @@
-require 'autobuild/logging'
+require 'autobuild/reporting'
 
 def subcommand(target, type, *command)
     # Filter nil and empty? in command
@@ -29,7 +29,7 @@ def subcommand(target, type, *command)
             end
            
             if !exec(*command)
-                raise "Error running command"
+                raise SubcommandFailed.new(target, command.join(" "), logname, 0), "error running command"
             end
         }
 

data/test/base.rb

@@ -1,6 +1,8 @@
+$LOAD_PATH.unshift File.expand_path('..', File.dirname(__FILE__))
 $LOAD_PATH << File.expand_path('../lib', File.dirname(__FILE__))
 require 'rubygems'
 require 'test/unit'
 require 'test/tc_config_interpolation.rb'
 require 'test/tc_config.rb'
 require 'test/tc_subcommand.rb'
+require 'test/tc_import.rb'

data/test/tc_config.rb

@@ -1,17 +1,19 @@
+$LOAD_PATH.unshift File.expand_path('..', File.dirname(__FILE__))
+$LOAD_PATH << File.expand_path('../lib', File.dirname(__FILE__))
 require 'test/unit'
-require 'test/conffile-generator'
+require 'test/tools'
 require 'autobuild/options'
 require 'autobuild/config'
 
 class TC_Config < Test::Unit::TestCase
     def setup
-        @conffile = ConffileGenerator.dummy
+        @conffile = TestTools.build_config(binding, 'dummy')
         @options_hash = File.open(@conffile) { |f| YAML.load(f) }
         @options = File.open(@conffile) { |f| Config.load(f, Options.default) }
     end
 
     def teardown
-        ConffileGenerator.clean
+        TestTools.clean
     end
 
     def test_keys_to_sym

data/test/tc_config_interpolation.rb

@@ -1,6 +1,10 @@
+$LOAD_PATH.unshift File.expand_path('..', File.dirname(__FILE__))
+$LOAD_PATH << File.expand_path('../lib', File.dirname(__FILE__))
+
 require 'test/unit'
-require 'yaml'
 require 'autobuild/config-interpolator'
+
+require 'yaml'
 require 'stringio'
 
 class TC_ConfigInterpolation < Test::Unit::TestCase
@@ -15,6 +19,7 @@ autobuild:
     srcdir: $srcdir
     prefix: $prefix
     nice: $nice
+    envvar: $ENVVAR
 
 EOF
         
@@ -40,9 +45,11 @@ EOF
     end
         
     def test_interpolation
+        ENV['ENVVAR'] = 'envvar'
         data = Interpolator.interpolate(@wellformed)
         assert_equal('/home/doudou/src', data["autobuild"]["srcdir"])
         assert_equal('/home/doudou/build', data["autobuild"]["prefix"])
+        assert_equal('envvar', data["autobuild"]["envvar"])
         assert_equal(10, data["autobuild"]["nice"])
         assert_kind_of(Fixnum, data["autobuild"]["nice"])
     end

data/test/tc_import.rb

@@ -0,0 +1,77 @@
+$LOAD_PATH.unshift File.expand_path('..', File.dirname(__FILE__))
+$LOAD_PATH << File.expand_path('../lib', File.dirname(__FILE__))
+require 'test/unit'
+require 'test/tools'
+require 'autobuild/import/cvs'
+require 'autobuild/import/svn'
+
+class TC_Import < Test::Unit::TestCase
+    Package = Struct.new :srcdir, :target
+
+    def setup
+        $PROGRAMS = {}
+        $UPDATE = true
+        $LOGDIR = "#{TestTools.tempdir}/log"
+        FileUtils.mkdir_p($LOGDIR)
+
+    end
+    
+    def teardown
+        $PROGRAMS = nil
+        $UPDATE = true
+        $LOGDIR = nil
+        TestTools.clean
+    end
+
+    def test_cvs
+        TestTools.untar('cvsroot.tar')
+        cvsroot = File.join(TestTools.tempdir, 'cvsroot')
+        pkg_cvs = Package.new File.join(TestTools.tempdir, 'cvs'), :cvs
+
+        # Make a checkout
+        importer = Import.cvs [ cvsroot, 'cvs' ], {}
+        importer.import(pkg_cvs)
+        assert( File.exists?(File.join(pkg_cvs.srcdir, 'test')) )
+
+        # Make an update
+        importer.import(pkg_cvs)
+
+        # Make an update fail
+        FileUtils.rm_rf cvsroot
+        assert_raise(ImportException) { importer.import pkg_cvs }
+
+        # Make a checkout fail
+        FileUtils.rm_rf pkg_cvs.srcdir
+        assert_raise(ImportException) { importer.import pkg_cvs }
+    end
+
+    def test_svn
+        TestTools.untar('svnroot.tar')
+        svnrepo = File.join(TestTools.tempdir, 'svnroot')
+        svnroot = "file:///#{svnrepo}"
+        pkg_svn = Package.new File.join(TestTools.tempdir, 'svn'), :svn
+
+        # Make a checkout with a splitted URL
+        importer = Import.svn [ svnroot, 'svn' ], {}
+        importer.import(pkg_svn)
+        assert( File.exists?(File.join(pkg_svn.srcdir, 'test')) )
+
+        # Make a checkout with an URL as a string
+        FileUtils.rm_rf pkg_svn.srcdir
+        importer = Import.svn File.join(svnroot, 'svn'), {}
+        importer.import(pkg_svn)
+        assert( File.exists?(File.join(pkg_svn.srcdir, 'test')) )
+
+        # Make an update
+        importer.import(pkg_svn)
+
+        # Make an update fail
+        FileUtils.rm_rf svnrepo
+        assert_raise(ImportException) { importer.import(pkg_svn) }
+
+        # Make a checkout fail
+        FileUtils.rm_rf pkg_svn.srcdir
+        assert_raise(ImportException) { importer.import(pkg_svn) }
+    end
+end
+ 

data/test/tc_subcommand.rb

@@ -1,12 +1,12 @@
+$LOAD_PATH.unshift File.expand_path('..', File.dirname(__FILE__))
+$LOAD_PATH << File.expand_path('../lib', File.dirname(__FILE__))
 require 'test/unit'
-require 'fileutils'
+require 'test/tools'
 require 'autobuild/options'
 require 'autobuild/config'
-require 'tmpdir'
-
-require 'test/conffile-generator'
 
-TESTDIR = File.join(File.dirname(__FILE__), 'dummy.yml')
+require 'tmpdir'
+require 'fileutils'
 
 class TC_Subcommand < Test::Unit::TestCase
 EXAMPLE_1 = <<EOF
@@ -22,7 +22,7 @@ EOF
     attr_reader :tmpdir
     attr_reader :source1, :source2
     def setup
-        conffile = ConffileGenerator.dummy
+        conffile = TestTools.build_config(binding, 'dummy')
         @tmpdir = File.dirname(conffile)
 
         options = Options.default
@@ -39,7 +39,7 @@ EOF
     end
 
     def teardown
-        ConffileGenerator.clean
+        TestTools.clean
     end
 
     def test_subcommand

data/test/tools.rb

@@ -0,0 +1,39 @@
+require 'tmpdir'
+require 'erb'
+require 'fileutils'
+
+module TestTools
+    DATADIR = File.join(File.dirname(__FILE__), 'data')
+
+    def self.tempdir
+        @tmpdir = File.join(Dir::tmpdir, "/autobuild-test-#{Process.uid}")
+        FileUtils.mkdir_p(@tmpdir, :mode => 0700)
+    end
+
+    def self.clean
+        FileUtils.rm_rf tempdir
+    end
+
+    def self.build_config(bind, template)
+        eval "basedir = '#{self.tempdir}'", bind
+        ryml = File.open(File.join(DATADIR, "#{template}.ryml")) { |f| f.readlines }.join('')
+        result = ERB.new(ryml).result(bind)
+
+        yml = File.join(tempdir, "#{template}.yml")
+        File.open(yml, 'w+') { |f| f.write(result) }
+        
+        return yml
+    end
+
+    def self.untar(file)
+        file = File.expand_path(file, DATADIR)
+        dir = self.tempdir
+        Dir.chdir(dir) do 
+            system("tar xf #{file}")
+        end
+
+        dir
+    end
+end
+
+

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: "0.3"
-date: 2005-09-13 00:00:00 +02:00
+  version: "0.4"
+date: 2005-09-27 00:00:00 +02:00
 summary: Rake-based utility to build and install multiple packages with dependencies
 require_paths: 
   - lib
@@ -36,10 +36,11 @@ files:
   - lib/autobuild/config.rb
   - lib/autobuild/environment.rb
   - lib/autobuild/importer.rb
-  - lib/autobuild/logging.rb
+  - lib/autobuild/reporting.rb
   - lib/autobuild/package.rb
   - lib/autobuild/subcommand.rb
   - lib/autobuild/timestamps.rb
+  - lib/autobuild/exceptions.rb
   - lib/autobuild/options.rb
   - lib/autobuild/config-interpolator.rb
   - lib/autobuild/import/cvs.rb
@@ -53,9 +54,10 @@ test_files:
   - test/tc_subcommand.rb
   - test/tc_config_interpolation.rb
   - test/tc_config.rb
-  - test/dummy.ryml
+  - test/tc_import.rb
   - test/base.rb
-  - test/conffile-generator.rb
+  - test/data
+  - test/tools.rb
 rdoc_options: 
   - "--title"
   - Autobuild

data/lib/autobuild/logging.rb

@@ -1,105 +0,0 @@
-require 'rmail'
-require 'rmail/serialize'
-require 'net/smtp'
-require 'socket'
-
-class SubcommandFailed < Exception
-    attr_reader :target, :command, :logfile, :status
-    def initialize(target, command, logfile, status)
-        @target = target
-        @command = command
-        @logfile = logfile
-        @status = status
-    end
-end
-        
-class ConfigException < Exception
-    def mail?; false end
-end
-
-class ImportException < SubcommandFailed
-    def mail?; true end
-
-    def initialize(subcommand)
-        super(subcommand.target, subcommand.command, subcommand.logfile, subcommand.status)
-    end
-end
-class BuildException < SubcommandFailed
-    def mail?; true end
-
-    def initialize(subcommand)
-        super(subcommand.target, subcommand.command, subcommand.logfile, subcommand.status)
-    end
-end
-
-def success
-    message = "Build finished successfully at #{Time.now}"
-    puts message
-    send_mail("Build success", message) if $MAIL
-end
-
-def error(object, place)
-    if object.kind_of?(SubcommandFailed)
-        body = <<EOF
-#{place}: #{object.message}
-    command '#{object.command}' failed with status #{object.status}
-    see #{File.basename(object.logfile)} for details
-EOF
-
-        message = <<EOF
-#{place}: #{object.message}
-    command '#{object.command}' failed with status #{object.status}
-    see #{object.logfile} for details
-EOF
-    else
-        body = message = "#{place}: #{object.message}"
-    end
-
-    puts message
-    send_mail("Build failed", body) if $MAIL
-end
-
-module RMail
-    class Message
-        def add_file(path, content_type='text/plain')
-            part = RMail::Message.new
-            part.header.set('Content-Type', content_type)
-            part.header.set('Content-Disposition', 'attachment', 'filename' => File.basename(path))
-            part.body = ''
-            File.open(path) do |file|
-                part.body << file.readlines.join("\n")
-            end
-            self.add_part(part)
-        end
-    end
-end
-
-def send_mail(subject, body)
-    from = ($MAIL[:from] || "autobuild@#{Socket.gethostname}")
-    to = $MAIL[:to]
-    smtp = ($MAIL[:smtp]  || "localhost" )
-
-    mail = RMail::Message.new
-    mail.header.date = Time.now
-    mail.header.from = from
-    mail.header.to = to
-    mail.header.subject = subject
-
-    part = RMail::Message.new
-    part.header.set('Content-Type', 'text/plain')
-    part.body = body
-    mail.add_part(part)
-
-    # Attach log files
-    Dir.glob("#{$LOGDIR}/*.log") do |file|
-        mail.add_file(file)
-    end
-
-    # Send the mail
-    smtp = Net::SMTP.new(smtp, Integer($MAIL[:port] || 25))
-    smtp.start {
-        smtp.send_mail RMail::Serialize.write('', mail), from, to
-    }
-end
-
-

data/test/conffile-generator.rb

@@ -1,34 +0,0 @@
-require 'tmpdir'
-require 'erb'
-
-DATADIR = File.dirname(__FILE__)
-
-class ConffileGenerator
-    class << self
-        def tempdir
-            @tmpdir = Dir::tmpdir + "/autobuild-#{Process.uid}"
-            FileUtils.mkdir_p(@tmpdir, :mode => 0700)
-        end
-
-        def dummy(basedir = tempdir)
-            apply(binding, basedir, 'dummy')
-        end
-
-        def clean
-            FileUtils.rm_rf tempdir
-        end
-
-        private
-
-        def apply(binding, basedir, basename)
-            template = File.open(File.join(DATADIR, "#{basename}.ryml")) { |f| f.readlines }.join('')
-            result = ERB.new(template).result(binding)
-
-            yml = File.join(basedir, "#{basename}.yml")
-            File.open(yml, 'w+') { |f| f.write(result) }
-            
-            return yml
-        end
-    end
-end
-

data/test/dummy.ryml

@@ -1,24 +0,0 @@
-defines:
-    global_prefix: <%= "#{basedir}/prefix" %>
-    platform: B21R
-    buildname: i386-linux
-    mail: doudou@melix.net
-    nice: 0
-
-autobuild:
-    prefix: ${global_prefix}/build
-    srcdir: ${global_prefix}/src
-    clean_log: true
-    nice: $nice
-
-    mail:
-        to: $mail
-
-    environment:
-        PATH: [ /bin, /usr/bin, $global_prefix/$buildname/tools/bin ]
-        PKG_CONFIG_PATH: $global_prefix/$buildname/tools/lib/pkgconfig
-        LD_LIBRARY_PATH:
-
-programs:
-    aclocal: aclocal-1.9
-