autobuild 0.4 → 0.5

data/lib/autobuild/importer.rb

@@ -1,6 +1,6 @@
 require 'autobuild/exceptions'
 
-class Importer
+class Autobuild::Importer
     def initialize(options)
         @options = options
     end
@@ -22,7 +22,7 @@ class Importer
             begin
                 checkout(package)
                 patch(package)
-            rescue ImportException
+            rescue Autobuild::Exception
                 FileUtils.rm_rf package.srcdir
                 raise
             end
@@ -34,13 +34,13 @@ class Importer
     # We assume that package.srcdir already exists (checkout 
     # is supposed to have been called)
     def patchlist(package)
-        "#{package.srcdir}/autobuild-patches"
+        "#{package.srcdir}/patches-autobuild-stamp"
     end
 
     def call_patch(package, reverse, file)
         patch = ($PROGRAMS['patch'] || 'patch')
         Dir.chdir(package.srcdir) {
-            subcommand(package.target, 'patch', patch, '-p0', (reverse ? '-R' : nil), "<#{file}")
+            Subprocess.run(package.target, :patch, patch, '-p0', (reverse ? '-R' : nil), "<#{file}")
         }
     end
 
@@ -68,8 +68,6 @@ class Importer
                 apply(package, p) 
                 cur_patches << p
             }
-        rescue SubcommandFailed => e
-            raise ImportException.new(e), "can't patch #{package.target} (#{e.message})"
         ensure
             File.open(patchlist(package), 'w+') do |f|
                 f.write(cur_patches.join("\n"))

data/lib/autobuild/options.rb

@@ -1,15 +1,22 @@
-Options = Struct.new( :update, :nice,
-        :srcdir, :prefix, :builddir, :logdir, 
-        :verbose, :debug,
-        :daemonize, :use_http )
+module Autobuild
+    Options = Struct.new( :update, :nice,
+            :srcdir, :prefix, :builddir, :logdir, 
+            :verbose, :debug, :do_build,
+            :daemonize, :use_http )
 
-class Options
-    def self.default
-        default_values = { :update => true, :nice => 0,
-            :srcdir => nil, :prefix => nil, :builddir => nil, :logdir => nil,
-            :verbose => false, :debug => false,
-            :daemonize => false, :use_http => false }
-        Options.new default_values
+    class Options
+        def self.default
+            default_values = { :update => true, :nice => 0,
+                :srcdir => nil, :prefix => nil, :builddir => nil, :logdir => nil,
+                :verbose => false, :debug => false, :do_build => true,
+                :daemonize => false, :use_http => false }
+            
+            default_values.inject(Options.new) { |opt, defval|
+                k, v = *defval
+                opt[k] = v
+                opt
+            }
+        end
     end
 end
 

data/lib/autobuild/package.rb

@@ -2,7 +2,7 @@ require 'autobuild/timestamps'
 require 'autobuild/environment'
 require 'autobuild/subcommand'
 
-class Package
+class Autobuild::Package
     @@packages = {}
     @@provides = {}
 

data/lib/autobuild/packages/autotools.rb

@@ -3,92 +3,92 @@ require 'autobuild/environment'
 require 'autobuild/package'
 require 'autobuild/subcommand'
 
-## 
-# ==== Handles autotools-based packages
-#
-# == Used programs
-# - aclocal, autoheader, autoconf, automake
-#
-# == Available options
-# - aclocal (default: true if autoconf is enabled, false otherwise) run aclocal
-# - autoconf (default: autodetect) run autoconf. Will be enabled if there is 
-#   +configure.in+ or +configure.ac+ in the source directory
-# - autoheader (default: false) run autoheader
-# - automake (default: autodetect) run automake. Will run automake if there is a 
-#   +Makefile.am+ in the source directory
-# 
-class Autotools < Package
-    factory :autotools, self
-
-    attr_reader :builddir
-
-    DefaultOptions = {
-        :autoheader => false,
-        :aclocal => nil,
-        :autoconf => nil,
-        :automake => nil,
-        :builddir => 'build'
-    }
-
-    def buildstamp
-        "#{builddir}/#{target}-#{STAMPFILE}"
-    end
-
-    def initialize(target, options)
-        options = DefaultOptions.merge(options) { |key, old, new|
-            (new.nil? || (new.respond_to?(:empty) && new.empty?)) ? old : new
+module Autobuild
+    ## 
+    # ==== Handles autotools-based packages
+    #
+    # == Used programs
+    # - aclocal, autoheader, autoconf, automake
+    #
+    # == Available options
+    # - aclocal (default: true if autoconf is enabled, false otherwise) run aclocal
+    # - autoconf (default: autodetect) run autoconf. Will be enabled if there is 
+    #   +configure.in+ or +configure.ac+ in the source directory
+    # - autoheader (default: false) run autoheader
+    # - automake (default: autodetect) run automake. Will run automake if there is a 
+    #   +Makefile.am+ in the source directory
+    # 
+    class Autotools < Package
+        factory :autotools, self
+
+        attr_reader :builddir
+
+        DefaultOptions = {
+            :autoheader => false,
+            :aclocal => nil,
+            :autoconf => nil,
+            :automake => nil,
+            :builddir => 'build'
         }
-        super(target, options)
 
-        @builddir = options[:builddir]
-        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 buildstamp
+            "#{builddir}/#{target}-#{STAMPFILE}"
+        end
 
-    def prepare
-        regen_targets
+        def initialize(target, options)
+            options = DefaultOptions.merge(options) { |key, old, new|
+                (new.nil? || (new.respond_to?(:empty) && new.empty?)) ? old : new
+            }
+            super(target, options)
 
-        file "#{builddir}/config.status" => "#{srcdir}/configure" do
-            configure
+            @builddir = options[:builddir]
+            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
 
-        source_tree srcdir, builddir
-        file buildstamp => [ srcdir, "#{builddir}/config.status" ] do 
-            build
-        end
+        def prepare
+            regen_targets
 
-        if !dependencies.empty?
-            file buildstamp => dependencies
-            file srcdir => dependencies
-        end
+            file "#{builddir}/config.status" => "#{srcdir}/configure" do
+                configure
+            end
 
-        file installstamp => buildstamp do 
-            install
-            update_environment(prefix)
-        end
-        update_environment(prefix)
-    end
+            source_tree srcdir, builddir
+            file buildstamp => [ srcdir, "#{builddir}/config.status" ] do 
+                build
+            end
 
-    def regen_targets
-        conffile = "#{srcdir}/configure"
-        if File.exists?("#{conffile}.ac")
-            file conffile => [ "#{conffile}.ac" ]
-        elsif File.exists?("#{conffile}.in")
-            file conffile => [ "#{conffile}.in" ]
-        else
-            raise PackageException.new(target), "neither configure.ac nor configure.in present in #{srcdir}"
+            if !dependencies.empty?
+                file buildstamp => dependencies
+                file srcdir => dependencies
+            end
+
+            file installstamp => buildstamp do 
+                install
+                Autobuild.update_environment(prefix)
+            end
+            Autobuild.update_environment(prefix)
         end
-        file conffile do
-            Dir.chdir(srcdir) {
-                $PROGRAMS[:aclocal]     ||= 'aclocal'
-                $PROGRAMS[:autoconf]    ||= 'autoconf'
-                $PROGRAMS[:autoheader]  ||= 'autoheader'
-                $PROGRAMS[:automake]    ||= 'automake'
-
-                begin
+
+        def regen_targets
+            conffile = "#{srcdir}/configure"
+            if File.exists?("#{conffile}.ac")
+                file conffile => [ "#{conffile}.ac" ]
+            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'
+
                     if @options[:autogen]
-                        subcommand(target, 'configure', File.expand_path(@options[:autogen]))
+                        Subprocess.run(target, 'configure', File.expand_path(@options[:autogen]))
                     else
                         # Autodetect autoconf/aclocal/automake
                         if @options[:autoconf].nil?
@@ -101,59 +101,45 @@ class Autotools < Package
                             @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]
+                        Subprocess.run(target, 'configure', $PROGRAMS[:aclocal])    if @options[:aclocal]
+                        Subprocess.run(target, 'configure', $PROGRAMS[:autoconf])   if @options[:autoconf]
+                        Subprocess.run(target, 'configure', $PROGRAMS[:autoheader]) if @options[:autoheader]
+                        Subprocess.run(target, 'configure', $PROGRAMS[:automake])   if @options[:automake]
                     end
-                rescue SubcommandFailed => e
-                    raise BuildException.new(e), "failed to build the configure environment of #{target}"
-                end
-            }
-        end
-    end
-
-    def configure
-        if File.exists?(builddir) && !File.directory?(builddir)
-            raise ConfigException, "#{builddir} already exists but is not a directory"
+                }
+            end
         end
 
-        FileUtils.mkdir_p builddir if !File.directory?(builddir)
-        Dir.chdir(builddir) {
-            command = [ "#{srcdir}/configure", "--no-create", "--prefix=#{prefix}" ]
-            command |= @options[:configureflags].to_a
-            
-            begin
-                subcommand(target, 'configure', *command)
-            rescue SubcommandFailed => e
-                raise BuildException.new(e), "failed to configure #{target}"
+        def configure
+            if File.exists?(builddir) && !File.directory?(builddir)
+                raise ConfigException, "#{builddir} already exists but is not a directory"
             end
-        }
-    end
 
-    def build
-        Dir.chdir(builddir) {
-            begin
-                subcommand(target, 'build', './config.status')
+            FileUtils.mkdir_p builddir if !File.directory?(builddir)
+            Dir.chdir(builddir) {
+                command = [ "#{srcdir}/configure", "--no-create", "--prefix=#{prefix}" ]
+                command |= @options[:configureflags].to_a
+                
+                Subprocess.run(target, 'configure', *command)
+            }
+        end
+
+        def build
+            Dir.chdir(builddir) {
+                Subprocess.run(target, 'build', './config.status')
                 $PROGRAMS['make'] ||= 'make'
-                subcommand(target, 'build', $PROGRAMS['make'])
-            rescue SubcommandFailed => e
-                raise BuildException.new(e), "failed to build #{target}"
-            end
-        }
-        touch_stamp(buildstamp)
-    end
+                Subprocess.run(target, 'build', $PROGRAMS['make'])
+            }
+            touch_stamp(buildstamp)
+        end
 
-    def install
-        Dir.chdir(builddir) {
-            make = ($PROGRAMS['make'] or 'make')
-            begin
-                subcommand(target, 'install', make, 'install')
-            rescue SubcommandFailed => e
-                raise BuildException.new(e), "failed to install #{builddir}"
-            end
-        }
-        touch_stamp(installstamp)
+        def install
+            Dir.chdir(builddir) {
+                make = ($PROGRAMS['make'] or 'make')
+                Subprocess.run(target, 'install', make, 'install')
+            }
+            touch_stamp(installstamp)
+        end
     end
 end
 

data/lib/autobuild/packages/genom.rb

@@ -1,80 +1,74 @@
 require 'autobuild/packages/autotools'
 require 'open3'
 
-class GenomModule < Autotools
-    def prepare
-        super
-        get_requires
-        get_provides
-    end
-    def genomstamp; "#{srcdir}/.genom/genom-stamp" end
+module Autobuild
+    class GenomModule < Autotools
+        def prepare
+            super
+            get_requires
+            get_provides
+        end
+        def genomstamp; "#{srcdir}/.genom/genom-stamp" end
 
-    def cpp_options
-        @options[:genflags].to_a.find_all { |opt| opt =~ /^-D/ }
-    end
+        def cpp_options
+            @options[:genomflags].to_a.find_all { |opt| opt =~ /^-D/ }
+        end
 
-    def get_requires
-        cpp = ($PROGRAMS['cpp'] || 'cpp')
-        Open3.popen3("#{cpp} #{cpp_options.join(" ")} #{srcdir}/#{target}.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}"
-                end
-            }
+        def get_requires
+            cpp = ($PROGRAMS['cpp'] || 'cpp')
+            Open3.popen3("#{cpp} #{cpp_options.join(" ")} #{srcdir}/#{target}.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}"
+                    end
+                }
+            end
         end
-    end
 
-    def depends_on(name)
-        super
-        file genomstamp => Package.name2target(name)
-    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|
-                if line =~ /^\s*EXTRA_PKGCONFIG\s*=\s*"?([\w\-]+(?:\s+[\w\-]+)*)"?/
-                    $1.split(/\s+/).each { |pkg|
-                        provides pkg
-                    }
-                end
-            }
+        def get_provides
+            File.open("#{srcdir}/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
+                        }
+                    end
+                }
+            end
         end
-    end
-        
+            
 
-    def regen_targets
-        cmdline = [ 'genom', target ] | @options[:genflags].to_a
+        def regen_targets
+            cmdline = [ 'genom', target ] | @options[:genomflags].to_a
 
-        file buildstamp => genomstamp
-        file genomstamp => [ :genom, "#{srcdir}/#{target}.gen" ] do
-            Dir.chdir(srcdir) {
-                begin
-                    subcommand(target, 'genom', *cmdline)
-                rescue SubcommandFailed => e
-                    raise BuildException.new(e), "failed to generate module #{target}"
-                end
-            }
-        end
+            file buildstamp => genomstamp
+            file genomstamp => [ :genom, "#{srcdir}/#{target}.gen" ] do
+                Dir.chdir(srcdir) {
+                    Subprocess.run(target, 'genom', *cmdline)
+                }
+            end
 
-        acuser = "#{srcdir}/configure.ac.user"
-        if File.exists?(acuser)
-            file "#{srcdir}/configure" => acuser do
-                # configure does not depend on the .gen file
-                # since the generation takes care of rebuilding configure
-                # if .gen has changed
-                begin
-                    subcommand(target, 'genom', File.expand_path('autogen'))
-                rescue SubcommandFailed => e
-                    raise BuildException.new(e), "failed to generate module #{target}"
+            acuser = "#{srcdir}/configure.ac.user"
+            if File.exists?(acuser)
+                file "#{srcdir}/configure" => acuser do
+                    # configure does not depend on the .gen file
+                    # since the generation takes care of rebuilding configure
+                    # if .gen has changed
+                    Subprocess.run(target, 'genom', File.expand_path('autogen'))
                 end
             end
         end
-    end
 
-    factory :genom, self
+        factory :genom, self
+    end
 end