autobuild 1.5.21 → 1.5.22

data/Changes.txt

@@ -1,3 +1,8 @@
+== Version 1.5.22
+* minor change to #env_add_path. The provided directory is not filtered out
+  anymore if it does not exist, to avoid the API user to *have* to call it
+  *after* the packages have been installed
+
 == Version 1.5.21
 * add an argument to status() to avoid using the network (for importers that can
   do that, i.e. git)

data/lib/autobuild/environment.rb

@@ -44,15 +44,14 @@ module Autobuild
     end
 
     def self.env_add_path(name, path, *paths)
-        if File.directory?(path)
-            oldpath = environment[name]
-            if !oldpath || !oldpath.include?(path)
-                env_add(name, path)
-                if name == 'RUBYLIB'
-                    $LOAD_PATH.unshift path
-                end
+        oldpath = environment[name]
+        if !oldpath || !oldpath.include?(path)
+            env_add(name, path)
+            if name == 'RUBYLIB'
+                $LOAD_PATH.unshift path
             end
         end
+
         if !paths.empty?
             env_add_path(name, *paths)
         end
@@ -70,15 +69,19 @@ module Autobuild
 
     # Updates the environment when a new prefix has been added
     def self.update_environment(newprefix)
-        env_add_path('PATH', "#{newprefix}/bin")
-        env_add_path('PKG_CONFIG_PATH', "#{newprefix}/lib/pkgconfig")
-        if File.directory?("#{newprefix}/lib") && !Dir.glob("#{newprefix}/lib/*.so").empty?
+        if File.directory?("#{newprefix}/bin")
+            env_add_path('PATH', "#{newprefix}/bin")
+        end
+        if File.directory?("#{newprefix}/lib/pkgconfig")
+            env_add_path('PKG_CONFIG_PATH', "#{newprefix}/lib/pkgconfig")
+        end
+        if File.directory?("#{newprefix}/lib") && !Dir.glob("#{newprefix}/lib/lib*.so").empty?
             env_add_path('LD_LIBRARY_PATH', "#{newprefix}/lib")
         end
 
         # Validate the new rubylib path
         new_rubylib = "#{newprefix}/lib"
-        if !File.directory?(File.join(new_rubylib, "ruby")) && !Dir["#{new_rubylib}/**/*.rb"].empty?
+        if File.directory?(new_rubylib) && !File.directory?(File.join(new_rubylib, "ruby")) && !Dir["#{new_rubylib}/**/*.rb"].empty?
             env_add_path('RUBYLIB', new_rubylib)
         end
 
@@ -87,7 +90,11 @@ module Autobuild
         candidates = %w{rubylibdir archdir sitelibdir sitearchdir vendorlibdir vendorarchdir}.
             map { |key| Config::CONFIG[key] }.
             map { |path| path.gsub(/.*lib(?:32|64)?\/(\w*ruby\/)/, '\\1') }.
-            each { |subdir| env_add_path("RUBYLIB", "#{newprefix}/lib/#{subdir}") }
+            each do |subdir|
+                if File.directory?("#{newprefix}/lib/#{subdir}")
+                    env_add_path("RUBYLIB", "#{newprefix}/lib/#{subdir}")
+                end
+            end
     end
 end
 

data/lib/autobuild/package.rb

@@ -209,10 +209,14 @@ module Autobuild
 
             # Add the dependencies declared in spec
             depends_on *@spec_dependencies if @spec_dependencies
+            update_environment
+        end
 
-            if File.directory?(prefix)
-                Autobuild.update_environment prefix
-            end
+        # Called to set/update all environment variables at import and after
+        # install time
+        def update_environment
+            super if defined? super
+            Autobuild.update_environment prefix
         end
 
         # Create all the dependencies required to reconfigure and/or rebuild the
@@ -265,7 +269,7 @@ module Autobuild
                 Autobuild.apply_post_install(name, @post_install)
             end
             Autobuild.touch_stamp(installstamp)
-            Autobuild.update_environment prefix
+            update_environment
         end
 
         def run(*args, &block)

data/lib/autobuild/packages/orogen.rb

@@ -231,9 +231,18 @@ module Autobuild
             orogen_spec.provides.each do |name|
                 provides name
             end
+        end
 
-            Autobuild.env_add_path 'TYPELIB_RUBY_PLUGIN_PATH', File.join(prefix, 'share', 'typelib', 'ruby')
-            Autobuild.env_add_path 'OROCOS_ROBY_PLUGIN_PATH',  File.join(prefix, 'share', 'orocos', 'roby')
+        def update_environment
+            super
+            typelib_plugin = File.join(prefix, 'share', 'typelib', 'ruby')
+            if File.directory?(typelib_plugin)
+                Autobuild.env_add_path 'TYPELIB_RUBY_PLUGIN_PATH', typelib_plugin
+            end
+            roby_plugin = File.join(prefix, 'share', 'orocos', 'roby')
+            if File.directory?(roby_plugin)
+                Autobuild.env_add_path 'OROCOS_ROBY_PLUGIN_PATH',  roby_plugin
+            end
         end
 
         def prepare

data/lib/autobuild/version.rb

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

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  hash: 41
   prerelease: false
   segments: 
   - 1
   - 5
-  - 21
-  version: 1.5.21
+  - 22
+  version: 1.5.22
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 +02:00
+date: 2010-11-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         - 7
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
@@ -57,7 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 0
         - 0
@@ -72,7 +68,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
         segments: 
         - 1
         - 3
@@ -88,7 +83,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 2
         - 0
@@ -104,7 +98,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 2
         - 6
@@ -196,7 +189,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -205,7 +197,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"