autobuild 1.7.10 → 1.7.11.rc1

data/lib/autobuild/import/hg.rb

@@ -44,7 +44,11 @@ module Autobuild
             end
         end
 
-        def update(package)
+        def update(package,only_local=false)
+            if only_local
+                Autobuild.warn "The importer #{self.class} does not support local updates, skipping #{self}"
+                return
+            end
             validate_importdir(package)
             Dir.chdir(package.importdir) do
                 Subprocess.run(package, :import, Autobuild.tool('hg'), 'pull', repository)

data/lib/autobuild/import/svn.rb

@@ -35,7 +35,11 @@ module Autobuild
 
         private
 
-        def update(package) # :nodoc:
+        def update(package,only_local=false) # :nodoc:
+            if only_local
+                Autobuild.warn "The importer #{self.class} does not support local updates, skipping #{self}"
+                return
+            end
             Dir.chdir(package.importdir) do
 		old_lang, ENV['LC_ALL'] = ENV['LC_ALL'], 'C'
                 svninfo = []

data/lib/autobuild/importer.rb

@@ -119,7 +119,7 @@ class Importer
         end
     end
 
-    def perform_update(package)
+    def perform_update(package,only_local=false)
         cur_patches    = currently_applied_patches(package)
         needed_patches = self.patches
         if cur_patches.map(&:last) != needed_patches.map(&:last)
@@ -129,7 +129,7 @@ class Importer
         retry_count = 0
         package.progress_start "updating %s"
         begin
-            update(package)
+            update(package,only_local)
         rescue Interrupt
             raise
         rescue ::Exception => original_error
@@ -146,7 +146,7 @@ class Importer
                 package.message "update failed and some patches are applied, retrying after removing all patches first"
                 begin
                     patch(package, [])
-                    return perform_update(package)
+                    return perform_update(package,only_local)
                 rescue Interrupt
                     raise
                 rescue ::Exception
@@ -204,12 +204,12 @@ class Importer
     end
 
     # Performs the import of +package+
-    def import(package)
+    def import(package,only_local = false)
         importdir = package.importdir
         if File.directory?(importdir)
             package.isolate_errors(false) do
                 if package.update?
-                    perform_update(package)
+                    perform_update(package,only_local)
                 else
                     if Autobuild.verbose
                         package.message "%s: not updating"

data/lib/autobuild/package.rb

@@ -1,7 +1,3 @@
-require 'autobuild/timestamps'
-require 'autobuild/environment'
-require 'autobuild/subcommand'
-
 module Autobuild
     TARGETS = %w{import prepare build}
 
@@ -63,6 +59,9 @@ module Autobuild
         # Sets the log directory. If no value is set, the package will use
         # Autobuild.logdir
         attr_writer :logdir
+        # The set of utilities attached to this package
+        # @return [{String=>Utility}]
+        attr_reader :utilities
 	
 	# Sets importer object for this package. Defined for backwards compatibility.
 	# Use the #importer attribute instead
@@ -135,6 +134,7 @@ module Autobuild
             @failures = Array.new
             @post_install_blocks = Array.new
             @in_dir_stack = Array.new
+            @utilities = Hash.new
 
 	    if Hash === spec
 		name, depends = spec.to_a.first
@@ -150,8 +150,8 @@ module Autobuild
 	    # Call the config block (if any)
 	    yield(self) if block_given?
 
-            @doc_dir        ||= 'doc'
-            @doc_target_dir ||= name
+            self.doc_utility.source_dir ||= 'doc'
+            self.doc_utility.target_dir ||= name
 
 	    # Define the default tasks
 	    task "#{name}-import" do
@@ -260,9 +260,9 @@ module Autobuild
         # Call the importer if there is one. Autodetection of "provides" should
         # be done there as well. See the documentation of Autobuild::Package for
         # more information.
-	def import
+	def import(only_local=false)
             if @importer
-                @importer.import(self)
+                @importer.import(self,only_local)
             elsif Autobuild.do_update
                 message "%s: no importer defined, doing nothing"
             end
@@ -377,34 +377,6 @@ module Autobuild
             Autobuild::Subprocess.run(self, *args, &block)
         end
 
-        # Directory in which the documentation target will have generated the
-        # documentation (if any). The interpretation of relative directories
-        # is package-specific. The default implementation interpret them
-        # as relative to the source directory, but packages like CMake will
-        # interpret them as relative to their build directories.
-        attr_writer :doc_dir
-
-        # Absolute path to where documentation is generated. Returns nil if the
-        # doc_dir attribute is not set.
-        def doc_dir
-            if @doc_dir
-                File.expand_path(@doc_dir, srcdir)
-            end
-        end
-
-        # Directory in which the documentation target should install the
-        # documentation. If it is relative, it is interpreted as relative to
-        # the documentation prefix directory (Autobuild.doc_prefix)
-        attr_writer :doc_target_dir
-
-        # Absolute path to where documentation has to be installed. Returns nil
-        # if the doc_target_dir attribute is not set.
-        def doc_target_dir
-            if @doc_target_dir
-                File.expand_path(@doc_target_dir, File.expand_path(Autobuild.doc_prefix || '.',  prefix))
-            end
-        end
-
         module TaskExtension
             attr_accessor :package
         end
@@ -432,101 +404,44 @@ module Autobuild
             task
         end
 
-        # Defines a documentation generation task. The documentation is first
-        # generated by the given block, and then installed. The local attribute
-        # #doc_dir defines where the documentation is generated by the
-        # package's build system, and the #doc_target_dir and
-        # Autobuild.doc_prefix attributes define where it should be installed.
-        #
-        # The block is invoked in the package's source directory
-        #
-        # In general, specific package types define a meaningful #with_doc
-        # method which calls this method internally.
-        def doc_task
-            @doc_task = task "#{name}-doc" => "#{name}-build" do
-                # This flag allows to disable documentation generation
-                # once doc_task has been called
-                if generates_doc?
-                    @installed_doc = false
-                    catch(:doc_disabled) do
-                        begin
-                            yield if block_given?
-
-                            unless @installed_doc
-                                install_doc
-                            end
-
-                        rescue Interrupt
-                            raise
-                        rescue ::Exception => e
-                            if Autobuild.doc_errors
-                                raise
-                            else
-                                warn "%s: failed to generate documentation"
-                                if e.kind_of?(SubcommandFailed)
-                                    warn "%s: see #{e.logfile} for more details"
-                                else
-                                    warn "%s: #{e.message}"
-                                end
-                            end
-                        end
-                    end
-                end
-            end
-
-            task :doc => "#{name}-doc"
-        end
-
-        # True if some documentation will be generated and false otherwise.
-        #
-        # This will return true only if a documentation task has been defined by
-        # calling #doc_task _and_ #disable_doc has not been called (or if
-        # #enable_doc has been called after the last call to #disable_doc).
-        def generates_doc?
-            if @doc_disabled
-                return false
-            else
-                return !!@doc_task
-            end
-        end
-
-        # Re-enables documentation generation after #disable_doc has been called
-        def enable_doc
-            @doc_disabled = false
+        module TaskExtension
+            attr_accessor :package
         end
 
-        # Disables any documentation generation, regardless of whether doc_task
-        # has been called or not.
-        def disable_doc
-            @doc_disabled = true
+        def source_tree(*args, &block)
+            task = Autobuild.source_tree(*args, &block)
+            task.extend TaskExtension
+            task.package = self
+            task
         end
 
-        def install_doc
-            if !File.directory?(self.doc_dir)
-                raise "#{self.doc_dir} was expected to be a directory, but it is not. Check the package's documentation generation, the generated documentation should be in #{self.doc_dir}"
-            end
-
-            doc_target_dir  = self.doc_target_dir
-            doc_dir         = self.doc_dir
-            FileUtils.rm_rf   doc_target_dir
-            FileUtils.mkdir_p File.dirname(doc_target_dir)
-            FileUtils.cp_r    doc_dir, doc_target_dir
-
-            @installed_doc = true
+        # Calls Rake to define a file task and then extends it with TaskExtension
+        def file(*args, &block)
+            task = super
+            task.extend TaskExtension
+            task.package = self
+            task
         end
 
-        # Can be called in the doc_task implementation to announce that the
-        # documentation is to be disabled for that package. This is mainly used
-        # when a runtime check is necessary to know if a package has
-        # documentation or not.
-        def doc_disabled
-            throw :doc_disabled
+        # Calls Rake to define a plain task and then extends it with TaskExtension
+        def task(*args, &block)
+            task = super
+            task.extend TaskExtension
+            task.package = self
+            task
         end
 
-        # True if a documentation task is defined for this package
-        def has_doc?
-            !!Rake.application.lookup("#{name}-doc")
-        end
+        def doc_dir=(value); doc_utility.source_dir = value end
+        def doc_dir; doc_utility.source_dir end
+        def doc_target_dir=(value); doc_utility.target_dir = value end
+        def doc_target_dir; doc_utility.target_dir end
+        def doc_task(&block); doc_utility.task(&block) end
+        def generates_doc?; doc_utility.enabled? end
+        def enable_doc; doc_utility.enabled = true end
+        def disable_doc; doc_utility.enabled = false end
+        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?
@@ -668,19 +583,43 @@ module Autobuild
             @disabled
         end
 
-        # Make sure that this package will be ignored in the build
-        def disable
-            @disabled = true
-            %w{import prepare build doc}.each do |phase|
+        # Makes sure that the specified phases of this package will be no-ops
+        def disable_phases(*phases)
+            phases.each do |phase|
                 task "#{name}-#{phase}"
                 t = Rake::Task["#{name}-#{phase}"]
-                def t.needed?; false end
-                t.instance_variable_set :@already_invoked, true
+                t.disable!
             end
+        end
+
+        # Make sure that this package will be ignored in the build
+        def disable(phases = Autobuild.all_phases)
+            @disabled = true
+            disable_phases(*phases)
             task(installstamp)
             t = Rake::Task[installstamp]
-            def t.needed?; false end
-            t.instance_variable_set :@already_invoked, true
+            t.disable!
+        end
+
+        def utility(utility_name)
+            utilities[utility_name] ||= Autobuild.create_utility(utility_name, self)
+        end
+
+
+        def method_missing(m, *args, &block)
+            case m.to_s
+            when /(\w+)_utility$/
+                utility_name = $1
+                if !args.empty?
+                    raise ArgumentError, "expected 0 arguments and got #{args.size}"
+                end
+                begin
+                    return utility(utility_name)
+                rescue ArgumentError => e
+                    raise NoMethodError.new(m), e.message, e.backtrace
+                end
+            end
+            super
         end
     end
 

data/lib/autobuild/packages/autotools.rb

@@ -28,29 +28,48 @@ module Autobuild
     class Autotools < Configurable
         attr_accessor   :using
         attr_accessor   :configureflags
+        attr_accessor   :aclocal_flags
+        attr_accessor   :autoheader_flags
+        attr_accessor   :autoconf_flags
+        attr_accessor   :automake_flags
 
         @builddir = 'build'
-        
+
         def configurestamp; "#{builddir}/config.status" end
 
         def initialize(options)
             @using = Hash.new
 	    @configureflags = []
-            
+            @aclocal_flags    = Array.new
+            @autoheader_flags = Array.new
+            @autoconf_flags   = Array.new
+            @automake_flags   = Array.new
+
             super
         end
-        
-        # Declare that the given target can be used to generate documentation
-        def with_doc(target = 'doc')
-            task "#{name}-doc" => configurestamp
-            doc_task do
-                progress_start "generating documentation for %s", :done_message => 'generated_documentation for %s' do
-                    Subprocess.run(self, 'doc', Autobuild.tool(:make), "-j#{parallel_build_level}", target, :working_directory => builddir)
+
+        def common_utility_handling(utility, target)
+            utility.task do
+                progress_start "generating documentation for %s", :done_message => 'generated documentation for %s' do
+                    if internal_doxygen_mode?
+                        run_doxygen
+                    else
+                        Subprocess.run(self, utility.name, Autobuild.tool(:make), "-j#{parallel_build_level}", target, :working_directory => builddir)
+                    end
+                    yield if block_given?
                 end
-                yield if block_given?
             end
         end
 
+        # Declare that the given target can be used to generate documentation
+        def with_doc(target = 'doc', &block)
+            common_utility_handling(doc_utility, target, &block)
+        end
+
+        def with_tests(target = 'test')
+            common_utility_handling(test_utility, target, &block)
+        end
+
 	# Overrides the default behaviour w.r.t. autotools script generation
 	#
 	# Use it like that:
@@ -114,7 +133,7 @@ module Autobuild
             FileUtils.rm_f configurestamp
         end
 
-        def import
+        def import(only_local=false)
             # We force a regen after the first checkout. The issue is that
             # autotools is less robust than it should, and very often it is
             # better to generate the build system for the system on which we
@@ -247,7 +266,7 @@ module Autobuild
                                                    else; Autobuild.tool(tool)
                                                    end
 
-                                    Subprocess.run(self, 'configure', tool_program)
+                                    Subprocess.run(self, 'configure', tool_program, *send("#{tool}_flags"))
                                 end
                             end
                         end
@@ -269,7 +288,7 @@ module Autobuild
                     end
                     command << "--prefix=#{prefix}"
                     command += Array[*configureflags]
-                    
+
                     progress_start "configuring autotools for %s", :done_message => 'configured autotools for %s' do
                         Subprocess.run(self, 'configure', *command)
                     end

data/lib/autobuild/packages/cmake.rb

@@ -199,22 +199,38 @@ module Autobuild
             Subprocess.run(self, 'doc', Autobuild.tool(:doxygen), doxyfile)
         end
 
-        # Declare that the given target can be used to generate documentation
-        def with_doc(target = 'doc')
-            doc_task do
-                in_dir(builddir) do
-                    progress_start "generating documentation for %s", :done_message => 'generated documentation for %s' do
-                        if internal_doxygen_mode?
-                            run_doxygen
-                        else
-                            Subprocess.run(self, 'doc', Autobuild.tool(:make), "-j#{parallel_build_level}", target)
-                        end
-                        yield if block_given?
+        def common_utility_handling(utility, target, start_msg, done_msg)
+            utility.task do
+                progress_start start_msg, :done_message => done_msg do
+                    if internal_doxygen_mode?
+                        run_doxygen
+                    else
+                        Subprocess.run(self, utility.name,
+                                       Autobuild.tool(:make),
+                                       "-j#{parallel_build_level}",
+                                       target,
+                                       :working_directory => builddir)
                     end
+                    yield if block_given?
                 end
             end
         end
 
+        # Declare that the given target can be used to generate documentation
+        def with_doc(target = 'doc', &block)
+            common_utility_handling(
+                doc_utility, target,
+                "generating documentation for %s",
+                "generated documentation for %s", &block)
+        end
+
+        def with_tests(target = 'test', &block)
+            common_utility_handling(
+                test_utility, target,
+                "running tests for %s",
+                "successfully ran tests for %s", &block)
+        end
+
         CMAKE_EQVS = {
             'ON' => 'ON',
             'YES' => 'ON',
@@ -235,7 +251,7 @@ module Autobuild
             end
         end
 
-        def import
+        def import(only_local=false)
             super
 
             Dir.glob(File.join(srcdir, "*.pc.in")) do |file|
@@ -245,10 +261,6 @@ module Autobuild
         end
 
         def prepare
-            if !internal_doxygen_mode? && has_doc?
-                task "#{name}-doc" => configurestamp
-            end
-
             # A failed initial CMake configuration leaves a CMakeCache.txt file,
             # but no Makefile.
             #
@@ -257,6 +269,8 @@ module Autobuild
                 FileUtils.rm_f cmake_cache
             end
 
+            doc_utility.source_ref_dir = builddir
+
             if File.exists?(cmake_cache)
                 all_defines = defines.dup
                 all_defines['CMAKE_INSTALL_PREFIX'] = prefix