autoproj 1.1.2 → 1.1.3

data/History.txt

@@ -1,7 +1,14 @@
+= Version 1.1.3
+ * fix --reconfigure on installations where the main configuration is managed by
+   a VCS
+ * fix: env.sh where updated on "status" or "doc", which made them invalid
+ * shut up the "lsb_release: command not found" message during bootstrapping
+ * fix restartig the autoproj_bootstrap script after a failed attempt
+
 = Version 1.1.2
  * fix version detection on Debian, lsb-release cannot be trusted there.
  * update already installed Gem
- * update autobuild and autoproj themselves if needed
+ * make autoproj update himself, as well as autobuild
 
 = Version 1.1.1
  * better general error reporting

data/bin/autoproj

@@ -182,6 +182,7 @@ def do_bootstrap(*args)
     if File.exists?(File.join("autoproj", "manifest"))
         raise ConfigError, "this installation is already bootstrapped. Remove the autoproj directory if it is not the case"
     end
+    Autobuild.logdir = File.join('build', 'log')
 
     if args.empty? # no argument, simply add a manifest template
         sample_dir = File.expand_path(File.join("..", "samples"), File.dirname(__FILE__))
@@ -558,11 +559,13 @@ begin
             Autobuild.do_update = old_update_flag
         end
 
-        all_env_sh << name
-        Autoproj.export_env_sh(name)
+        if mode == "build"
+            all_env_sh << name
+            Autoproj.export_env_sh(name)
+        end
     end
 
-    if mode == "build"
+    if !all_env_sh.empty?
         STDERR.puts <<-EOTEXT
 
 

data/doc/guide/src/autoproj_bootstrap

@@ -21,6 +21,12 @@ module Autoproj
 end
 
 module Autobuild
+    def self.do_update
+        true
+    end
+    def self.progress(str)
+        STDERR.puts "  #{str}"
+    end
     module Subprocess
         def self.run(name, phase, *cmd)
             `#{cmd.join(" ")}`
@@ -88,8 +94,10 @@ module Autoproj
         end
 
         def os_from_lsb
-            distributor = `lsb_release -i -s`
+            has_lsb_release = `which lsb_release`
             return unless $?.success?
+
+            distributor = `lsb_release -i -s`
             distributor = distributor.chomp.downcase
             codename    = `lsb_release -c -s`.chomp.downcase
             version     = `lsb_release -r -s`.chomp.downcase

data/lib/autoproj/options.rb

@@ -78,11 +78,13 @@ module Autoproj
 
     def self.user_config(key)
         value, seen = @user_config[key]
+        # All non-user options are always considered as "seen"
+        seen ||= !@declared_options.has_key?(key)
 
         if value.nil? || (!seen && Autoproj.reconfigure?)
             value = configure(key)
         else
-            if !seen && @declared_options[key]
+            if !seen
                 STDERR.puts "  #{@declared_options[key].doc}: #{value}"
                 @user_config[key] = [value, true]
             end

data/lib/autoproj/osdeps.rb

@@ -54,8 +54,10 @@ module Autoproj
         end
 
         def os_from_lsb
-            distributor = `lsb_release -i -s`
+            has_lsb_release = `which lsb_release`
             return unless $?.success?
+
+            distributor = `lsb_release -i -s`
             distributor = distributor.chomp.downcase
             codename    = `lsb_release -c -s`.chomp.downcase
             version     = `lsb_release -r -s`.chomp.downcase

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.1.2"
+    VERSION = "1.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors: 
 - Sylvain Joyeux