autobuild 1.4.0 → 1.4.1

data/Rakefile

@@ -17,7 +17,7 @@ Hoe.spec 'autobuild' do
 end
 
 Rake.clear_tasks(/publish_docs/)
-task 'publish_docs' => 'doc' do
+task 'publish_docs' => 'docs' do
     if !system('./update_github')
         raise "cannot update the gh-pages branch for GitHub"
     end

data/lib/autobuild.rb

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

data/lib/autobuild/environment.rb

@@ -13,7 +13,7 @@ module Autobuild
     def self.env_add(name, *values)
         set = if environment.has_key?(name)
                   environment[name]
-              else
+              elsif ENV[name]
                   ENV[name].split(':')
               end
 

data/lib/autobuild/package.rb

@@ -255,7 +255,7 @@ module Autobuild
         # and installed.
 	def depends_on(*packages)
 	    packages.each do |p|
-		p = p.to_s
+		p = p.to_str
 		next if p == name
 		unless Package[p]
 		    raise ConfigException.new(name), "package #{p} not defined"
@@ -271,7 +271,7 @@ module Autobuild
         # listed in +packages+ are aliases for this package.
 	def provides(*packages)
 	    packages.each do |p|
-		p = p.to_s
+		p = p.to_str
 		next if p == name
 		@@provides[p] = self 
 		task p => name

data/lib/autobuild/packages/orogen.rb

@@ -49,23 +49,16 @@ module Autobuild
             end
         end
 
-        def self.orocos_target
-            user_target = ENV['OROCOS_TARGET']
-            if @orocos_target
-                @orocos_target.dup
-            elsif user_target && !user_target.empty?
-                user_target
-            else
-                'gnulinux'
-            end
-        end
-
         attr_reader :project_name, :dependencies, :provides
-        def self.load(file)
-            FakeOrogenEnvironment.new.load(file)
+        def self.load(pkg, file)
+            FakeOrogenEnvironment.new(pkg).load(file)
         end
 
-        def initialize
+        # The Autobuild::Orogen instance we are working for
+        attr_reader :pkg
+
+        def initialize(pkg)
+            @pkg = pkg
             @dependencies = Array.new
             @provides = Array.new
         end
@@ -84,12 +77,12 @@ module Autobuild
             nil
         end
         def using_toolkit(*names)
-            names = names.map { |n| "#{n}-toolkit-#{FakeOrogenEnvironment.orocos_target}" }
+            names = names.map { |n| "#{n}-toolkit-#{pkg.orocos_target}" }
             @dependencies.concat(names)
             nil
         end
         def using_task_library(*names)
-            names = names.map { |n| "#{n}-tasks-#{FakeOrogenEnvironment.orocos_target}" }
+            names = names.map { |n| "#{n}-tasks-#{pkg.orocos_target}" }
             @dependencies.concat(names)
             nil
         end
@@ -136,6 +129,27 @@ module Autobuild
             attr_accessor :corba
         end
 
+        @orocos_target = nil
+        def self.orocos_target
+            user_target = ENV['OROCOS_TARGET']
+            if @orocos_target
+                @orocos_target.dup
+            elsif user_target && !user_target.empty?
+                user_target
+            else
+                'gnulinux'
+            end
+        end
+
+        attr_writer :orocos_target
+        def orocos_target
+            if @orocos_target.nil?
+                Orogen.orocos_target
+            else
+                @orocos_target
+            end
+        end
+
         attr_reader :orogen_spec
 
         attr_writer :corba
@@ -148,6 +162,7 @@ module Autobuild
             @corba       = Orogen.corba
             super
 
+            @orocos_target = nil
             @orogen_file ||= "#{File.basename(name)}.orogen"
         end
 
@@ -162,9 +177,9 @@ module Autobuild
         def import
             super
 
-            @orogen_spec = FakeOrogenEnvironment.load(File.join(srcdir, orogen_file))
-            provides "pkgconfig/#{orogen_spec.project_name}-toolkit-#{FakeOrogenEnvironment.orocos_target}"
-            provides "pkgconfig/#{orogen_spec.project_name}-tasks-#{FakeOrogenEnvironment.orocos_target}"
+            @orogen_spec = FakeOrogenEnvironment.load(self, File.join(srcdir, orogen_file))
+            provides "pkgconfig/#{orogen_spec.project_name}-toolkit-#{orocos_target}"
+            provides "pkgconfig/#{orogen_spec.project_name}-tasks-#{orocos_target}"
             orogen_spec.provides.each do |name|
                 provides name
             end
@@ -173,6 +188,15 @@ module Autobuild
         def prepare
             super
 
+            # Check if someone provides the pkgconfig/orocos-rtt-TARGET package,
+            # and if so add it into our dependency list
+            if rtt = Autobuild::Package["pkgconfig/orocos-rtt-#{orocos_target}"]
+                if Autobuild.verbose
+                    STDERR.puts "orogen: found #{rtt.name} which provides the RTT"
+                end
+                depends_on rtt.name
+            end
+
             # If required, load the component's specification and add
             # dependencies based on the orogen specification.
             orogen_spec.dependencies.each do |pkg_name|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors: 
 - Sylvain Joyeux