autobuild 1.4.3 → 1.4.4

data/Changes.txt

@@ -1,3 +1,6 @@
+== Version 1.4.4
+* minor bug fixes
+
 == Version 1.4.3
 * minor changes in how the shell environment is managed
 * update LD_LIBRARY_PATH when applicable

data/lib/autobuild.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.4.3" unless defined? Autobuild::VERSION
+    VERSION = "1.4.4" unless defined? Autobuild::VERSION
 end
 
 require 'autobuild/config'

data/lib/autobuild/import/cvs.rb

@@ -53,7 +53,7 @@ module Autobuild
 		if root != expected_root || mod != @module
 		    raise ConfigException, "checkout in #{package.srcdir} is from #{root}:#{mod}, was expecting #{expected_root}:#{@module}"
 		end
-                Subprocess.run(package.name, :import, @program, 'up', *@options_up)
+                Subprocess.run(package, :import, @program, 'up', *@options_up)
 	    end
         end
 
@@ -64,7 +64,7 @@ module Autobuild
             FileUtils.mkdir_p(head) if !File.directory?(head)
             Dir.chdir(head) do
                 options = [ @program, '-d', cvsroot, 'co', '-d', tail ] + @options_co + [ modulename ]
-                Subprocess.run(package.name, :import, *options)
+                Subprocess.run(package, :import, *options)
 	    end
         end
     end

data/lib/autobuild/import/darcs.rb

@@ -27,7 +27,7 @@ module Autobuild
 		raise ConfigException, "#{package.srcdir} is not a Darcs repository"
 	    end
 
-	    Subprocess.run(package.name, :import, @program, 
+	    Subprocess.run(package, :import, @program, 
 	       'pull', '--all', "--repodir=#{package.srcdir}", '--set-scripts-executable', @source, *@pull)
         end
 
@@ -37,7 +37,7 @@ module Autobuild
 		FileUtils.mkdir_p(basedir)
 	    end
 
-	    Subprocess.run(package.name, :import, @program, 
+	    Subprocess.run(package, :import, @program, 
 	       'get', '--set-scripts-executable', @source, package.srcdir, *@get)
         end
     end

data/lib/autobuild/import/git.rb

@@ -85,9 +85,9 @@ module Autobuild
             validate_srcdir(package)
             Dir.chdir(package.srcdir) do
                 if commit # we are checking out a specific commit. We just call git fetch
-                    Subprocess.run(package.name, :import, Autobuild.tool('git'), 'fetch', repository)
+                    Subprocess.run(package, :import, Autobuild.tool('git'), 'fetch', repository)
                 else
-                    Subprocess.run(package.name, :import, Autobuild.tool('git'), 'fetch', repository, branch || tag)
+                    Subprocess.run(package, :import, Autobuild.tool('git'), 'fetch', repository, branch || tag)
                 end
                 if File.readable?( File.join('.git', 'FETCH_HEAD') )
                     fetch_commit = File.readlines( File.join('.git', 'FETCH_HEAD') ).
@@ -185,7 +185,7 @@ module Autobuild
 
                 # If we are tracking a commit/tag, just check it out and return
                 if commit || tag
-                    Subprocess.run(package.name, :import, Autobuild.tool('git'), 'checkout', commit || tag)
+                    Subprocess.run(package, :import, Autobuild.tool('git'), 'checkout', commit || tag)
                     return
                 end
 
@@ -193,9 +193,9 @@ module Autobuild
                     # Check if the target branch already exists. If it is the
                     # case, check it out. Otherwise, create it.
                     if File.file?(File.join(".git", "refs", "heads", branch))
-                        Subprocess.run(package.name, :import, Autobuild.tool('git'), 'checkout', branch)
+                        Subprocess.run(package, :import, Autobuild.tool('git'), 'checkout', branch)
                     else
-                        Subprocess.run(package.name, :import, Autobuild.tool('git'), 'checkout', '-b', branch, "FETCH_HEAD")
+                        Subprocess.run(package, :import, Autobuild.tool('git'), 'checkout', '-b', branch, "FETCH_HEAD")
                     end
                 end
 
@@ -204,7 +204,7 @@ module Autobuild
                     if !merge? && status.status == Status::NEEDS_MERGE
                         raise PackageException, "importing the current version would require a merge"
                     end
-                    Subprocess.run(package.name, :import, Autobuild.tool('git'), 'merge', fetch_commit)
+                    Subprocess.run(package, :import, Autobuild.tool('git'), 'merge', fetch_commit)
                 end
             end
         end
@@ -215,24 +215,24 @@ module Autobuild
                 FileUtils.mkdir_p base_dir
             end
 
-            Subprocess.run(package.name, :import,
+            Subprocess.run(package, :import,
                 Autobuild.tool('git'), 'clone', '-o', 'autobuild',
                 repository, package.srcdir)
 
             Dir.chdir(package.srcdir) do
                 # If we are tracking a commit/tag, just check it out
                 if commit || tag
-                    Subprocess.run(package.name, :import, Autobuild.tool('git'),
+                    Subprocess.run(package, :import, Autobuild.tool('git'),
                         'checkout', commit || tag)
                     return
                 end
 
                 current_branch = `git symbolic-ref HEAD`.chomp
                 if current_branch == "refs/heads/#{branch}"
-                    Subprocess.run(package.name, :import, Autobuild.tool('git'),
+                    Subprocess.run(package, :import, Autobuild.tool('git'),
                     'reset', '--hard', "autobuild/#{branch}")
                 else
-                    Subprocess.run(package.name, :import, Autobuild.tool('git'),
+                    Subprocess.run(package, :import, Autobuild.tool('git'),
                     'checkout', '-b', branch, "autobuild/#{branch}")
                 end
             end

data/lib/autobuild/import/svn.rb

@@ -38,13 +38,13 @@ module Autobuild
 		if source != @source
 		    raise ConfigException, "current checkout found at #{package.srcdir} is from #{source}, was expecting #{@source}"
 		end
-                Subprocess.run(package.name, :import, @program, 'up', "--non-interactive", *@options_up)
+                Subprocess.run(package, :import, @program, 'up', "--non-interactive", *@options_up)
             }
         end
 
         def checkout(package) # :nodoc:
             options = [ @program, 'co', "--non-interactive" ] + @options_co + [ @source, package.srcdir ]
-            Subprocess.run(package.name, :import, *options)
+            Subprocess.run(package, :import, *options)
         end
     end
 

data/lib/autobuild/import/tar.rb

@@ -123,7 +123,7 @@ module Autobuild
             FileUtils.mkdir_p base_dir
             cmd = [ 'tar', "x#{TAR_OPTION[mode]}f", cachefile, '-C', base_dir ]
 
-            Subprocess.run(package.name, :import, *cmd)
+            Subprocess.run(package, :import, *cmd)
 	    if tardir
 		File.mv File.join(base_dir, tardir), package.srcdir
 	    end

data/lib/autobuild/importer.rb

@@ -86,9 +86,9 @@ class Autobuild::Importer
 
     def call_patch(package, reverse, file)
         patch = Autobuild.tool('patch')
-        Dir.chdir(package.srcdir) {
-            Subprocess.run(package.name, :patch, patch, '-p0', (reverse ? '-R' : nil), "<#{file}")
-        }
+        Dir.chdir(package.srcdir) do
+            Subprocess.run(package, :patch, patch, '-p0', (reverse ? '-R' : nil), "<#{file}")
+        end
     end
 
     def apply(package, path);   call_patch(package, false, path) end

data/lib/autobuild/package.rb

@@ -71,6 +71,9 @@ module Autobuild
 	def srcdir; File.expand_path(@srcdir || name, 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; File.expand_path(@logdir, prefix) end
+	
 
 	# The file which marks when the last sucessful install
 	# has finished. The path is absolute

data/lib/autobuild/packages/autotools.rb

@@ -4,6 +4,7 @@ require 'autobuild/environment'
 require 'autobuild/package'
 require 'autobuild/subcommand'
 require 'shellwords'
+require 'fileutils'
 
 module Autobuild
     def self.autotools(opts, &proc)
@@ -62,7 +63,7 @@ module Autobuild
             doc_task do
                 Dir.chdir(builddir) do
                     Autobuild.progress "generating documentation for #{name}"
-                    Subprocess.run(name, 'doc', Autobuild.tool(:make), "-j#{parallel_build_level}", target)
+                    Subprocess.run(self, 'doc', Autobuild.tool(:make), "-j#{parallel_build_level}", target)
                     yield if block_given?
                 end
             end
@@ -138,7 +139,7 @@ module Autobuild
 		old_opt = options.find   { |o| !testflags.include?(o) }
 		new_opt = testflags.find { |o| !options.include?(o) }
 		if old_opt || new_opt
-		    File.rm_f config_status # to force reconfiguration
+		    FileUtils.rm_f config_status # to force reconfiguration
 		end
 	    end
 
@@ -176,14 +177,14 @@ module Autobuild
 	    end
 
             file conffile do
-                Dir.chdir(srcdir) {
+                Dir.chdir(srcdir) do
                     if using[:autogen].nil?
                         using[:autogen] = %w{autogen autogen.sh}.find { |f| File.exists?(f) }
                     end
 
                     Autobuild.progress "generating build system for #{name}"
                     if using[:autogen]
-                        Subprocess.run(name, 'configure', File.expand_path(using[:autogen]))
+                        Subprocess.run(self, 'configure', File.expand_path(using[:autogen]))
                     else
                         # Autodetect autoconf/aclocal/automake
                         #
@@ -202,11 +203,11 @@ module Autobuild
 					       else; Autobuild.tool(tool)
 					       end
 
-                                Subprocess.run(name, 'configure', tool_program)
+                                Subprocess.run(self, 'configure', tool_program)
                             end
                         end
                     end
-                }
+                end
             end
 
             return conffile
@@ -224,26 +225,26 @@ module Autobuild
                 command += Array[*configureflags]
                 
                 Autobuild.progress "configuring build system for #{name}"
-                Subprocess.run(name, 'configure', *command)
+                Subprocess.run(self, 'configure', *command)
             }
         end
 
         # Do the build in builddir
         def build
-            Dir.chdir(builddir) {
+            Dir.chdir(builddir) do
                 Autobuild.progress "building #{name}"
-                Subprocess.run(name, 'build', './config.status')
-                Subprocess.run(name, 'build', Autobuild.tool(:make), "-j#{parallel_build_level}")
-            }
+                Subprocess.run(self, 'build', './config.status')
+                Subprocess.run(self, 'build', Autobuild.tool(:make), "-j#{parallel_build_level}")
+            end
             Autobuild.touch_stamp(buildstamp)
         end
 
         # Install the result in prefix
         def install
-            Dir.chdir(builddir) {
+            Dir.chdir(builddir) do
                 Autobuild.progress "installing #{name}"
-                Subprocess.run(name, 'install', Autobuild.tool(:make), "-j#{parallel_build_level}", 'install')
-            }
+                Subprocess.run(self, 'install', Autobuild.tool(:make), "-j#{parallel_build_level}", 'install')
+            end
             Autobuild.touch_stamp(installstamp)
             Autobuild.update_environment(prefix)
         end

data/lib/autobuild/packages/cmake.rb

@@ -64,7 +64,7 @@ module Autobuild
             doc_task do
                 Dir.chdir(builddir) do
                     Autobuild.progress "generating documentation for #{name}"
-                    Subprocess.run(name, 'doc', Autobuild.tool(:make), "-j#{parallel_build_level}", target)
+                    Subprocess.run(self, 'doc', Autobuild.tool(:make), "-j#{parallel_build_level}", target)
                     yield if block_given?
                 end
             end
@@ -153,7 +153,7 @@ module Autobuild
                 if full_reconfigures?
                     FileUtils.rm_f configurestamp
                 end
-                Subprocess.run(name, 'configure', *command)
+                Subprocess.run(self, 'configure', *command)
                 super
             end
         end
@@ -163,9 +163,9 @@ module Autobuild
             Dir.chdir(builddir) do
                 Autobuild.progress_with_value "building #{name}"
                 if always_reconfigure || !File.file?('Makefile')
-                    Subprocess.run(name, 'build', Autobuild.tool(:cmake), '.')
+                    Subprocess.run(self, 'build', Autobuild.tool(:cmake), '.')
                 end
-                Subprocess.run(name, 'build', Autobuild.tool(:make), "-j#{parallel_build_level}") do |line|
+                Subprocess.run(self, 'build', Autobuild.tool(:make), "-j#{parallel_build_level}") do |line|
                     if line =~ /\[\s+(\d+)%\]/
                         Autobuild.progress_value Integer($1)
                     end
@@ -178,7 +178,7 @@ module Autobuild
         def install
             Dir.chdir(builddir) do
                 Autobuild.progress "installing #{name}"
-                Subprocess.run(name, 'build', Autobuild.tool(:make), "-j#{parallel_build_level}", 'install')
+                Subprocess.run(self, 'build', Autobuild.tool(:make), "-j#{parallel_build_level}", 'install')
                 Autobuild.update_environment prefix
             end
             super

data/lib/autobuild/packages/genom.rb

@@ -136,7 +136,7 @@ module Autobuild
             file genomstamp => srcdir do
                 Dir.chdir(srcdir) do
                     Autobuild.progress "generating GenoM files for #{name}"
-                    Subprocess.run(name, 'genom', *cmdline)
+                    Subprocess.run(self, 'genom', *cmdline)
 		end
             end
 
@@ -146,7 +146,7 @@ module Autobuild
                 # since the generation takes care of rebuilding configure
                 # if .gen has changed
                 Autobuild.progress "generating build system for #{name}"
-                Dir.chdir(srcdir) { Subprocess.run(name, 'genom', File.expand_path('autogen')) }
+                Dir.chdir(srcdir) { Subprocess.run(self, 'genom', File.expand_path('autogen')) }
             end
 
 	    super("#{srcdir}/autoconf/configure.ac")

data/lib/autobuild/packages/orogen.rb

@@ -49,6 +49,8 @@ module Autobuild
             end
         end
 
+        attr_reader :orogen_file
+        attr_reader :base_dir
         attr_reader :project_name, :dependencies, :provides
         def self.load(pkg, file)
             FakeOrogenEnvironment.new(pkg).load(file)
@@ -64,6 +66,8 @@ module Autobuild
         end
 
         def load(file)
+            @orogen_file = file
+            @base_dir = File.dirname(file)
             Kernel.eval(File.read(file), binding)
             self
         end
@@ -76,6 +80,11 @@ module Autobuild
             @dependencies.concat(names)
             nil
         end
+        def import_types_from(name)
+            if !File.file?(File.join(base_dir, name)) && name.downcase !~ /\.(hh|hpp|h)/
+                using_toolkit name
+            end
+        end
         def using_toolkit(*names)
             names = names.map { |n| "#{n}-toolkit-#{pkg.orocos_target}" }
             @dependencies.concat(names)
@@ -141,6 +150,17 @@ module Autobuild
             end
         end
 
+        def self.orogen_root
+            if @orogen_root.nil?
+                @orogen_root = `orogen --base-dir 2>&1`
+                if @orogen_root.empty?
+                    @orogen_root = false
+                end
+            else
+                @orogen_root
+            end
+        end
+
         attr_writer :orocos_target
         def orocos_target
             if @orocos_target.nil?
@@ -206,16 +226,22 @@ module Autobuild
                 end
             end
 
-            # 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
-            orogen_root = `orogen --base-dir 2>&1`
-            if !orogen_root.empty?
-                orogen_root = orogen_root.split[0].chomp
-                if File.directory?(orogen_root)
-                    orogen_root = File.join(orogen_root, 'orogen')
-                    file genstamp => Autobuild.source_tree(orogen_root)
+            # Check if there is an orogen package registered. If it is the case,
+            # simply depend on it. Otherwise, look out for orogen --base-dir
+            if Autobuild::Package['orogen']
+                depends_on "orogen"
+            else
+                # 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_root = orogen_root.split[0].chomp
+                    if File.directory?(orogen_root)
+                        orogen_root = File.join(orogen_root, 'orogen')
+                        file genstamp => Autobuild.source_tree(orogen_root)
+                    end
                 end
             end
+
             file configurestamp => genstamp
             file genstamp => File.join(srcdir, orogen_file) do
                 regen
@@ -230,7 +256,7 @@ module Autobuild
 
             Autobuild.progress "generating oroGen project #{name}"
             Dir.chdir(srcdir) do
-                Subprocess.run name, 'orogen', *cmdline
+                Subprocess.run self, 'orogen', *cmdline
                 Autobuild.touch_stamp genstamp
             end
         end

data/lib/autobuild/subcommand.rb

@@ -72,14 +72,22 @@ module Autobuild::Subprocess
         command.reject!  { |o| o.nil? || (o.respond_to?(:empty?) && o.empty?) }
         command.collect! { |o| o.to_s }
 
-        FileUtils.mkdir_p Autobuild.logdir unless File.directory?(Autobuild.logdir)
-        logname = "#{Autobuild.logdir}/#{target}-#{phase}.log"
+        target_name = if target.respond_to?(:name)
+                          target.name
+                      else target.to_str
+                      end
+        logdir = if target.respond_to?(:logdir)
+                     target.logdir
+                 else Autobuild.logdir
+                 end
+
+        logname = "#{logdir}/#{target_name}-#{phase}.log"
         if !File.directory?(File.dirname(logname))
             FileUtils.mkdir_p File.dirname(logname)
         end
 
 	if Autobuild.verbose
-	    puts "#{target}: running #{command.join(" ")}\n    (output goes to #{logname})"
+	    puts "#{target_name}: running #{command.join(" ")}\n    (output goes to #{logname})"
 	end
 
         input_streams = command.collect { |o| $1 if o =~ /^\<(.+)/ }.compact
@@ -188,12 +196,12 @@ module Autobuild::Subprocess
             childstatus
         end
 
-        if status.exitstatus > 0
+        if !status.exitstatus || status.exitstatus > 0
             raise Failed.new(status.exitstatus), "'#{command.join(' ')}' returned status #{status.exitstatus}"
         end
 
     rescue Failed => e
-        error = Autobuild::SubcommandFailed.new(target, command.join(" "), logname, e.status)
+        error = Autobuild::SubcommandFailed.new(target_name, command.join(" "), logname, e.status)
         error.phase = phase
         raise error, e.message
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-26 00:00:00 +01:00
+date: 2009-12-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency