autobuild 1.3.2 → 1.3.3

data/Changes.txt

@@ -1,3 +1,9 @@
+== Version 1.3.3
+* fix: changing Orogen.corba now affects packages that have already been
+  declared but for which the #corba attribute has not been set explicitely to
+  true or false.
+* fix issues with the parsing of codel requirement in the genom package handler
+
 == Version 1.3.2
 * fix stupid issues with the genom package
 * import caller's environment instead of erasing it.

data/lib/autobuild.rb

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

data/lib/autobuild/packages/genom.rb

@@ -43,18 +43,31 @@ module Autobuild
         def get_requires
 	    apionly = genomflags.find { |f| f == '-a' }
             cpp = Autobuild.tool(:cpp)
+            currentBuffer = nil
             Open3.popen3("#{cpp} #{cpp_options.join(" ")} #{srcdir}/#{name}.gen") do |cin, out, err|
-                out.each_line { |line|
-                    if line =~ /^\s*(codels_)?requires\s*:\s*([\w\-]+(?:\s*,\s*[\w\-]+)*);/
-			# Remove the codels_requires lines if -a is given to genom
-			unless $1 == "codels_" && apionly
-			    $2.split(/,/).each { |name| depends_on name.strip }
-			end
-                    elsif line =~ /^\s*(?:codels_)?requires/
-			# Check that the regexp is not too strict
-                        STDERR.puts "failed to match #{line}"
+                out.each_line do |line|
+                    if line =~ /^\s*(codels_)?requires\s*:.*,$/
+                        currentBuffer = line
+                    elsif currentBuffer
+                        currentBuffer += line
+                        if currentBuffer =~ /^\s*(codels_)?requires\s*:\s*(\"?\s*[\w\-=><0-9.\s]+\s*\"?(?:\s*,\s*\"?\s*[\w\-=><0-9.\s]+\s*\"?)*);/
+                            # Remove the codels_requires lines if -a is given to genom
+                            unless $1 == "codels_" && apionly
+                                $2.split(/,/).each do |name|
+                                    if name.strip =~ /\s*\"?\s*([\w\-]+)\s*[<=>]+\s*[0-9.]+\s*\"?\s*/
+                                        depends_on $1
+                                    else
+                                        depends_on name.strip
+                                    end
+                                end
+                            end
+                            currentBuffer = nil
+                        elsif currentBuffer =~ /^\s*(?:codels_)?requires.*;$/
+                            # Check that the regexp is not too strict
+                            STDERR.puts "failed to match #{currentBuffer}"
+                        end
                     end
-                }
+                end
             end
         end
 

data/lib/autobuild/packages/orogen.rb

@@ -138,7 +138,10 @@ module Autobuild
 
         attr_reader :orogen_spec
 
-        attr_accessor :corba
+        attr_writer :corba
+        def corba
+            @corba || (@corba.nil? && Orogen.corba)
+        end
 
         attr_accessor :orogen_file
         def initialize(*args, &config)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-16 00:00:00 +02:00
+date: 2009-10-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency