autobuild 1.2.12 → 1.2.13

data/lib/autobuild.rb

@@ -3,6 +3,6 @@ require 'autobuild/reporting'
 require 'autobuild/package'
 
 module Autobuild
-    VERSION = "1.2.12" unless defined? Autobuild::VERSION
+    VERSION = "1.2.13" unless defined? Autobuild::VERSION
 end
 

data/lib/autobuild/packages/cmake.rb

@@ -72,7 +72,7 @@ module Autobuild
             all_defines['CMAKE_INSTALL_PREFIX'] = prefix
 
             if !File.exists?( File.join(builddir, 'Makefile') )
-                FileUtils.rm configurestamp
+                FileUtils.rm_f configurestamp
             end
 
             if File.exists?(configurestamp)
@@ -96,7 +96,7 @@ module Autobuild
                     if Autobuild.debug
                         puts "CMake configuration changed, forcing a reconfigure"
                     end
-                    FileUtils.rm configurestamp
+                    FileUtils.rm_f configurestamp
                 end
             end
         end

data/lib/autobuild/packages/orogen.rb

@@ -18,9 +18,12 @@ module Autobuild
             @orogen_file ||= "#{File.basename(name)}.orogen"
 
             # Find out where orogen is, and make sure the configurestamp depend
-            # on it
+            # on it. Ignore if orogen is too old to have a --base-dir option
             orogen_root = File.join(`orogen --base-dir`.chomp, 'orogen')
-            file genstamp => Autobuild.source_tree(orogen_root)
+            if !orogen_root.empty?
+                file genstamp => Autobuild.source_tree(orogen_root)
+            end
+
             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.2.12
+  version: 1.2.13
 platform: ruby
 authors: 
 - Sylvain Joyeux