autoproj 1.9.7.rc23 → 1.10.rc1

data/bin/autoproj_bootstrap

@@ -1,7 +1,7 @@
 #! /usr/bin/ruby
 
-if RUBY_VERSION < "1.8.7"
-    STDERR.puts "autoproj requires Ruby >= 1.8.7"
+if RUBY_VERSION < "1.9.2"
+    STDERR.puts "autoproj requires Ruby >= 1.9.2"
     exit 1
 end
 
@@ -639,7 +639,7 @@ fi
                 Autobuild::ORIGINAL_ENV['GEM_PATH'] = orig_gem_path.join(File::PATH_SEPARATOR)
 
                 Autoproj.manifest.each_reused_autoproj_installation do |p|
-                    p_gems = File.join(Autoproj.root_dir, '.gems')
+                    p_gems = File.join(p, '.gems')
                     if File.directory?(p_gems)
                         Autobuild.env_add_path 'GEM_PATH', p_gems
                     end
@@ -2206,8 +2206,7 @@ module Autoproj
         @user_config.has_key?(name)
     end
 
-    def self.load_config
-        config_file = File.join(Autoproj.config_dir, "config.yml")
+    def self.load_config(config_file = File.join(Autoproj.config_dir, "config.yml"))
         if File.exists?(config_file)
             config = YAML.load(File.read(config_file))
             if !config

data/bin/autoproj_bootstrap.in

@@ -1,7 +1,7 @@
 #! /usr/bin/ruby
 
-if RUBY_VERSION < "1.8.7"
-    STDERR.puts "autoproj requires Ruby >= 1.8.7"
+if RUBY_VERSION < "1.9.2"
+    STDERR.puts "autoproj requires Ruby >= 1.9.2"
     exit 1
 end
 

data/lib/autoproj/cmdline.rb

@@ -136,7 +136,7 @@ module Autoproj
             load_autoprojrc
 
             Autoproj.manifest.each_reused_autoproj_installation do |p|
-                Autoproj.manifest.reuse(path)
+                Autoproj.manifest.reuse(p)
             end
 
             # We load the local init.rb first so that the manifest loading
@@ -208,7 +208,7 @@ module Autoproj
 
         def self.update_myself(options = Hash.new)
             options = Kernel.validate_options options,
-                :force => false
+                force: false, restart_on_update: true
             return if !options[:force] && !Autoproj::CmdLine.update_os_dependencies?
 
             handle_ruby_version
@@ -237,7 +237,7 @@ module Autoproj
                 end
 
             # First things first, see if we need to update ourselves
-            if did_update
+            if did_update && options[:restart_on_update]
                 puts
                 Autoproj.message 'autoproj and/or autobuild has been updated, restarting autoproj'
                 puts
@@ -1567,6 +1567,29 @@ where 'mode' is one of:
                 end
             end
 
+            reuse = []
+            parser = lambda do |opt|
+                opt.on '--reuse DIR', 'reuse the given autoproj installation (can be given multiple times)' do |path|
+                    path = File.expand_path(path)
+                    if !File.directory?(path) || !File.directory?(File.join(path, 'autoproj'))
+                        raise ConfigError.new, "#{path} does not look like an autoproj installation"
+                    end
+                    reuse << path
+                end
+            end
+            args = parse_arguments(args, false, &parser)
+            if current_root = ENV['AUTOPROJ_CURRENT_ROOT']
+                # Allow having a current root only if it is being reused
+                if (current_root != Dir.pwd) && !reuse.include?(current_root)
+                    STDERR.puts "the env.sh from #{ENV['AUTOPROJ_CURRENT_ROOT']} seem to already be sourced"
+                    STDERR.puts "start a new shell and try to bootstrap again"
+                    STDERR.puts
+                    STDERR.puts "you are allowed to boostrap from another autoproj installation"
+                    STDERR.puts "only if you reuse it with the --reuse flag"
+                    exit 1
+                end
+            end
+
             Autoproj.root_dir = Dir.pwd
             Autobuild.prefix  = Autoproj.build_dir
             Autobuild.srcdir  = Autoproj.root_dir
@@ -1583,19 +1606,7 @@ where 'mode' is one of:
             end
             osdeps.osdeps_mode
 
-            update_myself :force => true
-
-            reuse = []
-            parser = lambda do |opt|
-                opt.on '--reuse DIR', 'reuse the given autoproj installation (can be given multiple times)' do |path|
-                    path = File.expand_path(path)
-                    if !File.directory?(path) || !File.directory?(File.join(path, 'autoproj'))
-                        raise ConfigError.new, "#{path} does not look like an autoproj installation"
-                    end
-                    reuse << path
-                end
-            end
-            args = parse_arguments(args, false, &parser)
+            update_myself :force => true, :restart_on_update => false
             Autoproj.change_option 'reused_autoproj_installations', reuse, true
             Autoproj.export_env_sh
 

data/lib/autoproj/options.rb

@@ -187,8 +187,7 @@ module Autoproj
         @user_config.has_key?(name)
     end
 
-    def self.load_config
-        config_file = File.join(Autoproj.config_dir, "config.yml")
+    def self.load_config(config_file = File.join(Autoproj.config_dir, "config.yml"))
         if File.exists?(config_file)
             config = YAML.load(File.read(config_file))
             if !config

data/lib/autoproj/osdeps.rb

@@ -512,7 +512,7 @@ fi
                 Autobuild::ORIGINAL_ENV['GEM_PATH'] = orig_gem_path.join(File::PATH_SEPARATOR)
 
                 Autoproj.manifest.each_reused_autoproj_installation do |p|
-                    p_gems = File.join(Autoproj.root_dir, '.gems')
+                    p_gems = File.join(p, '.gems')
                     if File.directory?(p_gems)
                         Autobuild.env_add_path 'GEM_PATH', p_gems
                     end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.7.rc23"
+    VERSION = "1.10.rc1"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.7.rc23
-  prerelease: 6
+  version: 1.10.rc1
+  prerelease: 5
 platform: ruby
 authors:
 - Rock Core Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-15 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild