autoproj 1.6.0.rc1 → 1.6.0.rc2

data/doc/guide/src/autoproj_bootstrap

@@ -5,7 +5,7 @@ if RUBY_VERSION < "1.8.7"
     exit 1
 end
 
-needed_gem_home = "#{Dir.pwd}/.gems"
+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'
@@ -565,8 +565,9 @@ module Autoproj
                     puts
                 end
 
-                if automatic_osdeps_mode == ASK
-                    print "Should I install these packages ? [yes] "
+                if automatic_osdeps_mode == ASK && (os_def || !gems.empty?)
+                    if !os_def
+                        print "Should I install these packages ? [yes] "
                     STDOUT.flush
                     do_osdeps = nil
                     while do_osdeps.nil?
@@ -848,7 +849,7 @@ end
 File.open('env.sh', 'w') do |io|
     io.write <<-EOSHELL
 export RUBYOPT=-rubygems
-export GEM_HOME=#{Dir.pwd}/.gems
+export GEM_HOME=#{needed_gem_home}
 export PATH=$GEM_HOME/bin:$PATH
     EOSHELL
 end

data/lib/autoproj/cmdline.rb

@@ -934,7 +934,8 @@ manifest_source:
             # Check if we are being called from another GEM_HOME. If it is the case,
             # assume that we are bootstrapping from another installation directory and
             # start by copying the .gems directory
-            if ENV['GEM_HOME'] && ENV['GEM_HOME'] =~ /\.gems\/?$/ && ENV['GEM_HOME'] != File.join(Dir.pwd, ".gems")
+            needed_gem_home = Autoproj.gem_home
+            if ENV['GEM_HOME'] && ENV['GEM_HOME'] =~ /\.gems\/?$/ && ENV['GEM_HOME'] != needed_gem_home
                 Autoproj.progress "autoproj: reusing bootstrap from #{File.dirname(ENV['GEM_HOME'])}"
                 FileUtils.cp_r ENV['GEM_HOME'], ".gems"
                 ENV['GEM_HOME'] = File.join(Dir.pwd, ".gems")
@@ -974,7 +975,7 @@ manifest_source:
             File.open('env.sh', 'w') do |io|
                 io.write <<-EOSHELL
         export RUBYOPT=-rubygems
-        export GEM_HOME=#{Dir.pwd}/.gems
+        export GEM_HOME=#{Autoproj.gem_home}
         export PATH=$GEM_HOME/bin:$PATH
                 EOSHELL
             end

data/lib/autoproj/osdeps.rb

@@ -479,8 +479,9 @@ module Autoproj
                     puts
                 end
 
-                if automatic_osdeps_mode == ASK
-                    print "Should I install these packages ? [yes] "
+                if automatic_osdeps_mode == ASK && (os_def || !gems.empty?)
+                    if !os_def
+                        print "Should I install these packages ? [yes] "
                     STDOUT.flush
                     do_osdeps = nil
                     while do_osdeps.nil?

data/lib/autoproj/system.rb

@@ -79,7 +79,7 @@ module Autoproj
 
     # Return the directory in which RubyGems package should be installed
     def self.gem_home
-        File.join(root_dir, ".gems")
+        ENV['AUTOPROJ_GEM_HOME'] || File.join(root_dir, ".gems")
     end
 
     # Find the given program in PATH. It raises ArgumentError if the program

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.6.0.rc1"
+    VERSION = "1.6.0.rc2"
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 6
   - 0
-  - rc1
-  version: 1.6.0.rc1
+  - rc2
+  version: 1.6.0.rc2
 platform: ruby
 authors: 
 - Sylvain Joyeux