autobuild 1.12.3 → 1.13.0.pre1

data/lib/autobuild/import/cvs.rb

@@ -1,13 +1,13 @@
 module Autobuild
     class CVSImporter < Importer
-	# Creates a new importer which gets the module +name+ from the
-	# repository in +root+. The following values are allowed in +options+:
-	# [:cvsup] options to give to 'cvs up'. Default: -dP.
-	# [:cvsco] options to give to 'cvs co'. Default: -P.
-	#
-	# This importer uses the 'cvs' tool to perform the import. It defaults
-	# to 'cvs' and can be configured by doing 
-	#   Autobuild.programs['cvs'] = 'my_cvs_tool'
+        # Creates a new importer which gets the module +name+ from the
+        # repository in +root+. The following values are allowed in +options+:
+        # [:cvsup] options to give to 'cvs up'. Default: -dP.
+        # [:cvsco] options to give to 'cvs co'. Default: -P.
+        #
+        # This importer uses the 'cvs' tool to perform the import. It defaults
+        # to 'cvs' and can be configured by doing 
+        #   Autobuild.programs['cvs'] = 'my_cvs_tool'
         def initialize(root_name, options = {})
             cvsopts, common = Kernel.filter_options options, :module => nil, :cvsup => '-dP', :cvsco => '-P'
             @root   = root_name
@@ -23,12 +23,12 @@ def initialize(root_name, options = {})
             super(common.merge(repository_id: "cvs:#{@root}:#{@module}"))
         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
+        # 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
+        # Returns the module to get
         def modulename; @module end
 
         private

data/lib/autobuild/import/darcs.rb

@@ -4,20 +4,20 @@
 
 module Autobuild
     class DarcsImporter < Importer
-	# Creates a new importer which gets the source from the Darcs repository
-	# +source+ # The following values are allowed in +options+:
-	# [:get] options to give to 'darcs get'.
-	# [:pull] options to give to 'darcs pull'.
-	#
-	# This importer uses the 'darcs' tool to perform the import. It defaults
-	# to 'darcs' and can be configured by doing 
-	#   Autobuild.programs['darcs'] = 'my_darcs_tool'
+        # Creates a new importer which gets the source from the Darcs repository
+        # +source+ # The following values are allowed in +options+:
+        # [:get] options to give to 'darcs get'.
+        # [:pull] options to give to 'darcs pull'.
+        #
+        # This importer uses the 'darcs' tool to perform the import. It defaults
+        # to 'darcs' and can be configured by doing 
+        #   Autobuild.programs['darcs'] = 'my_darcs_tool'
         def initialize(source, options = {})
             @source   = source
             @program  = Autobuild.tool('darcs')
             super(options.merge(repository_id: source))
-	    @pull = [*options[:pull]]
-	    @get  = [*options[:get]]
+            @pull = [*options[:pull]]
+            @get  = [*options[:get]]
         end
         
         private
@@ -27,24 +27,24 @@ def update(package, options = Hash.new) # :nodoc:
                 package.warn "%s: the darcs importer does not support local updates, skipping"
                 return false
             end
-	    if !File.directory?( File.join(package.srcdir, '_darcs') )
-		raise ConfigException.new(package, 'import'),
+            if !File.directory?( File.join(package.srcdir, '_darcs') )
+                raise ConfigException.new(package, 'import'),
                     "#{package.srcdir} is not a Darcs repository"
-	    end
+            end
 
-	    package.run(:import, @program, 
-	       'pull', '--all', "--repodir=#{package.srcdir}", '--set-scripts-executable', @source, *@pull, retry: true)
+            package.run(:import, @program, 
+               'pull', '--all', "--repodir=#{package.srcdir}", '--set-scripts-executable', @source, *@pull, retry: true)
             true # no easy to know if package was updated, keep previous behavior
         end
 
         def checkout(package, options = Hash.new) # :nodoc:
-	    basedir = File.dirname(package.srcdir)
-	    unless File.directory?(basedir)
-		FileUtils.mkdir_p(basedir)
-	    end
+            basedir = File.dirname(package.srcdir)
+            unless File.directory?(basedir)
+                FileUtils.mkdir_p(basedir)
+            end
 
-	    package.run(:import, @program, 
-	       'get', '--set-scripts-executable', @source, package.srcdir, *@get, retry: true)
+            package.run(:import, @program, 
+               'get', '--set-scripts-executable', @source, package.srcdir, *@get, retry: true)
         end
     end
 

data/lib/autobuild/import/git.rb

@@ -84,7 +84,7 @@ def self.at_least_version(*version)
         # This importer uses the 'git' tool to perform the import. It defaults
         # to 'git' and can be configured by doing 
         #
-	#   Autobuild.programs['git'] = 'my_git_tool'
+        #   Autobuild.programs['git'] = 'my_git_tool'
         #
         # @param [String] branch deprecated, use the 'branch' named option
         #   instead
@@ -529,20 +529,18 @@ def fetch_remote(package, options = Hash.new)
 
             # Now get the actual commit ID from the FETCH_HEAD file, and
             # return it
-            commit_id = if File.readable?( File.join(git_dir, 'FETCH_HEAD') )
-                fetch_commit = File.readlines( File.join(git_dir, 'FETCH_HEAD') ).
-                    delete_if { |l| l =~ /not-for-merge/ }
-                if !fetch_commit.empty?
-                    fetch_commit.first.split(/\s+/).first
+            if File.readable?( File.join(git_dir, 'FETCH_HEAD') )
+                fetched_commits = File.readlines( File.join(git_dir, 'FETCH_HEAD') ).
+                    find_all { |l| l !~ /not-for-merge/ }.
+                    map { |line| line.split(/\s+/).first }
+                refspec.zip(fetched_commits).each do |refspec, commit_id|
+                    if refspec =~ /^refs\/heads\/(.*)$/
+                        run_git_bare(package, 'update-ref', "-m", "updated by autobuild", "refs/remotes/#{remote_name}/#{$1}", commit_id)
+                    end
                 end
-            end
 
-            # Update the remote tag if needs be
-            if (options[:refspec] == tag) && commit_id
-                run_git_bare(package, 'update-ref', "-m", "updated by autobuild", "refs/remotes/#{remote_name}/#{remote_branch}", commit_id)
+                fetched_commits.first
             end
-
-            commit_id
         end
 
         # @api private
@@ -997,46 +995,46 @@ def update(package, options = Hash.new)
             pinned_state, target_commit, fetch_commit =
                 determine_target_state(package, only_local: only_local)
 
-            # If we are tracking a commit/tag, just check it out and return
-            if !has_local_branch?(package)
-                package.message "%%s: checking out branch %s" % [local_branch]
-                run_git(package, 'checkout', '-b', local_branch, target_commit)
-                return false
-            end
-
-            if !on_local_branch?(package)
-                package.message "%%s: switching to branch %s" % [local_branch]
-                run_git(package, 'checkout', local_branch)
-            end
+            did_change_branch = ensure_on_local_branch(package, target_commit)
 
             # Check whether we are already at the requested state
-            if pinned_state
-                current_head = rev_parse(package, 'HEAD')
-                if reset
-                    if current_head == pinned_state
-                        return false
-                    end
-                elsif commit_present_in?(package, pinned_state, current_head)
-                    return false
-                elsif merge_if_simple(package, pinned_state)
-                    return true
+            pin_is_uptodate, pin_did_merge =
+                if pinned_state
+                    handle_pinned_state(package, pinned_state, reset: reset)
                 end
-            end
 
-            did_update = false
-            fetch_commit ||= current_remote_commit(
-                package, only_local: only_local, refspec: [remote_branch, tag])
-            if reset
-                did_update = reset_head_to_commit(package, target_commit, fetch_commit, force: (reset == :force))
-            else
-                did_update = merge_if_simple(package, target_commit)
+            unless pin_is_uptodate
+                fetch_commit ||= current_remote_commit(
+                    package, only_local: only_local, refspec: [remote_branch, tag])
+                did_update =
+                    if reset
+                        reset_head_to_commit(package, target_commit, fetch_commit,
+                             force: (reset == :force))
+                    else
+                        merge_if_simple(package, target_commit)
+                    end
             end
 
-            if with_submodules?
+            if !only_local && with_submodules?
                 run_git(package, "submodule", "update", '--init')
                 did_update = true
             end
-            did_update
+
+            did_update || pin_did_merge || did_change_branch
+        end
+
+        private def ensure_on_local_branch(package, target_commit)
+            if !has_local_branch?(package)
+                package.message "%%s: checking out branch %s" % [local_branch]
+                run_git(package, 'checkout', '-b', local_branch, target_commit)
+                true
+            elsif !on_local_branch?(package)
+                package.message "%%s: switching to branch %s" % [local_branch]
+                run_git(package, 'checkout', local_branch)
+                true
+            else
+                false
+            end
         end
 
         # @api private
@@ -1052,6 +1050,17 @@ def merge_if_simple(package, target_commit)
             false
         end
 
+        private def handle_pinned_state(package, pinned_state, reset: false)
+            current_head = rev_parse(package, 'HEAD')
+            if reset
+                [current_head == pinned_state, false]
+            elsif commit_present_in?(package, pinned_state, current_head)
+                [true, false]
+            elsif merge_if_simple(package, pinned_state)
+                [true, true]
+            end
+        end
+
         def each_alternate_path(package)
             return enum_for(__method__, package) if !block_given?
 
@@ -1088,6 +1097,9 @@ def checkout(package, options = Hash.new)
 
             update_remotes_configuration(package)
             update(package, only_local: true, reset: true)
+            if with_submodules?
+                run_git(package, "submodule", "update", '--init')
+            end
         end
 
         # Changes the repository this importer is pointing to

data/lib/autobuild/import/hg.rb

@@ -11,7 +11,7 @@ class Hg < Importer
         # This importer uses the 'hg' tool to perform the
         # import. It defaults to 'hg' and can be configured by
         # doing 
-	#   Autobuild.programs['hg'] = 'my_git_tool'
+        #   Autobuild.programs['hg'] = 'my_git_tool'
         #
         # @param [String] repository the repository URL
         # @option options [String] :branch (default) the branch to track

data/lib/autobuild/import/svn.rb

@@ -4,14 +4,14 @@
 
 module Autobuild
     class SVN < Importer
-	# Creates an importer which gets the source for the Subversion URL +source+.
-	# The following options are allowed:
-	# [:svnup] options to give to 'svn up'
-	# [:svnco] options to give to 'svn co'
-	#
-	# This importer uses the 'svn' tool to perform the import. It defaults
-	# to 'svn' and can be configured by doing 
-	#   Autobuild.programs['svn'] = 'my_svn_tool'
+        # Creates an importer which gets the source for the Subversion URL +source+.
+        # The following options are allowed:
+        # [:svnup] options to give to 'svn up'
+        # [:svnco] options to give to 'svn co'
+        #
+        # This importer uses the 'svn' tool to perform the import. It defaults
+        # to 'svn' and can be configured by doing 
+        #   Autobuild.programs['svn'] = 'my_svn_tool'
         def initialize(svnroot, options = {})
             svnroot = [*svnroot].join("/")
             svnopts, common = Kernel.filter_options options,

data/lib/autobuild/importer.rb

@@ -328,6 +328,7 @@ def perform_update(package,only_local=false)
                           Autobuild.color('updated', :yellow)
                       end
 
+            did_update
         rescue Interrupt
             message = Autobuild.color('interrupted', :red)
             if last_error
@@ -368,6 +369,7 @@ def perform_update(package,only_local=false)
 
         patch(package)
         package.updated = true
+        did_update
     rescue Autobuild::Exception => e
         fallback(e, package, :import, package)
     end
@@ -454,7 +456,6 @@ def import(package, options = Hash.new)
                     if Autobuild.verbose
                         package.message "%s: not updating"
                     end
-                    return
                 end
             end
 
@@ -463,6 +464,7 @@ def import(package, options = Hash.new)
         else
             package.isolate_errors(mark_as_failed: true, ignore_errors: ignore_errors) do
                 perform_checkout(package, allow_interactive: options[:allow_interactive])
+                true
             end
         end
     end
@@ -564,7 +566,7 @@ def patch(package, patches = self.patches)
             patches.to_a.each do |new_patch, new_patch_level, content|
                 apply(package, new_patch, new_patch_level)
                 cur_patches << [new_patch, new_patch_level, content]
-	    end
+            end
         ensure
             save_patch_state(package, cur_patches)
         end

data/lib/autobuild/mail_reporter.rb

@@ -20,12 +20,12 @@ def default_mail
             "#{pwent.name}@#{Socket.gethostname}"
         end
         
-	attr_reader :from_email, :to_email, :smtp_hostname, :smtp_port, :subject, :only_errors
+        attr_reader :from_email, :to_email, :smtp_hostname, :smtp_port, :subject, :only_errors
         def initialize(config)
             @from_email = (config[:from] || default_mail)
             @to_email   = (config[:to]   || default_mail)
-	    @subject = (config[:subject] || "Build %result% on #{Socket.gethostname} at %time%")
-	    @only_errors = config[:only_errors]
+            @subject = (config[:subject] || "Build %result% on #{Socket.gethostname} at %time%")
+            @only_errors = config[:only_errors]
             @smtp_hostname = (config[:smtp] || "localhost" )
             @smtp_port = Integer(config[:port] || Socket.getservbyname('smtp'))
         end
@@ -37,9 +37,9 @@ def error(error)
         end
 
         def success
-	    unless only_errors
-		send_mail("success", Autobuild.post_success_message || "")
-	    end
+            unless only_errors
+                send_mail("success", Autobuild.post_success_message || "")
+            end
         end
 
         def send_mail(result, body = "")
@@ -47,9 +47,9 @@ def send_mail(result, body = "")
             mail.header.date = Time.now
             mail.header.from = from_email
             mail.header.subject = subject.
-		gsub('%result%', result).
-		gsub('%time%', Time.now.to_s).
-		gsub('%hostname%', Socket.gethostname)
+                gsub('%result%', result).
+                gsub('%time%', Time.now.to_s).
+                gsub('%hostname%', Socket.gethostname)
 
             part = RMail::Message.new
             part.header.set('Content-Type', 'text/plain')

data/lib/autobuild/package.rb

@@ -22,21 +22,21 @@ class << self
     # Finally, the build stage actually calls the package's build targets (of
     # the form "package_name-build", which will trigger the build if needed.
     class Package
-	@@packages = {}
-	@@provides = {}
-
-	# the package name
-	attr_reader     :name
-	# set the source directory. If a relative path is given,
-	# it is relative to Autobuild.srcdir. Defaults to #name
-	attr_writer     :srcdir
+        @@packages = {}
+        @@provides = {}
+
+        # the package name
+        attr_reader     :name
+        # set the source directory. If a relative path is given,
+        # it is relative to Autobuild.srcdir. Defaults to #name
+        attr_writer     :srcdir
         # set the importdir, this can be different than the sourcedir
         # if the source-root is in an subfolder of the package itself
         # then the importdir will be the root
         attr_writer     :importdir
-	# set the installation directory. If a relative path is given,
-	# it is relative to Autobuild.prefix. Defaults to ''
-	attr_writer :prefix
+        # set the installation directory. If a relative path is given,
+        # it is relative to Autobuild.prefix. Defaults to ''
+        attr_writer :prefix
         # Sets the log directory. If no value is set, the package will use
         # Autobuild.logdir
         attr_writer :logdir
@@ -45,17 +45,17 @@ class Package
         attr_reader :utilities
         # Whether {#apply_post_install} has been called
         def applied_post_install?; !!@applied_post_install end
-	
-	# 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
+        
+        # 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
 
         # Some statistics about the commands that have been run
         attr_reader :statistics
@@ -73,12 +73,12 @@ def add_stat(phase, duration)
             @statistics[phase] += duration
         end
 
-	# Absolute path to the source directory. See #srcdir=
-	def srcdir; File.expand_path(@srcdir || name, Autobuild.srcdir) end
-	# Absolute path to the import directory. See #importdir=
-	def importdir; File.expand_path(@importdir || srcdir, Autobuild.srcdir) end
-	# Absolute path to the installation directory. See #prefix=
-	def prefix; File.expand_path(@prefix || '', Autobuild.prefix) end
+        # Absolute path to the source directory. See #srcdir=
+        def srcdir; File.expand_path(@srcdir || name, Autobuild.srcdir) end
+        # Absolute path to the import directory. See #importdir=
+        def importdir; File.expand_path(@importdir || srcdir, Autobuild.srcdir) end
+        # Absolute path to the installation directory. See #prefix=
+        def prefix; File.expand_path(@prefix || '', Autobuild.prefix) end
         # Absolute path to the log directory for this package. See #logdir=
         def logdir
             if @logdir
@@ -88,11 +88,11 @@ def logdir
             end
         end
 
-	# The file which marks when the last sucessful install
-	# has finished. The path is absolute
-	#
-	# A package is sucessfully built when it is installed
-	def installstamp
+        # The file which marks when the last sucessful install
+        # has finished. The path is absolute
+        #
+        # A package is sucessfully built when it is installed
+        def installstamp
             File.join(logdir, "#{name}-#{STAMPFILE}")
         end
 
@@ -117,13 +117,13 @@ def update?
         # false.
         def updated?; !!@updated end
 
-	def initialize(spec = Hash.new)
+        def initialize(spec = Hash.new)
             @srcdir = @importdir = @logdir = @prefix = nil
             @updated = false
             @update = nil
             @failed = nil
-	    @dependencies   = Array.new
-	    @provides       = Array.new
+            @dependencies   = Array.new
+            @provides       = Array.new
             @parallel_build_level = nil
             @statistics     = Hash.new
             @failures = Array.new
@@ -133,52 +133,52 @@ def initialize(spec = Hash.new)
             @utilities = Hash.new
             @env = Array.new
 
-	    if Hash === spec
-		name, depends = spec.to_a.first
-	    else
-		name, depends = spec, nil
-	    end
+            if Hash === spec
+                name, depends = spec.to_a.first
+            else
+                name, depends = spec, nil
+            end
 
-	    name = name.to_s
-	    @name = name
-	    raise ConfigException, "package #{name} is already defined" if Autobuild::Package[name]
-	    @@packages[name] = self
+            name = name.to_s
+            @name = name
+            raise ConfigException, "package #{name} is already defined" if Autobuild::Package[name]
+            @@packages[name] = self
 
-	    # Call the config block (if any)
-	    yield(self) if block_given?
+            # Call the config block (if any)
+            yield(self) if block_given?
 
             self.doc_utility.source_dir ||= 'doc'
             self.doc_utility.target_dir ||= name
 
-	    # Define the default tasks
-	    task "#{name}-import" do
+            # Define the default tasks
+            task "#{name}-import" do
                 isolate_errors { import }
             end
-	    task :import => "#{name}-import"
+            task :import => "#{name}-import"
 
-	    # Define the prepare task
-	    task "#{name}-prepare" => "#{name}-import" do
+            # Define the prepare task
+            task "#{name}-prepare" => "#{name}-import" do
                 isolate_errors { prepare }
             end
-	    task :prepare => "#{name}-prepare"
+            task :prepare => "#{name}-prepare"
 
-	    task "#{name}-build"
-	    task :build => "#{name}-build"
+            task "#{name}-build"
+            task :build => "#{name}-build"
 
-	    task(name) do
-		Rake::Task["#{name}-import"].invoke
-		Rake::Task["#{name}-prepare"].invoke
-		Rake::Task["#{name}-build"].invoke
+            task(name) do
+                Rake::Task["#{name}-import"].invoke
+                Rake::Task["#{name}-prepare"].invoke
+                Rake::Task["#{name}-build"].invoke
                 if has_doc? && Autobuild.do_doc
                     Rake::Task["#{name}-doc"].invoke
                 end
-	    end
-	    task :default => name
-	    
+            end
+            task :default => name
+            
             # The dependencies will be declared in the import phase,  so save
             # them there for now
             @spec_dependencies = depends
-	end
+        end
 
         # Whether the package's source directory is present on disk
         def checked_out?
@@ -415,25 +415,26 @@ def isolate_errors(options = Hash.new)
         # be done there as well.
         #
         # (see Importer#import)
-	def import(options = Hash.new)
+        def import(options = Hash.new)
             if !options.respond_to?(:to_hash)
                 options = Hash[only_local: options]
             end
 
             if @importer
-                @importer.import(self, options)
+                result = @importer.import(self, options)
             elsif update?
                 message "%s: no importer defined, doing nothing"
             end
 
             # Add the dependencies declared in spec
             depends_on(*@spec_dependencies) if @spec_dependencies
+            result
         end
 
         # Create all the dependencies required to reconfigure and/or rebuild the
         # package when required. The package's build target is called
         # "package_name-build".
-	def prepare
+        def prepare
             super if defined? super
 
             stamps = dependencies.map { |p| Package[p].installstamp }
@@ -579,15 +580,15 @@ def install_doc; doc_utility.install end
         def doc_disabled; doc_utility.disabled end
         def has_doc?; doc_utility.has_task? end
 
-	def post_install(*args, &block)
-	    if args.empty?
-		@post_install_blocks << block
-	    elsif !block
-		@post_install_blocks << args
-	    else
-		raise ArgumentError, "cannot set both arguments and block"
-	    end
-	end
+        def post_install(*args, &block)
+            if args.empty?
+                @post_install_blocks << block
+            elsif !block
+                @post_install_blocks << args
+            else
+                raise ArgumentError, "cannot set both arguments and block"
+            end
+        end
 
         # Returns the name of all the packages +self+ depends on
         def all_dependencies(result = Set.new)
@@ -607,18 +608,18 @@ def depends_on?(package_name)
             @dependencies.include?(package_name)
         end
 
-	# This package depends on +packages+. It means that its build will
+        # This package depends on +packages+. It means that its build will
         # always be triggered after the packages listed in +packages+ are built
         # and installed.
-	def depends_on(*packages)
-	    packages.each do |p|
+        def depends_on(*packages)
+            packages.each do |p|
                 p = p.name if p.respond_to?(:name)
                 raise ArgumentError, "#{p.inspect} should be a string" if !p.respond_to? :to_str
-		p = p.to_str
-		next if p == name
-		unless pkg = Package[p]
-		    raise ConfigException.new(self), "package #{p}, listed as a dependency of #{self.name}, is not defined"
-		end
+                p = p.to_str
+                next if p == name
+                unless pkg = Package[p]
+                    raise ConfigException.new(self), "package #{p}, listed as a dependency of #{self.name}, is not defined"
+                end
 
                 next if @dependencies.include?(pkg.name)
 
@@ -626,52 +627,52 @@ def depends_on(*packages)
                     Autobuild.message "#{name} depends on #{pkg.name}"
                 end
 
-		task "#{name}-import"  => "#{pkg.name}-import"
-		task "#{name}-prepare" => "#{pkg.name}-prepare"
-		task "#{name}-build"   => "#{pkg.name}-build"
-		@dependencies << pkg.name
-	    end
-	end
+                task "#{name}-import"  => "#{pkg.name}-import"
+                task "#{name}-prepare" => "#{pkg.name}-prepare"
+                task "#{name}-build"   => "#{pkg.name}-build"
+                @dependencies << pkg.name
+            end
+        end
 
-	# Declare that this package provides +packages+. In effect, the names
+        # Declare that this package provides +packages+. In effect, the names
         # listed in +packages+ are aliases for this package.
-	def provides(*packages)
-	    packages.each do |p|
+        def provides(*packages)
+            packages.each do |p|
                 raise ArgumentError, "#{p.inspect} should be a string" if !p.respond_to? :to_str
-		p = p.to_str
-		next if p == name
+                p = p.to_str
+                next if p == name
                 next if @provides.include?(name)
 
-		@@provides[p] = self 
+                @@provides[p] = self 
 
                 if Autobuild.verbose
                     Autobuild.message "#{name} provides #{p}"
                 end
 
-		task p => name
-		task "#{p}-import" => "#{name}-import"
-		task "#{p}-prepare" => "#{name}-prepare"
-		task "#{p}-build" => "#{name}-build"
-		@provides << p
-	    end
-	end
-
-	# Iterates on all available packages
-	# if with_provides is true, includes the list
-	# of package aliases
-	def self.each(with_provides = false, &p)
+                task p => name
+                task "#{p}-import" => "#{name}-import"
+                task "#{p}-prepare" => "#{name}-prepare"
+                task "#{p}-build" => "#{name}-build"
+                @provides << p
+            end
+        end
+
+        # Iterates on all available packages
+        # if with_provides is true, includes the list
+        # of package aliases
+        def self.each(with_provides = false, &p)
             if !p
                 return enum_for(:each, with_provides)
             end
 
-	    @@packages.each(&p) 
-	    @@provides.each(&p) if with_provides
-	end
+            @@packages.each(&p) 
+            @@provides.each(&p) if with_provides
+        end
 
-	# Gets a package from its name
-	def self.[](name)
-	    @@packages[name.to_s] || @@provides[name.to_s]
-	end
+        # Gets a package from its name
+        def self.[](name)
+            @@packages[name.to_s] || @@provides[name.to_s]
+        end
 
         # Removes all package definitions
         def self.clear
@@ -761,11 +762,11 @@ def method_missing(m, *args, &block)
     end
 
     def self.package_set(spec)
-	spec.each do |name, packages|
-	    Autobuild::TARGETS.each do |target|
-		task "#{name}-#{target}" => packages.map { |dep| "#{dep}-#{target}" }
-	    end
-	end
+        spec.each do |name, packages|
+            Autobuild::TARGETS.each do |target|
+                task "#{name}-#{target}" => packages.map { |dep| "#{dep}-#{target}" }
+            end
+        end
     end
 end