autobuild 1.5.60 → 1.5.61

data/Changes.txt

@@ -1,3 +1,7 @@
+== Version 1.5.61
+* orogen: fix regeneration logic. Autobuild would not generate an oroGen project
+  if a type definition file contained in the orogen package changed.
+
 == Version 1.5.60
 * patching: fix some more issues regarding the interaction of patching and VCS:
   * autobuild will now properly remove patches before we try to update

data/lib/autobuild/packages/orogen.rb

@@ -222,8 +222,20 @@ module Autobuild
             # Cache the orogen file name
             @orogen_file ||= self.orogen_file
 
-            file genstamp => File.join(srcdir, orogen_file) do
-                isolate_errors { regen }
+            file genstamp => Autobuild.source_tree(srcdir) do
+                needs_regen = true
+                if File.file?(genstamp)
+                    genstamp_mtime = File.stat(genstamp).mtime
+                    dependency_updated = dependencies.any? do |dep|
+                        !File.file?(Package[dep].installstamp) ||
+                            File.stat(Package[dep].installstamp).mtime > genstamp_mtime
+                    end
+                    needs_regen = dependency_updated || !generation_uptodate?
+                end
+
+                if needs_regen
+                    isolate_errors { regen }
+                end
             end
 
             with_doc
@@ -315,14 +327,7 @@ module Autobuild
 
             # Then, if it has already been built, check what the check-uptodate
             # target says
-            needs_regen ||=
-                if File.directory?(builddir)
-                    Dir.chdir(builddir) do
-                        !system("#{Autobuild.tool('make')} check-uptodate > /dev/null 2>&1")
-                    end
-                else
-                    true
-                end
+            needs_regen ||= !generation_uptodate?
 
             # Finally, verify that orogen itself did not change
             needs_regen ||= (Rake::Task[Orogen.orogen_root].timestamp > Rake::Task[genstamp].timestamp)
@@ -340,6 +345,18 @@ module Autobuild
                 Autobuild.touch_stamp genstamp
             end
         end
+
+	def generation_uptodate?
+	    if !File.file?(genstamp)
+		true
+	    elsif File.file?(File.join(builddir, 'Makefile'))
+	        Dir.chdir(builddir) do
+			system("#{Autobuild.tool('make')} check-uptodate > /dev/null 2>&1")
+	        end
+	    else
+	        true
+	    end
+        end
     end
 end
 

data/lib/autobuild/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  hash: 123
+  hash: 121
   prerelease: 
   segments: 
   - 1
   - 5
-  - 60
-  version: 1.5.60
+  - 61
+  version: 1.5.61
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-28 00:00:00 Z
+date: 2012-02-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake