lib/autoproj/autobuild.rb in autoproj-1.7.20 vs lib/autoproj/autobuild.rb in autoproj-1.7.21.b1

@@ -59,16 +59,16 @@
         # package
         def remove_obsolete_installed_orogen_package(name)
             post_install do
                 path = File.join(prefix, 'lib', 'pkgconfig')
                 Dir.glob(File.join(path, "#{name}-*.pc")) do |pcfile|
-                    Autoproj.progress "  removing obsolete file #{pcfile}", :bold
+                    Autoproj.message "  removing obsolete file #{pcfile}", :bold
                     FileUtils.rm_f pcfile
                 end
                 pcfile = File.join(path, "orogen-project-#{name}.pc")
                 if File.exists?(pcfile)
-                    Autoproj.progress "  removing obsolete file #{pcfile}", :bold
+                    Autoproj.message "  removing obsolete file #{pcfile}", :bold
                     FileUtils.rm_f pcfile
                 end
             end
         end
 
@@ -76,11 +76,11 @@
         # prefix
         def remove_obsolete_installed_file(*path)
             post_install do
                 path = File.join(prefix, *path)
                 if File.exists?(path)
-                    Autoproj.progress "  removing obsolete file #{path}", :bold
+                    Autoproj.message "  removing obsolete file #{path}", :bold
                     FileUtils.rm_f path
                 end
             end
         end
 
@@ -178,20 +178,20 @@
     # Subclass of Autobuild::Reporter, used to display a message when the build
     # finishes/fails.
     class Reporter < Autobuild::Reporter
         def error(error)
             error_lines = error.to_s.split("\n")
-            Autoproj.progress("Build failed", :bold, :red)
-            Autoproj.progress("#{error_lines.shift}", :bold, :red)
+            Autoproj.message("Build failed", :bold, :red)
+            Autoproj.message("#{error_lines.shift}", :bold, :red)
             error_lines.each do |line|
-                Autoproj.progress line
+                Autoproj.message line
             end
         end
         def success
-            Autoproj.progress("Build finished successfully at #{Time.now}", :bold, :green)
+            Autoproj.message("Build finished successfully at #{Time.now}", :bold, :green)
             if Autobuild.post_success_message
-                Autoproj.progress Autobuild.post_success_message
+                Autoproj.message Autobuild.post_success_message
             end
         end
     end
 
     @file_stack       = Array.new
@@ -450,33 +450,35 @@
         pkg.rake_setup_task = "default"
         pkg.rake_doc_task   = "redocs"
 
         # Set up code
         pkg.post_install do
-            Autobuild.progress "setting up Ruby package #{pkg.name}"
-            Autobuild.update_environment pkg.srcdir
-            # Add lib/ unconditionally, as we know that it is a ruby package.
-            # Autobuild will add it only if there is a .rb file in the directory
-            libdir = File.join(pkg.srcdir, 'lib')
-            if File.directory?(libdir)
-                Autobuild.env_add_path 'RUBYLIB', libdir
-            end
+            pkg.progress_start "setting up Ruby package %s" do
+                Autobuild.update_environment pkg.srcdir
+                # Add lib/ unconditionally, as we know that it is a ruby package.
+                # Autobuild will add it only if there is a .rb file in the directory
+                libdir = File.join(pkg.srcdir, 'lib')
+                if File.directory?(libdir)
+                    Autobuild.env_add_path 'RUBYLIB', libdir
+                end
 
-            if pkg.rake_setup_task && File.file?(File.join(pkg.srcdir, 'Rakefile'))
-                Autobuild::Subprocess.run pkg, 'post-install',
-                    'rake', pkg.rake_setup_task
+                if pkg.rake_setup_task && File.file?(File.join(pkg.srcdir, 'Rakefile'))
+                    Autobuild::Subprocess.run pkg, 'post-install',
+                        'rake', pkg.rake_setup_task, :working_directory => pkg.srcdir
+                end
             end
         end
 
         yield(pkg) if block_given?
 
         # Documentation code. Ignore if the user provided its own documentation
         # task, or disabled the documentation generation altogether by setting
         # rake_doc_task to nil
         if !pkg.has_doc? && pkg.rake_doc_task
             pkg.doc_task do
-                pkg.progress "generating documentation for %s"
-                Autobuild::Subprocess.run pkg, 'doc', 'rake', pkg.rake_doc_task
+                pkg.progress_start "generating documentation for %s" do
+                    Autobuild::Subprocess.run pkg, 'doc', 'rake', pkg.rake_doc_task, :working_directory => pkg.srcdir
+                end
             end
         end
     end
 end