autobuild 1.4.9 → 1.5.0

data/Changes.txt

@@ -1,3 +1,17 @@
+== Version 1.5.0
+* now Ruby1.9 compatibility fixes, can be run with ruby1.9.1 on Debian
+* properly runs if the ruby interpreter is not called 'ruby', as ruby1.9.1
+  on Debian
+* fix some issues with the usage of #depends_on *before* Package#srcdir #logdir
+  and #prefix were set. It fixes an autoproj bug in case the autobuild files use
+  #depends_on
+* the archive importer now properly handles interruptions
+* the archive importer now properly autodetects file names if the URLs contains '?'
+* fixed the importer package type
+* fixed some rare issues with internal dependency definitions. This bug was
+  usually manifesting itself with rake exceptions whose message were "do not
+  know how to build <package name>-stamp"
+
 == Version 1.4.9
 * quickfix an issue related to a discrepancy between the definition of the
   installstamp and the definition of the log dir.

data/lib/autobuild.rb

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

data/lib/autobuild/config.rb

@@ -143,33 +143,33 @@ module Autobuild
         def commandline(args)
             parser = OptionParser.new do |opts|
                 opts.separator "Path specification"
-                opts.on("--srcdir PATH", "sources are installed in PATH") do |@srcdir| end
-                opts.on("--prefix PATH", "built packages are installed in PATH") do |@prefix| end
-                opts.on("--logdir PATH", "logs are saved in PATH (default: <prefix>/autobuild)") do |@logdir| end
+                opts.on("--srcdir PATH", "sources are installed in PATH") do |v| Autobuild.srcdir=v end
+                opts.on("--prefix PATH", "built packages are installed in PATH") do |v| Autobuild.prefix = v end
+                opts.on("--logdir PATH", "logs are saved in PATH (default: <prefix>/autobuild)") do |v| Autobuild.logdir = v end
 
                 opts.separator ""
                 opts.separator "General behaviour"
-                opts.on('--nice NICE', Integer, 'nice the subprocesses to the given value') do |@nice| end
+                opts.on('--nice NICE', Integer, 'nice the subprocesses to the given value') do |v| Autobuild.nice = v end
                 opts.on("-h", "--help", "Show this message") do
                     puts opts
                     exit
                 end
 		if defined? Daemons
-		    opts.on("--[no-]daemon", "go into daemon mode") do |@daemonize| end
+		    opts.on("--[no-]daemon", "go into daemon mode") do |v| Autobuild.daemonize = v end
 		end
-                opts.on("--no-update", "update already checked-out sources") do |@do_update| end
-                opts.on("--no-build",  "only prepare packages, do not build them") do |@do_build| end 
-                opts.on("--forced-build",  "force the trigger of all the build commands") do |@do_forced_build| end 
-                opts.on("--rebuild",  "clean and rebuild") do |@do_forced_build| end 
-                opts.on("--only-doc", "only generate documentation") do |@only_doc| end
-                opts.on("--no-doc", "don't generate documentation") do |@do_doc| end
-                opts.on("--doc-errors", "treat documentation failure as error") do |@doc_errors| end
+                opts.on("--no-update", "update already checked-out sources") do |v|  Autobuild.do_update = v end
+                opts.on("--no-build",  "only prepare packages, do not build them") do |v| Autobuild.do_build = v end 
+                opts.on("--forced-build",  "force the trigger of all the build commands") do |v| Autobuild.do_forced_build = v end 
+                opts.on("--rebuild",  "clean and rebuild") do |v| Autobuild.do_forced_build = v end 
+                opts.on("--only-doc", "only generate documentation") do |v| Autobuild.only_doc = v end
+                opts.on("--no-doc", "don't generate documentation") do |v| Autobuild.do_doc = v end
+                opts.on("--doc-errors", "treat documentation failure as error") do |v| Autobuild.doc_errors = v end
 
                 opts.separator ""
                 opts.separator "Program output"
-                opts.on("--[no-]verbose", "display output of commands on stdout") do |@verbose| end
-                opts.on("--[no-]debug", "debug information (for debugging purposes)") do |@debug| end
-                opts.on("--keep-oldlogs", "old logs will be kept, new program output being appended") do |@keep_oldlogs| end
+                opts.on("--[no-]verbose", "display output of commands on stdout") do |v| Autobuild.verbose = v end
+                opts.on("--[no-]debug", "debug information (for debugging purposes)") do |v| Autobuild.debug = v end
+                opts.on("--keep-oldlogs", "old logs will be kept, new program output being appended") do |v| Autobuild.keep_oldlogs = v end
 
                 opts.separator ""
 		opts.separator "Mail reports"

data/lib/autobuild/configurable.rb

@@ -37,7 +37,7 @@ module Autobuild
             @builddir = new
         end
         # Returns the absolute builddir
-        def builddir; File.expand_path(@builddir || Configurable.builddir, srcdir) end
+        def builddir; File.expand_path(@builddir || self.class.builddir, srcdir) end
 
         # Build stamp
         # This returns the name of the file which marks when the package has been
@@ -56,17 +56,12 @@ module Autobuild
         end
 
         def prepare_for_rebuild
+            prepare_for_forced_build
             if File.exists?(builddir) && builddir != srcdir
                 FileUtils.rm_rf builddir
             end
         end
 
-        def depends_on(*packages)
-            super
-            stamps = packages.collect { |p| Package[p.to_s].installstamp }
-            file configurestamp => stamps
-        end
-
         def ensure_dependencies_installed
             dependencies.each do |pkg|
                 Rake::Task[Package[pkg].installstamp].invoke
@@ -74,33 +69,39 @@ module Autobuild
         end
 
         def prepare
+            Autobuild.source_tree srcdir do |pkg|
+		pkg.exclude << Regexp.new("^#{Regexp.quote(builddir)}")
+                pkg.exclude << Regexp.new("^#{doc_dir}") if doc_dir
+	    end
+
             super
 
-            file configurestamp do
+            stamps = dependencies.map { |pkg| Autobuild::Package[pkg].installstamp }
+            file configurestamp => stamps do
                 ensure_dependencies_installed
                 configure
             end
             task "#{name}-prepare" => configurestamp
 
-            Autobuild.source_tree srcdir do |pkg|
-		pkg.exclude << Regexp.new("^#{Regexp.quote(builddir)}")
-                pkg.exclude << Regexp.new("^#{doc_dir}") if doc_dir
-	    end
-
-            file buildstamp => [ srcdir, configurestamp ] do 
+            file buildstamp => [ srcdir, configurestamp ] do
                 ensure_dependencies_installed
                 build
             end
             task "#{name}-build" => buildstamp
 
-            file installstamp => buildstamp do 
-                install
-                Autobuild.update_environment(prefix)
-            end
+            file installstamp => buildstamp
+            Autobuild.update_environment(prefix)
         end
 
         # Configure the builddir directory before starting make
         def configure
+            if File.exists?(builddir) && !File.directory?(builddir)
+                raise ConfigException, "#{builddir} already exists but is not a directory"
+            end
+            FileUtils.mkdir_p builddir if !File.directory?(builddir)
+
+            yield
+
             Autobuild.touch_stamp(configurestamp)
         end
 
@@ -108,9 +109,9 @@ module Autobuild
         def build
         end
 
-        # Install the result in prefix
         def install
-            Autobuild.touch_stamp(installstamp)
+            super
+            Autobuild.update_environment(prefix)
         end
     end
 end

data/lib/autobuild/environment.rb

@@ -83,9 +83,11 @@ module Autobuild
         end
 
         require 'rbconfig'
-        ruby_arch = File.basename(Config::CONFIG['archdir'])
-        env_add_path("RUBYLIB", "#{newprefix}/lib/ruby/1.8")
-        env_add_path("RUBYLIB", "#{newprefix}/lib/ruby/1.8/#{ruby_arch}")
+        ruby_arch    = File.basename(Config::CONFIG['archdir'])
+        candidates = %w{rubylibdir archdir sitelibdir sitearchdir vendorlibdir vendorarchdir}.
+            map { |key| Config::CONFIG[key] }.
+            map { |path| path.gsub(/.*lib\/(\w*ruby\/)/, '\\1') }.
+            each { |subdir| env_add_path("RUBYLIB", "#{newprefix}/lib/#{subdir}") }
     end
 end
 

data/lib/autobuild/import/archive.rb

@@ -27,7 +27,7 @@ module Autobuild
             case filename
                 when /\.zip$/; Zip
                 when /\.tar$/; Plain
-                when /\.tar\.gz|\.tgz$/;  Gzip
+                when /\.tar\.gz$|\.tgz$/;  Gzip
                 when /\.bz2$/; Bzip
                 else
                     raise "unknown file type '#{filename}'"
@@ -67,7 +67,13 @@ module Autobuild
 
             if do_update
                 FileUtils.mkdir_p(cachedir)
-                Subprocess.run(package, :import, Autobuild.tool('wget'), '-q', '-P', cachedir, @url)
+                begin
+                    Subprocess.run(package, :import, Autobuild.tool('wget'), '-q', '-P', cachedir, @url, '-O', "#{cachefile}.partial")
+                rescue Exception
+                    FileUtils.rm_f "#{cachefile}.partial"
+                    raise
+                end
+                FileUtils.mv "#{cachefile}.partial", cachefile
                 true
             end
         end
@@ -106,11 +112,12 @@ module Autobuild
             @url = URI.parse(url)
             raise ConfigException, "invalid URL #{@url}" unless VALID_URI_SCHEMES.include?(@url.scheme)
 
-            @mode = options[:mode] || ArchiveImporter.filename_to_mode(options[:filename] || url)
+            filename = options[:filename] || File.basename(url).gsub(/\?.*/, '')
+            @mode = options[:mode] || ArchiveImporter.filename_to_mode(filename)
             if @url.scheme == 'file'
                 @cachefile = @url.path
             else
-                @cachefile = File.join(cachedir, @options[:filename] || File.basename(url).gsub(/\?.*/, ''))
+                @cachefile = File.join(cachedir, filename)
             end
         end
 

data/lib/autobuild/importer.rb

@@ -4,7 +4,8 @@ require 'autobuild/exceptions'
 # This class is the base class for objects that are used to get the source from
 # various RCS into the package source directory. A list of patches to apply
 # after the import can be given in the +:patches+ option.
-class Autobuild::Importer
+module Autobuild
+class Importer
     # Instances of the Importer::Status class represent the status of a current
     # checkout w.r.t. the remote repository.
     class Status
@@ -44,7 +45,13 @@ class Autobuild::Importer
     def initialize(options); @options = options end
 
     def patches
-	@options[:patches] ||= []
+        if @options[:patches].respond_to?(:to_ary)
+            @options[:patches]
+        elsif !@options[:patches]
+            []
+        else
+            [@options[:patches]]
+        end
     end
 
     # Performs the import of +package+
@@ -126,4 +133,5 @@ class Autobuild::Importer
         end
     end
 end
+end
 

data/lib/autobuild/package.rb

@@ -125,7 +125,7 @@ module Autobuild
 	    end
 	    task :default => name
 	    
-            # The dependencies will be declared in the prepare phase,  so save
+            # The dependencies will be declared in the import phase,  so save
             # them there for now
             @spec_dependencies = depends
 	end
@@ -147,22 +147,25 @@ 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; @importer.import(self) if @importer end
+	def import
+            @importer.import(self) if @importer
+
+	    # Add the dependencies declared in spec
+	    depends_on *@spec_dependencies if @spec_dependencies
+        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
             super if defined? super
 
-            task "#{name}-build" => installstamp
-	    # Declare the installation stampfile
-	    file installstamp do
-		Dir.chdir(srcdir) do
-		    Autobuild.apply_post_install(name, @post_install)
-		end
+            stamps = dependencies.map { |p| Package[p].installstamp }
+
+	    file installstamp => stamps do
+                install
 	    end
-	    # Add dependencies declared in spec
-	    depends_on *@spec_dependencies if @spec_dependencies
+            task "#{name}-build" => installstamp
 
             Autobuild.update_environment prefix
         end
@@ -183,6 +186,18 @@ module Autobuild
             Autobuild.progress_value(value)
         end
 
+        # Install the result in prefix
+        def install
+            Dir.chdir(srcdir) do
+                Autobuild.apply_post_install(name, @post_install)
+            end
+            Autobuild.touch_stamp(installstamp)
+        end
+
+        def run(*args, &block)
+            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
@@ -279,7 +294,6 @@ module Autobuild
 		unless Package[p]
 		    raise ConfigException.new(name), "package #{p} not defined"
 		end
-		file installstamp => Package[p].installstamp
 		task "#{name}-import"  => "#{p}-import"
 		task "#{name}-prepare" => "#{p}-prepare"
 		@dependencies << p

data/lib/autobuild/packages/autotools.rb

@@ -21,31 +21,13 @@ module Autobuild
     #
     # To override this default behaviour on a per-package basis, use Autotools#use
     #
-    class Autotools < Package
+    class Autotools < Configurable
         attr_accessor   :using
         attr_accessor   :configureflags
-        class << self
-            attr_reader :builddir
-            def builddir=(new)
-                raise ConfigException, "absolute builddirs are not supported" if (Pathname.new(new).absolute?)
-                raise ConfigException, "builddir must be non-nil and non-empty" if (new.nil? || new.empty?)
-                @builddir = new
-            end
-        end
+
         @builddir = 'build'
         
-        def builddir=(new)
-            raise ConfigException, "absolute builddirs are not supported" if (Pathname.new(new).absolute?)
-            raise ConfigException, "builddir must be non-empty" if new.empty?
-            @builddir = new
-        end
-        # Returns the absolute builddir
-        def builddir; File.expand_path(@builddir || Autotools.builddir, srcdir) end
-
-        # Build stamp
-        # This returns the name of the file which marks when the package has been
-        # successfully built for the last time. The path is absolute
-        def buildstamp; "#{builddir}/#{STAMPFILE}" end
+        def configurestamp; "#{builddir}/config.status" end
 
         def initialize(options)
             @using = Hash.new
@@ -54,10 +36,6 @@ module Autobuild
             super
         end
         
-        def install_doc(relative_to = builddir)
-            super(relative_to)
-        end
-
         # Declare that the given target can be used to generate documentation
         def with_doc(target = 'doc')
             doc_task do
@@ -107,30 +85,17 @@ module Autobuild
             nil
         end
 
-        def depends_on(*packages)
-            super
-            stamps = packages.collect { |p| Package[p.to_s].installstamp }
-            file "#{builddir}/config.status" => stamps
-        end
-
-        def ensure_dependencies_installed
-            dependencies.each do |pkg|
-                Rake::Task[Package[pkg].installstamp].invoke
-            end
-        end
-
         def prepare
             super
 
-	    configureflags.flatten!
-
 	    # Check if config.status has been generated with the
 	    # same options than the ones in configureflags
-	    config_status = "#{builddir}/config.status"
-
+            #
+            # If it is not the case, remove it to force reconfiguration
+	    configureflags.flatten!
 	    force_reconfigure = false
-	    if File.exists?(config_status)
-		output = IO.popen("#{config_status} --version").readlines.grep(/with options/).first.chomp
+	    if File.exists?(configurestamp)
+		output = IO.popen("#{configurestamp} --version").readlines.grep(/with options/).first.chomp
 		raise "invalid output of config.status --version" unless output =~ /with options "(.*)"$/
 		options = Shellwords.shellwords($1)
 
@@ -139,34 +104,17 @@ module Autobuild
 		old_opt = options.find   { |o| !testflags.include?(o) }
 		new_opt = testflags.find { |o| !options.include?(o) }
 		if old_opt || new_opt
-		    FileUtils.rm_f config_status # to force reconfiguration
+		    FileUtils.rm_f configurestamp # to force reconfiguration
 		end
 	    end
 
-            file config_status => regen do
-                ensure_dependencies_installed
-                configure
-            end
-
-            Autobuild.source_tree srcdir do |pkg|
-		pkg.exclude << Regexp.new("^#{Regexp.quote(builddir)}")
-	    end
-            file buildstamp => [ srcdir, "#{builddir}/config.status" ] do 
-                ensure_dependencies_installed
-                build
-            end
-            task "#{name}-build" => installstamp
-
-            file installstamp => buildstamp do 
-                install
-            end
-
-            Autobuild.update_environment(prefix)
+            regen_target = create_regen_target
+            file configurestamp => regen_target
         end
 
     private
         # Adds a target to rebuild the autotools environment
-        def regen(confsource = nil)
+        def create_regen_target(confsource = nil)
 	    conffile = "#{srcdir}/configure"
 	    if confsource
 		file conffile => confsource
@@ -206,6 +154,13 @@ module Autobuild
                                 Subprocess.run(self, 'configure', tool_program)
                             end
                         end
+
+                        if using[:libtool].nil?
+                            using[:libtool] = File.exists?(File.join(srcdir, 'ltmain.sh'))
+                        end
+                        if using[:libtool]
+                            Subprocess.run(self, 'configure', Autobuild.tool('libtoolize'), '--copy')
+                        end
                     end
                 end
             end
@@ -215,18 +170,15 @@ module Autobuild
 
         # Configure the builddir directory before starting make
         def configure
-            if File.exists?(builddir) && !File.directory?(builddir)
-                raise ConfigException, "#{builddir} already exists but is not a directory"
+            super do
+                Dir.chdir(builddir) do
+                    command = [ "#{srcdir}/configure", "--no-create", "--prefix=#{prefix}" ]
+                    command += Array[*configureflags]
+                    
+                    progress "configuring build system for %s"
+                    Subprocess.run(self, 'configure', *command)
+                end
             end
-
-            FileUtils.mkdir_p builddir if !File.directory?(builddir)
-            Dir.chdir(builddir) {
-                command = [ "#{srcdir}/configure", "--no-create", "--prefix=#{prefix}" ]
-                command += Array[*configureflags]
-                
-                progress "configuring build system for %s"
-                Subprocess.run(self, 'configure', *command)
-            }
         end
 
         # Do the build in builddir
@@ -245,8 +197,8 @@ module Autobuild
                 progress "installing %s"
                 Subprocess.run(self, 'install', Autobuild.tool(:make), "-j#{parallel_build_level}", 'install')
             end
-            Autobuild.touch_stamp(installstamp)
-            Autobuild.update_environment(prefix)
+
+            super
         end
     end
 end

data/lib/autobuild/packages/cmake.rb

@@ -100,19 +100,20 @@ module Autobuild
         end
 
         def prepare
-            super
-
-            all_defines = defines.dup
-            all_defines['CMAKE_INSTALL_PREFIX'] = prefix
-
+            # A failed initial CMake configuration leaves a CMakeCache.txt file,
+            # but no Makefile.
+            #
+            # Delete the CMakeCache to force reconfiguration
             if !File.exists?( File.join(builddir, 'Makefile') )
                 FileUtils.rm_f configurestamp
             end
 
             if File.exists?(configurestamp)
+                all_defines = defines.dup
+                all_defines['CMAKE_INSTALL_PREFIX'] = prefix
                 cache = File.read(configurestamp)
                 did_change = all_defines.any? do |name, value|
-                    cache_line = cache.find do |line|
+                    cache_line = cache.each_line.find do |line|
                         line =~ /^#{name}:/
                     end
 
@@ -133,28 +134,26 @@ module Autobuild
                     FileUtils.rm_f configurestamp
                 end
             end
+
+            super
         end
 
         # Configure the builddir directory before starting make
         def configure
-            if File.exists?(builddir) && !File.directory?(builddir)
-                raise ConfigException, "#{builddir} already exists but is not a directory"
-            end
-
-            FileUtils.mkdir_p builddir if !File.directory?(builddir)
-            Dir.chdir(builddir) do
-                command = [ "cmake", "-DCMAKE_INSTALL_PREFIX=#{prefix}" ]
-                defines.each do |name, value|
-                    command << "-D#{name}=#{value}"
-                end
-                command << srcdir
-                
-                progress "generating and configuring build system for %s"
-                if full_reconfigures?
-                    FileUtils.rm_f configurestamp
+            super do
+                Dir.chdir(builddir) do
+                    command = [ "cmake", "-DCMAKE_INSTALL_PREFIX=#{prefix}" ]
+                    defines.each do |name, value|
+                        command << "-D#{name}=#{value}"
+                    end
+                    command << srcdir
+                    
+                    progress "generating and configuring build system for %s"
+                    if full_reconfigures?
+                        FileUtils.rm_f configurestamp
+                    end
+                    Subprocess.run(self, 'configure', *command)
                 end
-                Subprocess.run(self, 'configure', *command)
-                super
             end
         end
 
@@ -179,7 +178,6 @@ module Autobuild
             Dir.chdir(builddir) do
                 progress "installing %s"
                 Subprocess.run(self, 'build', Autobuild.tool(:make), "-j#{parallel_build_level}", 'install')
-                Autobuild.update_environment prefix
             end
             super
         end

data/lib/autobuild/packages/dummy.rb

@@ -24,6 +24,8 @@ module Autobuild
             Rake.task(installstamp)
             t = Rake::Task[installstamp]
             def t.needed?; false end
+
+            super
         end
     end
 end

data/lib/autobuild/packages/genom.rb

@@ -26,9 +26,11 @@ module Autobuild
         # after all imports have been made
         def prepare
 	    genomflags.flatten!
+	    get_requires
 
             super
-	    get_requires
+
+	    file genomstamp => dependencies.map { |p| Package[p].installstamp }
         end
 
         # The file touched by genom on successful generation
@@ -85,11 +87,6 @@ module Autobuild
                 }
             end
         end
-            
-        def depends_on(*packages)
-            super
-	    file genomstamp => packages.map { |p| Package[p].installstamp }
-	end
 
 	# Make the genom-stamp file depend on
 	#   * genom includes

data/lib/autobuild/packages/import.rb

@@ -32,9 +32,7 @@ module Autobuild
 		exclude.freeze
 	    end
 
-            file installstamp => srcdir do 
-                Autobuild.touch_stamp installstamp
-            end
+            file installstamp => srcdir
         end
     end
 end

data/lib/autobuild/packages/orogen.rb

@@ -150,14 +150,24 @@ 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
+        def self.orogen_bin
+            if @orogen_bin
+                @orogen_bin
             else
+                program_name = Autobuild.tool('orogen')
+                if orogen_path = ENV['PATH'].split(':').find { |p| File.file?(File.join(p, program_name)) }
+                    @orogen_bin = File.join(orogen_path, program_name)
+                else
+                    program_name
+                end
+            end
+        end
+
+        def self.orogen_root
+            if @orogen_root
                 @orogen_root
+            elsif orogen_bin = self.orogen_bin
+                @orogen_root = File.expand_path('../lib', File.dirname(orogen_bin))
             end
         end
 
@@ -186,14 +196,6 @@ module Autobuild
             @orogen_file ||= "#{File.basename(name)}.orogen"
         end
 
-        def depends_on(*packages)
-            super
-
-            packages.each do |p|
-                file genstamp => Package[p].installstamp
-            end
-        end
-
         def import
             super
 
@@ -206,8 +208,6 @@ module Autobuild
         end
 
         def prepare
-            super
-
             # Check if someone provides the pkgconfig/orocos-rtt-TARGET package,
             # and if so add it into our dependency list
             if rtt = Autobuild::Package["pkgconfig/orocos-rtt-#{orocos_target}"]
@@ -234,11 +234,8 @@ 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_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
+                    orogen_root = File.join(orogen_root, 'orogen')
+                    file genstamp => Autobuild.source_tree(orogen_root)
                 end
             end
 
@@ -248,11 +245,26 @@ module Autobuild
             end
 
             with_doc
+
+            super
+
+            dependencies.each do |p|
+                file genstamp => Package[p].installstamp
+            end
         end
         def genstamp; File.join(srcdir, '.orogen', 'orogen-stamp') end
 
+        def guess_ruby_name
+            if Autobuild.programs['ruby']
+                Autobuild.tool('ruby')
+            else
+                ruby_bin = Config::CONFIG['RUBY_INSTALL_NAME']
+                Autobuild.programs['ruby'] = ruby_bin
+            end
+        end
+
         def regen
-            cmdline = [Autobuild.tool('orogen')]
+            cmdline = [guess_ruby_name, self.class.orogen_bin]
             cmdline << '--corba' if corba
             cmdline << orogen_file
 

data/lib/autobuild/timestamps.rb

@@ -23,7 +23,7 @@ module Autobuild
                     Find.prune
                 end
             }
-            next if File.directory?(p)
+            next if !File.file?(p)
 
             p_time = File.mtime(p)
             if latest < p_time

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.4.9
+  version: 1.5.0
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-15 00:00:00 +01:00
+date: 2010-02-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.3.3
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: gemcutter
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -60,7 +80,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.0
+        version: 2.5.0
     version: 
 description: |-
   This work is licensed under the GPLv2 license. See License.txt for details