autoproj 1.6.2.rc6 → 1.6.2.rc7

data/bin/autoproj

@@ -188,26 +188,26 @@ EOTEXT
     elsif Autoproj::CmdLine.doc?
         Autoproj::CmdLine.build_packages(selected_packages, all_enabled_packages)
     elsif Autoproj::CmdLine.build? 
-        begin
-            Autoproj::CmdLine.build_packages(selected_packages, all_enabled_packages)
+        Autoproj::CmdLine.build_packages(selected_packages, all_enabled_packages)
 
-            # Now, do some sanity checks on the result
-            prefixes = all_enabled_packages.inject(Set.new) do |set, pkg_name|
-                set << Autobuild::Package[pkg_name].prefix
-            end
+        # Now, do some sanity checks on the result
+        prefixes = all_enabled_packages.inject(Set.new) do |set, pkg_name|
+            set << Autobuild::Package[pkg_name].prefix
+        end
 
-            Autoproj.progress
-            Autoproj.progress "checking for undefined symbols in installed libraries", :bold
-            prefixes.each do |prefix|
-                libdir = File.join(prefix, "lib")
-                if File.directory?(libdir)
-                    Autoproj.validate_solib_dependencies(libdir)
-                end
+        Autoproj.progress
+        Autoproj.progress "checking for undefined symbols in installed libraries", :bold
+        prefixes.each do |prefix|
+            libdir = File.join(prefix, "lib")
+            if File.directory?(libdir)
+                Autoproj.validate_solib_dependencies(libdir)
             end
-        ensure
-            Autoproj.export_env_sh
-            STDERR.puts color("autoproj: updated #{Autoproj.root_dir}/env.sh", :green)
         end
     end
+
+    if Autoproj::CmdLine.update_envsh?
+        Autoproj.export_env_sh
+        STDERR.puts color("autoproj: updated #{Autoproj.root_dir}/env.sh", :green)
+    end
 end
 

data/lib/autoproj/cmdline.rb

@@ -417,6 +417,23 @@ module Autoproj
                 end
             end
 
+            begin
+                Autobuild.do_update = false
+                packages = Autobuild::Package.each.
+                    find_all { |pkg_name, pkg| File.directory?(pkg.srcdir) }.
+                    delete_if { |pkg_name, pkg| !all_enabled_packages.include?(pkg_name) || Autoproj.manifest.excluded?(pkg_name) || Autoproj.manifest.ignored?(pkg_name) }
+
+                packages.each do |_, pkg|
+                    pkg.isolate_errors do
+                        pkg.prepare
+                    end
+                end
+
+            ensure
+                Autobuild.do_update = old_update_flag
+            end
+
+
             if Autoproj.verbose
                 Autoproj.progress "autoproj: finished importing packages"
             end
@@ -498,6 +515,7 @@ module Autoproj
         def self.partial_build?; !!@partial_build end
         def self.mail_config; @mail_config || Hash.new end
         def self.update_packages?; @mode == "update" || @mode == "envsh" || build? end
+        def self.update_envsh?; @mode == "envsh" || build? end
         def self.build?; @mode =~ /build/ end
         def self.doc?; @mode == "doc" end
         def self.snapshot?; @mode == "snapshot" end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.6.2.rc6"
+    VERSION = "1.6.2.rc7"
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 6
   - 2
-  - rc6
-  version: 1.6.2.rc6
+  - rc7
+  version: 1.6.2.rc7
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 +02:00
+date: 2010-10-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency