autobuild 1.4.1 → 1.4.2

data/Changes.txt

@@ -1,3 +1,13 @@
+== Version 1.4.2
+* call subversion with the --non-interactive option, otherwise the build will
+  block indefinitely. Note that git "questions" are properly passed to the user.
+* don't forcefully depend on orogen being available. This fixes bootstrapping
+  situations where both orogen and some orogen modules need to be built.
+* workaround CMake heavy-caching behaviour. When a reconfiguration is needed,
+  delete the CMakeCache.txt file instead of recalling cmake on top of it. It
+  should fix most of the problems of CMake related to caching of pkg-config
+  files for instance.
+
 == Version 1.4.0
 * cmake package handler now displays progress value
 * added support for parallel builds

data/README.txt

@@ -1,7 +1,8 @@
-Copyright (c) 2006-2008 Sylvain Joyeux <sylvain.joyeux@m4x.org>
+Copyright (c) 2006-2009 Sylvain Joyeux <sylvain.joyeux@m4x.org>
 
-* http://www.rubyforge.org/projects/autobuild
-* http://autobuild.rubyforge.org/autobuild
+* http://doudou.github.com/autobuild
+* http://github.com/doudou/autobuild
+* http://doudou.github.com/autoproj
 
 This work is licensed under the GPLv2 license. See License.txt for details
 

data/lib/autobuild.rb

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

data/lib/autobuild/import/svn.rb

@@ -38,12 +38,12 @@ 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', *@options_up)
+                Subprocess.run(package.name, :import, @program, 'up', "--non-interactive", *@options_up)
             }
         end
 
         def checkout(package) # :nodoc:
-            options = [ @program, 'co' ] + @options_co + [ @source, package.srcdir ]
+            options = [ @program, 'co', "--non-interactive" ] + @options_co + [ @source, package.srcdir ]
             Subprocess.run(package.name, :import, *options)
         end
     end

data/lib/autobuild/package.rb

@@ -286,6 +286,10 @@ module Autobuild
 	# if with_provides is true, includes the list
 	# of package aliases
 	def self.each(with_provides = false, &p)
+            if !p
+                return enum_for(:each, with_provides)
+            end
+
 	    @@packages.each(&p) 
 	    @@provides.each(&p) if with_provides
 	end

data/lib/autobuild/packages/cmake.rb

@@ -13,12 +13,36 @@ module Autobuild
                 raise ConfigException, "builddir must be non-nil and non-empty" if (new.nil? || new.empty?)
                 @builddir = new
             end
+
+            attr_writer :full_reconfigures
+            def full_reconfigures?
+                @full_reconfigures
+            end
         end
+        @full_reconfigures = true
 
         # a key => value association of defines for CMake
         attr_reader :defines
         # If true, always run cmake before make during the build
         attr_accessor :always_reconfigure
+        # If true, we always remove the CMake cache before reconfiguring.
+        # 
+        # See #full_reconfigures? for more details
+        attr_writer :full_reconfigures
+
+        # If true, we always remove the CMake cache before reconfiguring. This
+        # is to workaround the aggressive caching behaviour of CMake, and is set
+        # to true by default.
+        #
+        # See CMake.full_reconfigures? and CMake.full_reconfigures= for a global
+        # setting
+        def full_reconfigures?
+            if @full_reconfigures.nil?
+                CMake.full_reconfigures?
+            else
+                @full_reconfigures
+            end
+        end
 
         def configurestamp; File.join(builddir, "CMakeCache.txt") end
 
@@ -126,6 +150,9 @@ module Autobuild
                 command << srcdir
                 
                 Autobuild.progress "generating and configuring build system for #{name}"
+                if full_reconfigures?
+                    FileUtils.rm_f configurestamp
+                end
                 Subprocess.run(name, 'configure', *command)
                 super
             end

data/lib/autobuild/packages/orogen.rb

@@ -208,13 +208,14 @@ 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
-            orogen_root = `orogen --base-dir`.chomp
-            if orogen_root.empty?
-                raise ConfigException, "cannot find the orogen tool"
+            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)
+                end
             end
-            orogen_root = File.join(orogen_root, 'orogen')
-            file genstamp => Autobuild.source_tree(orogen_root)
-
             file configurestamp => genstamp
             file genstamp => File.join(srcdir, orogen_file) do
                 regen

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-25 01:00:00 +02:00
+date: 2009-11-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,7 +130,7 @@ files:
 - test/test_subcommand.rb
 - test/tools.rb
 has_rdoc: true
-homepage: http://autobuild.rubyforge.org/autobuild
+homepage: http://github.com/doudou/autobuild
 licenses: []
 
 post_install_message: