autobuild 1.6.5 → 1.7.0.rc1

data/lib/autobuild/package.rb

@@ -267,10 +267,23 @@ module Autobuild
             task "#{name}-build" => installstamp
         end
 
-        def process_formatting_string(msg)
-            msg % [name]
-        rescue ArgumentError => e
-            msg
+        def process_formatting_string(msg, *prefix_style)
+            prefix, suffix = [], []
+            msg.split(" ").each do |token|
+                if token =~ /%s/
+                    suffix << token.gsub(/%s/, name)
+                elsif suffix.empty?
+                    prefix << token
+                else suffix << token
+                end
+            end
+            if suffix.empty?
+                return msg
+            elsif prefix_style.empty?
+                return (prefix + suffix).join(" ")
+            else
+                return [Autobuild.color(prefix.join(" "), *prefix_style), *suffix].join(" ")
+            end
         end
 
         # Display a progress message. %s in the string is replaced by the
@@ -295,7 +308,7 @@ module Autobuild
         end
 
         def progress_start(*args, &block)
-            args[0] = process_formatting_string(args[0])
+            args[0] = process_formatting_string(args[0], :bold)
             if args.last.kind_of?(Hash)
                 options, raw_options = Kernel.filter_options args.last, :done_message
                 if options[:done_message]
@@ -308,11 +321,14 @@ module Autobuild
         end
 
         def progress(*args)
-            args[0] = process_formatting_string(args[0])
+            args[0] = process_formatting_string(args[0], :bold)
             Autobuild.progress(self, *args)
         end
 
-        def progress_done
+        def progress_done(done_message = nil)
+            if done_message
+                progress(process_formatting_string(done_message))
+            end
             Autobuild.progress_done(self)
         end
 
@@ -363,6 +379,33 @@ module Autobuild
             end
         end
 
+        module TaskExtension
+            attr_accessor :package
+        end
+
+        def source_tree(*args, &block)
+            task = Autobuild.source_tree(*args, &block)
+            task.extend TaskExtension
+            task.package = self
+            task
+        end
+
+        # 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
+
+        # 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
+
         # 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
@@ -594,6 +637,25 @@ module Autobuild
         ensure
             @in_dir_stack.pop
         end
+
+        def disabled?
+            @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|
+                task "#{name}-#{phase}"
+                t = Rake::Task["#{name}-#{phase}"]
+                def t.needed?; false end
+                t.instance_variable_set :@already_invoked, true
+            end
+            task(installstamp)
+            t = Rake::Task[installstamp]
+            def t.needed?; false end
+            t.instance_variable_set :@already_invoked, true
+        end
     end
 
     def self.package_set(spec)

data/lib/autobuild/packages/autotools.rb

@@ -11,6 +11,10 @@ module Autobuild
         Autotools.new(opts, &proc)
     end
         
+    if Autobuild.macos?
+        Autobuild.programs['libtoolize'] = "glibtoolize"
+    end
+
     # 
     # ==== Handles autotools-based packages
     #
@@ -32,7 +36,7 @@ module Autobuild
         def initialize(options)
             @using = Hash.new
 	    @configureflags = []
-
+            
             super
         end
         
@@ -40,7 +44,7 @@ module Autobuild
         def with_doc(target = 'doc')
             task "#{name}-doc" => configurestamp
             doc_task do
-                progress_start "generating documentation for %s" 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)
                 end
                 yield if block_given?
@@ -220,7 +224,7 @@ module Autobuild
 
                     autodetect_needed_stages
 
-                    progress_start "generating build system for %s" do
+                    progress_start "generating autotools for %s", :done_message => 'generated autotools for %s' do
                         if using[:libtool]
                             Subprocess.run(self, 'configure', Autobuild.tool('libtoolize'), '--copy')
                         end
@@ -257,7 +261,7 @@ module Autobuild
                     command << "--prefix=#{prefix}"
                     command += Array[*configureflags]
                     
-                    progress_start "configuring build system for %s" do
+                    progress_start "configuring autotools for %s", :done_message => 'configured autotools for %s' do
                         Subprocess.run(self, 'configure', *command)
                     end
                 end
@@ -267,7 +271,7 @@ module Autobuild
         # Do the build in builddir
         def build
             in_dir(builddir) do
-                progress_start "building %s [progress not available]" do
+                progress_start "building %s [progress not available]", :done_message => 'built %s' do
                     if force_config_status
                         Subprocess.run(self, 'build', './config.status')
                     end
@@ -280,7 +284,7 @@ module Autobuild
         # Install the result in prefix
         def install
             in_dir(builddir) do
-                progress_start "installing %s" do
+                progress_start "installing %s", :done_message => 'installed %s' do
                     Subprocess.run(self, 'install', Autobuild.tool(:make), 'install')
                 end
             end

data/lib/autobuild/packages/cmake.rb

@@ -203,7 +203,7 @@ module Autobuild
         def with_doc(target = 'doc')
             doc_task do
                 in_dir(builddir) do
-                    progress_start "generating documentation for %s" do
+                    progress_start "generating documentation for %s", :done_message => 'generated documentation for %s' do
                         if internal_doxygen_mode?
                             run_doxygen
                         else
@@ -303,6 +303,11 @@ module Autobuild
 
                     command = [ "cmake", "-DCMAKE_INSTALL_PREFIX=#{prefix}", "-DCMAKE_MODULE_PATH=#{CMake.module_path.join(";")}" ]
 
+					if(RbConfig::CONFIG["host_os"] =~%r!(msdos|mswin|djgpp|mingw|[Ww]indows)!)
+						command << '-G' 
+						command << "MSYS Makefiles"
+					end
+					
                     defines.each do |name, value|
                         command << "-D#{name}=#{value}"
                     end
@@ -311,7 +316,7 @@ module Autobuild
                     end
                     command << srcdir
                     
-                    progress_start "configuring CMake build system for %s" do
+                    progress_start "configuring CMake for %s", :done_message => "configured CMake for %s" do
                         if full_reconfigures?
                             FileUtils.rm_f cmake_cache
                         end
@@ -324,14 +329,32 @@ module Autobuild
         # Do the build in builddir
         def build
             in_dir(builddir) do
-                progress_start "building %s", :done_message => "building %s (100%%)" do
+                progress_start "building %s", :done_message => "built %s" do
                     if always_reconfigure || !File.file?('Makefile')
                         Subprocess.run(self, 'build', Autobuild.tool(:cmake), '.')
                     end
 
                     Autobuild.make_subcommand(self, 'build') do |line|
                         if line =~ /\[\s+(\d+)%\]/
-                            progress "building %s (#{Integer($1)}%%)"
+                            progress "building %s (#{Integer($1)}%)"
+                        end
+                    end
+
+                    warning = String.new
+                    Autobuild.make_subcommand(self, 'build') do |line|
+                        iswarning = false
+                        if line =~ /\[\s*(\d+)%\]/
+                            progress "building %s (#{Integer($1)}%)"
+                        elsif (line =~
+/^(Linking)|^(Scanning)|^(Building)|^(Built)/) == nil
+                            warning += line
+                            iswarning = true
+                        end
+                        if(!iswarning && !warning.empty?)
+                            warning.split("\n").each do |l|
+                                message "%s: #{l}", :magenta
+                            end
+                            warning = ""
                         end
                     end
                 end
@@ -342,7 +365,7 @@ module Autobuild
         # Install the result in prefix
         def install
             in_dir(builddir) do
-                progress_start "installing %s" do
+                progress_start "installing %s", :done_message => 'installed %s' do
                     Subprocess.run(self, 'install', Autobuild.tool(:make), "-j#{parallel_build_level}", 'install')
                 end
             end

data/lib/autobuild/packages/genom.rb

@@ -100,10 +100,10 @@ module Autobuild
 		genom_pkg = PkgConfig.new('genom')
 
 		includedir = File.join(genom_pkg.includedir, 'genom')
-		Autobuild.source_tree includedir
+		source_tree includedir
 
 		canvasdir = File.join(genom_pkg.prefix, "share", "genom", genom_pkg.version);;
-		Autobuild.source_tree canvasdir
+		source_tree canvasdir
 
 		binary = File.join(genom_pkg.exec_prefix, "bin", "genom")
 		file binary
@@ -133,7 +133,7 @@ module Autobuild
             file genomstamp => srcdir do
                 isolate_errors do
                     in_dir(srcdir) do
-                        progress_start "generating GenoM files for %s" do
+                        progress_start "generating GenoM for %s", :done_message => 'generated GenoM for %s' do
                             Subprocess.run(self, 'genom', *cmdline)
                         end
                     end
@@ -146,7 +146,7 @@ module Autobuild
                     # configure does not depend on the .gen file
                     # since the generation takes care of rebuilding configure
                     # if .gen has changed
-                    progress_start "generating build system for %s" do
+                    progress_start "generating autotools for %s", :done_message => 'generated autotools for %s' do
                         in_dir(srcdir) { Subprocess.run(self, 'genom', File.expand_path('autogen',  srcdir)) }
                     end
                 end

data/lib/autobuild/packages/import.rb

@@ -23,7 +23,7 @@ module Autobuild
                 exclude << Regexp.new("^#{Regexp.quote(doc_dir)}")
             end
 
-            Autobuild.source_tree(srcdir) do |pkg|
+            source_tree(srcdir) do |pkg|
 		pkg.exclude.concat exclude
 		exclude.freeze
 	    end

data/lib/autobuild/packages/orogen.rb

@@ -206,7 +206,7 @@ module Autobuild
             # Find out where orogen is, and make sure the configurestamp depend
             # on it. Ignore if orogen is too old to have a --base-dir option
             if orogen_root = self.class.orogen_root
-                orogen_tree = Autobuild.source_tree(orogen_root)
+                orogen_tree = source_tree(orogen_root)
             end
 
             # Check if there is an orogen package registered. If it is the case,
@@ -222,7 +222,7 @@ module Autobuild
             # Cache the orogen file name
             @orogen_file ||= self.orogen_file
 
-            file genstamp => Autobuild.source_tree(srcdir) do
+            file genstamp => source_tree(srcdir) do
                 needs_regen = true
                 if File.file?(genstamp)
                     genstamp_mtime = File.stat(genstamp).mtime
@@ -333,7 +333,7 @@ module Autobuild
             needs_regen ||= (Rake::Task[Orogen.orogen_root].timestamp > Rake::Task[genstamp].timestamp)
 
             if needs_regen
-                progress_start "generating oroGen project %s" do
+                progress_start "generating oroGen %s", :done_message => 'generated oroGen %s' do
                     in_dir(srcdir) do
                         Subprocess.run self, 'orogen', guess_ruby_name, self.class.orogen_bin, *cmdline
                         File.open(genstamp, 'w') do |io|

data/lib/autobuild/parallel.rb

@@ -12,10 +12,6 @@ module Autobuild
 
         attr_reader :job_server
 
-        attr_reader :roots
-        attr_reader :tasks
-        attr_reader :reverse_dependencies
-
         class JobServer
             attr_reader :rio
             attr_reader :wio
@@ -40,49 +36,97 @@ module Autobuild
 
         end
 
-        def process_finished_task(task, processed, queue)
-            processed << task
-            reverse_dependencies[task].each do |candidate|
-                if candidate.prerequisite_tasks.all? { |t| processed.include?(t) }
-                    queue << candidate
-                end
-            end
-        end
-
-        def wait_for_worker_to_end(processed, queue)
+        def wait_for_worker_to_end(state)
             w = finished_workers.pop
             finished_task, error = w.last_result
             available_workers << w
             if error
                 if available_workers.size != workers.size
-                    Autobuild.message "got an error doing parallel processing, waiting for pending jobs to end"
+                    Autobuild.error "got an error doing parallel processing, waiting for pending jobs to end"
                 end
                 finish_pending_work
                 raise error
             end
 
-            process_finished_task(finished_task, processed, queue)
+            state.process_finished_task(finished_task)
         end
 
-        def discover_dependencies(t)
-            return if tasks.include?(t) # already discovered or being discovered
-            tasks << t
+        def discover_dependencies(all_tasks, reverse_dependencies, t)
+            return if all_tasks.include?(t) # already discovered or being discovered
+            all_tasks << t
 
             t.prerequisite_tasks.each do |dep_t|
                 reverse_dependencies[dep_t] << t
-                discover_dependencies(dep_t)
+                discover_dependencies(all_tasks, reverse_dependencies, dep_t)
+            end
+        end
+
+        class ProcessingState
+            attr_reader :reverse_dependencies
+            attr_reader :processed
+            attr_reader :started_packages
+            attr_reader :active_packages
+            attr_reader :queue
+
+            def initialize(reverse_dependencies, initial_queue = Array.new)
+                @reverse_dependencies = reverse_dependencies
+                @processed = Set.new
+                @active_packages = Set.new
+                @started_packages = Set.new
+                @queue = initial_queue.to_set
+            end
+
+            def find_task
+                possible_task = nil
+                queue.each do |task|
+                    if task.respond_to?(:package)
+                        if !active_packages.include?(task.package)
+                            if started_packages.include?(task.package)
+                                return task
+                            end
+                            possible_task ||= task
+                        end
+                    else possible_task ||= task
+                    end
+                end
+                possible_task
+            end
+
+            def pop
+                candidate = find_task
+                queue.delete(candidate)
+                candidate
+            end
+
+            def mark_as_active(pending_task)
+                if pending_task.respond_to?(:package)
+                    active_packages << pending_task.package
+                    started_packages << pending_task.package
+                end
+            end
+
+            def process_finished_task(task)
+                if task.respond_to?(:package)
+                    active_packages.delete(task.package)
+                end
+                processed << task
+                reverse_dependencies[task].each do |candidate|
+                    if candidate.prerequisite_tasks.all? { |t| processed.include?(t) }
+                        queue << candidate
+                    end
+                end
             end
         end
 
         # Invokes the provided tasks. Unlike the rake code, this is a toplevel
         # algorithm that does not use recursion
         def invoke_parallel(required_tasks)
-            @tasks = Set.new
-            @reverse_dependencies = Hash.new { |h, k| h[k] = Set.new }
+            tasks = Set.new
+            reverse_dependencies = Hash.new { |h, k| h[k] = Set.new }
             required_tasks.each do |t|
-                discover_dependencies(t)
+                discover_dependencies(tasks, reverse_dependencies, t)
             end
-            @roots = tasks.find_all { |t| t.prerequisite_tasks.empty? }.to_set
+            roots = tasks.find_all { |t| t.prerequisite_tasks.empty? }.to_set
             
             # Build a reverse dependency graph (i.e. a mapping from a task to
             # the tasks that depend on it)
@@ -94,25 +138,25 @@ module Autobuild
             # The queue is the set of tasks for which all prerequisites have
             # been successfully executed (or where not needed). I.e. it is the
             # set of tasks that can be queued for execution.
-            queue = roots.to_a
-            processed = Set.new
+            state = ProcessingState.new(reverse_dependencies, roots.to_a)
             while true
-                if queue.empty?
+                pending_task = state.pop
+                if !pending_task
                     # If we have pending workers, wait for one to be finished
                     # until either they are all finished or the queue is not
                     # empty anymore
-                    while queue.empty? && available_workers.size != workers.size
-                        wait_for_worker_to_end(processed, queue)
+                    while !pending_task && available_workers.size != workers.size
+                        wait_for_worker_to_end(state)
+                        pending_task = state.pop
                     end
 
-                    if queue.empty? && available_workers.size == workers.size
+                    if !pending_task && available_workers.size == workers.size
                         break
                     end
                 end
 
-                pending_task = queue.pop
                 if pending_task.instance_variable_get(:@already_invoked) || !pending_task.needed?
-                    process_finished_task(pending_task, processed, queue)
+                    state.process_finished_task(pending_task)
                     next
                 end
 
@@ -120,7 +164,7 @@ module Autobuild
                 job_server.get
 
                 while !finished_workers.empty?
-                    wait_for_worker_to_end(processed, queue)
+                    wait_for_worker_to_end(state)
                 end
 
                 # We do have a job server token, so we are allowed to allocate a
@@ -132,10 +176,11 @@ module Autobuild
                 end
 
                 worker = available_workers.pop
+                state.mark_as_active(pending_task)
                 worker.queue(pending_task)
             end
 
-            if processed.size != tasks.size
+            if state.processed.size != tasks.size
                 with_cycle = tasks.to_set
                 raise "cycle in task graph: #{with_cycle.map(&:name).sort.join(", ")}"
             end