autoproj 1.9.7.rc2 → 1.9.7.rc3

data/Rakefile

@@ -30,6 +30,8 @@ namespace 'dist' do
         options_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'options.rb'))
         system_code = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'system.rb'))
         osdeps_defaults = File.read(File.join(Dir.pwd, 'lib', 'autoproj', 'default.osdeps'))
+        require 'autobuild'
+        tools_code = File.read(File.join(Autobuild::LIB_DIR, 'autobuild', 'tools.rb'))
         # Filter rubygems dependencies from the OSdeps default. They will be
         # installed at first build
         osdeps = YAML.load(osdeps_defaults)
@@ -44,7 +46,7 @@ namespace 'dist' do
         osdeps_defaults = YAML.dump(osdeps)
         # Since we are using gsub to replace the content in the bootstrap file,
         # we have to quote all \
-        [osdeps_code, options_code, system_code, osdeps_defaults].each do |text|
+        [osdeps_code, options_code, system_code, osdeps_defaults, tools_code].each do |text|
             text.gsub! /\\/, '\\\\\\\\'
         end
 
@@ -52,7 +54,8 @@ namespace 'dist' do
             gsub('OSDEPS_CODE', osdeps_code).
             gsub('OPTIONS_CODE', options_code).
             gsub('SYSTEM_CODE', system_code).
-            gsub('OSDEPS_DEFAULTS', osdeps_defaults)
+            gsub('OSDEPS_DEFAULTS', osdeps_defaults).
+            gsub('TOOLS_CODE', tools_code)
         File.open(File.join(Dir.pwd, 'bin', 'autoproj_bootstrap'), 'w') do |io|
             io.write bootstrap_code
         end

data/bin/autoproj_bootstrap

@@ -53,20 +53,12 @@ end
 # Environment is clean, so just mark it as so unconditionally
 ENV['AUTOPROJ_BOOTSTRAP_IGNORE_NONEMPTY_DIR'] = '1'
 
-needed_gem_home = ENV['AUTOPROJ_GEM_HOME'] || "#{Dir.pwd}/.gems"
-if $LOADED_FEATURES.find { |str| str =~ /bygems/ }
-    if ENV['GEM_HOME'] != needed_gem_home
-        require 'rbconfig'
-        RUBY = RbConfig::CONFIG['RUBY_INSTALL_NAME']
-
-        ENV['GEM_HOME'] = needed_gem_home
-        ENV['GEM_PATH'] = nil
-        exec RUBY, __FILE__, *ARGV
-    end
-end
+gem_home = ENV['AUTOPROJ_GEM_HOME'] || File.join(Dir.pwd, '.gems')
+gem_path = ([gem_home] + Gem.default_path).join(":")
+Gem.paths = Hash['GEM_HOME' => gem_home, 'GEM_PATH' => gem_path]
 
-
-ENV['GEM_HOME'] = needed_gem_home
+ENV['GEM_HOME'] = gem_home
+ENV['GEM_PATH'] = gem_path
 ENV['PATH']     = "#{ENV['GEM_HOME']}/bin:#{ENV['PATH']}"
 
 require 'yaml'
@@ -479,9 +471,7 @@ fi
                 Autobuild.env_add_path 'PATH', "#{gem_home}/bin"
 
                 # Now, reset the directories in our own RubyGems instance
-                if Gem::Specification.respond_to?(:dirs=)
-                    Gem::Specification.dirs = ENV['GEM_PATH'].split(':')
-                end
+                Gem.paths = ENV
             end
 
             # Return the directory in which RubyGems package should be installed
@@ -808,6 +798,14 @@ fi
             "ruby#{RUBY_VERSION.split('.')[0, 2].join("")}"
         end
 
+        def self.autodetect_ruby_program
+            ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']
+            ruby_bindir = RbConfig::CONFIG['bindir']
+            ruby_executable = File.join(ruby_bindir, ruby)
+            Autobuild.programs['ruby'] = ruby_executable
+            ruby_executable
+        end
+
         def self.autodetect_ruby
             self.alias(ruby_version_keyword, "ruby")
         end
@@ -1702,6 +1700,69 @@ So, what do you want ? (all, none or a comma-separated list of: os gem pip)
 end
 
 
+module Autobuild
+    class << self
+	# Configure the programs used by different packages
+        attr_reader :programs
+	# A cache of entries in programs to their resolved full path 
+        #
+        # @return [{String=>[String,String,String]}] the triplet (full path,
+        #   tool name, value of ENV['PATH']). The last two values are used to
+        #   invalidate the cache when needed
+        #
+        # @see tool_in_path
+        attr_reader :programs_in_path
+
+        # Get a given program, using its name as default value. For
+	# instance
+	#   tool('automake') 
+	# will return 'automake' unless the autobuild script defined
+	# another automake program in Autobuild.programs by doing
+	#   Autobuild.programs['automake'] = 'automake1.9'
+        def tool(name)
+            programs[name.to_sym] || programs[name.to_s] || name.to_s
+        end
+
+        # Resolves the absolute path to a given tool
+        def tool_in_path(name)
+            path, path_name, path_env = programs_in_path[name]
+            current = tool(name)
+            if path_env != ENV['PATH'] || path_name != current
+                # Delete the current entry given that it is invalid
+                programs_in_path.delete(name)
+                if current[0, 1] == "/"
+                    # 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
+                end
+
+                if !path
+                    raise ArgumentError, "tool #{name}, set to #{current}, can not be found in PATH=#{path_env}"
+                end
+
+                # Verify that the new value is a file and is executable
+                if !File.file?(path)
+                    raise ArgumentError, "tool #{name} is set to #{current}, but this resolves to #{path} which is not a file"
+                elsif !File.executable?(path)
+                    raise ArgumentError, "tool #{name} is set to #{current}, but this resolves to #{path} which is not executable"
+                end
+                programs_in_path[name] = [path, current, ENV['PATH']]
+            end
+
+            return path
+        end
+    end
+
+    @programs = Hash.new
+    @programs_in_path = Hash.new
+end
+
+
 module Autoproj
     class InputError < RuntimeError; end
 
@@ -2340,6 +2401,7 @@ ENV['AUTOPROJ_OSDEPS_MODE'] = osdeps_mode
 # binary) by setting Autobuild.programs['gem'] to nil
 Autobuild.programs['gem'] = nil
 Autoproj::OSDependencies.autodetect_ruby
+Autoproj::OSDependencies.autodetect_ruby_program
 
 osdeps_management = 
     if ENV['AUTOPROJ_DEFAULT_OSDEPS']
@@ -2376,8 +2438,8 @@ end
 File.open('env.sh', 'w') do |io|
     io.write <<-EOSHELL
 export RUBYOPT=-rubygems
-export GEM_PATH=#{needed_gem_home}:$GEM_PATH
-export GEM_HOME=#{needed_gem_home}
+export GEM_PATH=#{gem_path.join(":")}
+export GEM_HOME=#{gem_home}
 export PATH=$GEM_HOME/bin:$PATH
     EOSHELL
 end

data/bin/autoproj_bootstrap.in

@@ -53,20 +53,12 @@ end
 # Environment is clean, so just mark it as so unconditionally
 ENV['AUTOPROJ_BOOTSTRAP_IGNORE_NONEMPTY_DIR'] = '1'
 
-needed_gem_home = ENV['AUTOPROJ_GEM_HOME'] || "#{Dir.pwd}/.gems"
-if $LOADED_FEATURES.find { |str| str =~ /bygems/ }
-    if ENV['GEM_HOME'] != needed_gem_home
-        require 'rbconfig'
-        RUBY = RbConfig::CONFIG['RUBY_INSTALL_NAME']
+gem_home = ENV['AUTOPROJ_GEM_HOME'] || File.join(Dir.pwd, '.gems')
+gem_path = ([gem_home] + Gem.default_path).join(":")
+Gem.paths = Hash['GEM_HOME' => gem_home, 'GEM_PATH' => gem_path]
 
-        ENV['GEM_HOME'] = needed_gem_home
-        ENV['GEM_PATH'] = nil
-        exec RUBY, __FILE__, *ARGV
-    end
-end
-
-
-ENV['GEM_HOME'] = needed_gem_home
+ENV['GEM_HOME'] = gem_home
+ENV['GEM_PATH'] = gem_path
 ENV['PATH']     = "#{ENV['GEM_HOME']}/bin:#{ENV['PATH']}"
 
 require 'yaml'
@@ -123,6 +115,7 @@ module Autobuild
 end
 
 OSDEPS_CODE
+TOOLS_CODE
 OPTIONS_CODE
 SYSTEM_CODE
 
@@ -147,6 +140,7 @@ ENV['AUTOPROJ_OSDEPS_MODE'] = osdeps_mode
 # binary) by setting Autobuild.programs['gem'] to nil
 Autobuild.programs['gem'] = nil
 Autoproj::OSDependencies.autodetect_ruby
+Autoproj::OSDependencies.autodetect_ruby_program
 
 osdeps_management = 
     if ENV['AUTOPROJ_DEFAULT_OSDEPS']
@@ -183,8 +177,8 @@ end
 File.open('env.sh', 'w') do |io|
     io.write <<-EOSHELL
 export RUBYOPT=-rubygems
-export GEM_PATH=#{needed_gem_home}:$GEM_PATH
-export GEM_HOME=#{needed_gem_home}
+export GEM_PATH=#{gem_path.join(":")}
+export GEM_HOME=#{gem_home}
 export PATH=$GEM_HOME/bin:$PATH
     EOSHELL
 end

data/lib/autoproj/cmdline.rb

@@ -47,10 +47,8 @@ module Autoproj
         end
 
         def self.handle_ruby_version
-            ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']
-            ruby_bindir = RbConfig::CONFIG['bindir']
+            @ruby_executable = Autoproj::OSDependencies.autodetect_ruby_program
 
-            @ruby_executable = File.join(ruby_bindir, ruby)
             if Autoproj.has_config_key?('ruby_executable')
                 expected = Autoproj.user_config('ruby_executable')
                 if expected != ruby_executable
@@ -58,7 +56,6 @@ module Autoproj
                 end
             end
             Autoproj.change_option('ruby_executable', ruby_executable, true)
-            Autobuild.programs['ruby'] = ruby_executable
 
             install_suffix = ""
             if match = /ruby(.*)$/.match(ruby)

data/lib/autoproj/osdeps.rb

@@ -355,9 +355,7 @@ fi
                 Autobuild.env_add_path 'PATH', "#{gem_home}/bin"
 
                 # Now, reset the directories in our own RubyGems instance
-                if Gem::Specification.respond_to?(:dirs=)
-                    Gem::Specification.dirs = ENV['GEM_PATH'].split(':')
-                end
+                Gem.paths = ENV
             end
 
             # Return the directory in which RubyGems package should be installed
@@ -684,6 +682,14 @@ fi
             "ruby#{RUBY_VERSION.split('.')[0, 2].join("")}"
         end
 
+        def self.autodetect_ruby_program
+            ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']
+            ruby_bindir = RbConfig::CONFIG['bindir']
+            ruby_executable = File.join(ruby_bindir, ruby)
+            Autobuild.programs['ruby'] = ruby_executable
+            ruby_executable
+        end
+
         def self.autodetect_ruby
             self.alias(ruby_version_keyword, "ruby")
         end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.7.rc2"
+    VERSION = "1.9.7.rc3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.7.rc2
+  version: 1.9.7.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild