autobuild 1.5.31 → 1.5.32

data/Changes.txt

@@ -1,16 +1,27 @@
+== Version 1.5.32
+* autobuild importers delete the source directory when
+  initial checkouts fail. They now display a message
+  when they do so to avoid user confusion
+* the Autobuild::Orogen.transports array can be used to
+  configure which transports are generated in orogen
+  packages
+
 == 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
+* 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
-  behaviour can be restored by setting #force_config_status to true on the
-  package.
+* make the autotools handler behave more normally,
+  calling "configure" without --no-create and not
+  calling config.status before make by default. The old
+  behaviour can be restored by setting
+  #force_config_status to true on the package.
 
 == Version 1.5.29
 * added --version

data/lib/autobuild/importer.rb

@@ -111,6 +111,7 @@ class Importer
                 FileUtils.rm_rf package.srcdir
                 fallback(e, package, :import, package)
             rescue Exception
+                package.progress "checkout of %s failed, deleting the source directory #{package.srcdir}"
                 FileUtils.rm_rf package.srcdir
                 raise
             end

data/lib/autobuild/package.rb

@@ -107,6 +107,7 @@ module Autobuild
             @parallel_build_level = nil
             @statistics     = Hash.new
             @failures = Array.new
+            @post_install_blocks = Array.new
 
 	    if Hash === spec
 		name, depends = spec.to_a.first
@@ -279,7 +280,9 @@ module Autobuild
         # Install the result in prefix
         def install
             Dir.chdir(srcdir) do
-                Autobuild.apply_post_install(name, @post_install)
+                @post_install_blocks.each do |b|
+                    Autobuild.apply_post_install(name, b)
+                end
             end
             Autobuild.touch_stamp(installstamp)
             update_environment
@@ -381,9 +384,9 @@ module Autobuild
 
 	def post_install(*args, &block)
 	    if args.empty?
-		@post_install = block
+		@post_install_blocks << block
 	    elsif !block
-		@post_install = args
+		@post_install_blocks << args
 	    else
 		raise ArgumentError, "cannot set both arguments and block"
 	    end

data/lib/autobuild/packages/orogen.rb

@@ -167,8 +167,11 @@ module Autobuild
 
         class << self
             attr_accessor :default_type_export_policy
+            # The list of enabled transports as an array of strings (default: typelib, corba)
+            attr_reader :transports
         end
         @default_type_export_policy = :used
+        @transports = %w{corba typelib}
 
         def self.orogen_bin
             if @orogen_bin
@@ -330,6 +333,7 @@ module Autobuild
                 end
                 if version >= "1.1"
                     cmdline << "--type-export-policy=#{Orogen.default_type_export_policy}"
+                    cmdline << "--transports=#{Orogen.transports.join(",")}"
                 end
             end
 

data/lib/autobuild/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 67
   prerelease: false
   segments: 
   - 1
   - 5
-  - 31
-  version: 1.5.31
+  - 32
+  version: 1.5.32
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 +01:00
+date: 2011-01-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency