autobuild 1.7.11.rc4 → 1.7.11.rc5

data/Rakefile

@@ -9,6 +9,8 @@ Utilrb::Rake.hoe do
         self.description = "Collection of classes to handle build systems (CMake, autotools, ...) and import mechanisms (tarballs, CVS, SVN, git, ...). It also offers a Rake integration to import and build such software packages. It is the backbone of the autoproj (http://rock-robotics.org/autoproj) integrated software project management tool."
         self.email = %q{rock-dev@dfki.de}
 
+        license 'BSD'
+
         self.extra_deps <<
             ['rake', '>= 0.9.0'] <<
             ['utilrb', '>= 1.6.0'] <<

data/lib/autobuild/environment.rb

@@ -22,10 +22,6 @@ module Autobuild
     ENV.each do |k, v|
         ORIGINAL_ENV[k] = v
     end
-    ENV_LIST_SEPARATOR =
-        if windows? then ';'
-        else ':'
-        end
     SHELL_VAR_EXPANSION =
         if windows? then "%%%s%%"
         else "$%s"
@@ -55,7 +51,8 @@ module Autobuild
         # List of the environment that should be set before calling a subcommand
         #
         # It is a map from environment variable name to the corresponding value.
-        # If the value is an array, it is joined using the path separator ':'
+        # If the value is an array, it is joined using the operating system's
+        # path separator (File::PATH_SEPARATOR)
         attr_reader :environment
 
         # In generated environment update shell files, indicates whether an
@@ -172,7 +169,7 @@ module Autobuild
 
     def self.env_init_from_env(name)
         if env_inherit?(name) && (parent_env = ORIGINAL_ENV[name])
-            inherited_environment[name] = parent_env.split(ENV_LIST_SEPARATOR)
+            inherited_environment[name] = parent_env.split(File::PATH_SEPARATOR)
         else
             inherited_environment[name] = Array.new
         end
@@ -262,7 +259,7 @@ module Autobuild
 
     def self.env_update_var(name)
         if value = env_value(name)
-            ENV[name] = value.join(ENV_LIST_SEPARATOR)
+            ENV[name] = value.join(File::PATH_SEPARATOR)
         else
             ENV.delete(name)
         end
@@ -336,9 +333,9 @@ module Autobuild
             if !value_with_inheritance
                 shell_line = SHELL_UNSET_COMMAND % [name]
             elsif value_with_inheritance == value_without_inheritance # no inheritance
-                shell_line = SHELL_SET_COMMAND % [name, value_with_inheritance.join(ENV_LIST_SEPARATOR)]
+                shell_line = SHELL_SET_COMMAND % [name, value_with_inheritance.join(File::PATH_SEPARATOR)]
             else
-                shell_line = SHELL_CONDITIONAL_SET_COMMAND % [name, value_with_inheritance.join(ENV_LIST_SEPARATOR), value_without_inheritance.join(ENV_LIST_SEPARATOR)]
+                shell_line = SHELL_CONDITIONAL_SET_COMMAND % [name, value_with_inheritance.join(File::PATH_SEPARATOR), value_without_inheritance.join(File::PATH_SEPARATOR)]
             end
             io.puts shell_line
         end

data/lib/autobuild/tools.rb

@@ -21,6 +21,14 @@ module Autobuild
             programs[name.to_sym] || programs[name.to_s] || name.to_s
         end
 
+        def find_in_path(file)
+            path = ENV['PATH'].split(File::PATH_SEPARATOR).
+                find { |dir| File.exists?(File.join(dir, file)) }
+            if path
+                return File.join(path, file)
+            end
+        end
+
         # Resolves the absolute path to a given tool
         def tool_in_path(name)
             path, path_name, path_env = programs_in_path[name]
@@ -32,11 +40,7 @@ module Autobuild
                     # This is already a full path
                     path = current
                 else
-                    path = ENV['PATH'].split(':').
-                        find { |dir| File.exists?(File.join(dir, current)) }
-                    if path
-                        path = File.join(path, current)
-                    end
+                    path = find_in_path(current)
                 end
 
                 if !path

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.7.11.rc4" unless defined? Autobuild::VERSION
+    VERSION = "1.7.11.rc5" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.7.11.rc4
+  version: 1.7.11.rc5
   prerelease: 7
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -157,7 +157,7 @@ files:
 - .gemtest
 homepage: http://rock-robotics.org/stable/documentation/autoproj
 licenses:
-- MIT
+- BSD
 post_install_message: 
 rdoc_options:
 - --main