autobuild 1.5.30 → 1.5.31

data/Changes.txt

@@ -1,3 +1,11 @@
+== Version 1.5.31
+* allow to override the type export policy for oroGen >= 1.1
+* allow to provide CMAKE_MODULE_PATH in the cmake handler. Unfortunately, cmake
+  does not support setting this through environment variables, so we have to
+  pass it as -D
+* make ignore_errors work for updates as well. We obviously still have to fail
+  on checkout
+
 == Version 1.5.30
 * make the autotools handler behave more normally, calling "configure" without
   --no-create and not calling config.status before make by default. The old

data/lib/autobuild/import/git.rb

@@ -184,7 +184,12 @@ module Autobuild
                         remote_commit = `git show-ref -s refs/heads/#{local_branch}`.chomp
                     end
                 else	
-                    remote_commit = fetch_remote(package)
+                    remote_commit =
+                        begin fetch_remote(package)
+                        rescue Exception => e
+                            fallback(e, package, :status, package, only_local)
+                        end
+
                     if !remote_commit
                         return
                     end
@@ -197,6 +202,7 @@ module Autobuild
                 end
                 status
             end
+
         end
 
         # Checks if the current branch is the target branch. Expects that the

data/lib/autobuild/importer.rb

@@ -6,6 +6,29 @@ require 'autobuild/exceptions'
 # after the import can be given in the +:patches+ option.
 module Autobuild
 class Importer
+    # call-seq:
+    #   Autobuild::Importer.fallback { |package, importer| ... }
+    #
+    # If called, registers the given block as a fallback mechanism for failing
+    # imports.
+    #
+    # Fallbacks are tried in reverse order with the failing importer object as
+    # argument. The first valid importer object that has been returned will be
+    # used instead.
+    #
+    # It is the responsibility of the fallback handler to make sure that it does
+    # not do infinite recursions and stuff like that.
+    def self.fallback(&block)
+        @fallback_handlers.unshift(block)
+    end
+
+    class << self
+        # The set of handlers registered by Importer.fallback
+        attr_reader :fallback_handlers
+    end
+
+    @fallback_handlers = Array.new
+
     # Instances of the Importer::Status class represent the status of a current
     # checkout w.r.t. the remote repository.
     class Status
@@ -58,16 +81,22 @@ class Importer
     def import(package)
         srcdir = package.srcdir
         if File.directory?(srcdir)
-            if Autobuild.do_update
-		package.progress "updating %s"
-                update(package)
-                patch(package)
-                package.updated = true
-            else
-		if Autobuild.verbose
-		    puts "  not updating #{package.name}"
-		end
-                return
+            package.isolate_errors(false) do
+                if Autobuild.do_update
+                    package.progress "updating %s"
+                    begin
+                        update(package)
+                        patch(package)
+                        package.updated = true
+                    rescue Exception => e
+                        fallback(e, package, :import, package)
+                    end
+                else
+                    if Autobuild.verbose
+                        puts "  not updating #{package.name}"
+                    end
+                    return
+                end
             end
 
         elsif File.exists?(srcdir)
@@ -78,11 +107,26 @@ class Importer
                 checkout(package)
                 patch(package)
                 package.updated = true
-            rescue Autobuild::Exception
+            rescue Autobuild::Exception => e
+                FileUtils.rm_rf package.srcdir
+                fallback(e, package, :import, package)
+            rescue Exception
                 FileUtils.rm_rf package.srcdir
                 raise
             end
         end
+
+    end
+
+    # Tries to find a fallback importer because of the given error.
+    def fallback(error, package, *args, &block)
+        Importer.fallback_handlers.each do |handler|
+            fallback_importer = handler.call(package, self)
+            if fallback_importer.kind_of?(Importer)
+                return fallback_importer.send(*args, &block)
+            end
+        end
+        raise error
     end
 
     private

data/lib/autobuild/package.rb

@@ -106,6 +106,7 @@ module Autobuild
 	    @provides       = Array.new
             @parallel_build_level = nil
             @statistics     = Hash.new
+            @failures = Array.new
 
 	    if Hash === spec
 		name, depends = spec.to_a.first
@@ -173,12 +174,12 @@ module Autobuild
 
         # Returns true if one of the operations applied on this package failed
         def failed?
-            !!@failure
+            @failed
         end
 
         # If something failed on this package, returns the corresponding
         # exception object. Otherwise, returns nil
-        attr_reader :failure
+        attr_reader :failures
 
         # If Autobuild.ignore_errors is set, an exception raised from within the
         # provided block will be filtered out, only displaying a message instead
@@ -187,13 +188,16 @@ module Autobuild
         # Moreover, the package will be marked as "failed" and isolate_errors
         # will subsequently be a noop. I.e. if +build+ fails, +install+ will do
         # nothing.
-        def isolate_errors
+        def isolate_errors(mark_as_failed = true)
             # Don't do anything if we already have failed
             return if failed?
 
             begin yield
             rescue Exception => e
-                @failure = e
+                @failures << e
+                if mark_as_failed
+                    @failed = true
+                end
 
                 if Autobuild.ignore_errors
                     lines = e.to_s.split("\n")

data/lib/autobuild/packages/cmake.rb

@@ -18,7 +18,10 @@ module Autobuild
             def full_reconfigures?
                 @full_reconfigures
             end
+
+            attr_reader :module_path
         end
+        @module_path = []
         @full_reconfigures = true
 
         # a key => value association of defines for CMake
@@ -114,6 +117,7 @@ module Autobuild
             if File.exists?(cmake_cache)
                 all_defines = defines.dup
                 all_defines['CMAKE_INSTALL_PREFIX'] = prefix
+                all_defines['CMAKE_MODULE_PATH'] = "#{CMake.module_path.join(";")}"
                 cache = File.read(cmake_cache)
                 did_change = all_defines.any? do |name, value|
                     cache_line = cache.each_line.find do |line|
@@ -154,7 +158,8 @@ module Autobuild
                         raise ConfigException, "#{srcdir} contains no CMakeLists.txt file"
                     end
 
-                    command = [ "cmake", "-DCMAKE_INSTALL_PREFIX=#{prefix}" ]
+                    command = [ "cmake", "-DCMAKE_INSTALL_PREFIX=#{prefix}", "-DCMAKE_MODULE_PATH=#{CMake.module_path.join(";")}" ]
+
                     defines.each do |name, value|
                         command << "-D#{name}=#{value}"
                     end

data/lib/autobuild/packages/orogen.rb

@@ -165,6 +165,11 @@ module Autobuild
             end
         end
 
+        class << self
+            attr_accessor :default_type_export_policy
+        end
+        @default_type_export_policy = :used
+
         def self.orogen_bin
             if @orogen_bin
                 @orogen_bin
@@ -319,8 +324,13 @@ module Autobuild
             end
             cmdline << orogen_file
 
-            if (version = Orogen.orogen_version) && (version >= "1.0")
-                cmdline << "--parallel-build=#{parallel_build_level}"
+            if (version = Orogen.orogen_version)
+                if version >= "1.0"
+                    cmdline << "--parallel-build=#{parallel_build_level}"
+                end
+                if version >= "1.1"
+                    cmdline << "--type-export-policy=#{Orogen.default_type_export_policy}"
+                end
             end
 
             progress "generating oroGen project %s"

data/lib/autobuild/reporting.rb

@@ -83,7 +83,7 @@ module Autobuild
                 errors = []
                 Autobuild::Package.each do |name, pkg|
                     if pkg.failed?
-                        errors << pkg.failure
+                        errors.concat(pkg.failures)
                     end
                 end
 

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.5.30" unless defined? Autobuild::VERSION
+    VERSION = "1.5.31" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 1
   - 5
-  - 30
-  version: 1.5.30
+  - 31
+  version: 1.5.31
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 +01:00
+date: 2011-01-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,37 +81,21 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: hoe
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 47
         segments: 
         - 2
+        - 8
         - 0
-        - 4
-        version: 2.0.4
+        version: 2.8.0
   type: :development
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 7
-        - 0
-        version: 2.7.0
-  type: :development
-  version_requirements: *id006
 description: |-
   This work is licensed under the GPLv2 license. See License.txt for details