autoproj 1.9.0.rc6 → 1.9.0.rc7

data/bin/autoproj

@@ -257,6 +257,7 @@ EOTEXT
     # build the list of packages that have actually been selected on the command
     # line.
     all_enabled_packages = Autoproj::CmdLine.import_packages(selected_packages)
+    Autoproj::CmdLine.load_all_available_package_manifests
 
     if Autoproj::CmdLine.update_os_dependencies? && !all_enabled_packages.empty?
         begin

data/bin/autoproj_bootstrap

@@ -1808,7 +1808,7 @@ module Autoproj
     def self.export_env_sh(subdir = nil)
         # Make sure that we have the environment of all selected packages
         if Autoproj.manifest # we don't have a manifest if we are bootstrapping
-            Autoproj.manifest.all_selected_packages.each do |pkg_name|
+            Autoproj.manifest.all_selected_packages(false).each do |pkg_name|
                 Autobuild::Package[pkg_name].update_environment
             end
         end

data/lib/autoproj/autobuild.rb

@@ -107,7 +107,7 @@ module Autobuild
             end
             @os_packages |= pkg_os.to_set
         rescue Autoproj::OSDependencies::MissingOSDep
-            Autoproj.manifest.add_exclusion(self.name, "the #{name} osdep is not available on this operating system")
+            Autoproj.manifest.add_exclusion(self.name, "it depends on #{name}, which is neither the name of a source package, nor an osdep that is available on this operating system")
         end
 
         def depends_on_os_package(name)

data/lib/autoproj/cmdline.rb

@@ -43,6 +43,11 @@ module Autoproj
 
     module CmdLine
         def self.initialize
+            if defined? Encoding # This is a 1.9-only thing
+                Encoding.default_internal = Encoding::UTF_8
+                Encoding.default_external = Encoding::UTF_8
+            end
+
             Autobuild::Reporting << Autoproj::Reporter.new
             if mail_config[:to]
                 Autobuild::Reporting << Autobuild::MailReporter.new(mail_config)
@@ -376,6 +381,23 @@ module Autoproj
             Autoproj.save_config
         end
 
+        # This is a bit of a killer. It loads all available package manifests,
+        # but simply warns in case of errors. The reasons for that is that the
+        # only packages that should really block the current processing are the
+        # ones that are selected on the command line
+        def self.load_all_available_package_manifests
+            # Load the manifest for packages that are already present on the
+            # file system
+            manifest.packages.each_value do |pkg|
+                if File.directory?(pkg.autobuild.srcdir)
+                    begin
+                        manifest.load_package_manifest(pkg.autobuild.name)
+                    rescue Exception => e
+                        Autoproj.warn "cannot load package manifest for #{pkg.autobuild.name}: #{e.message}"
+                    end
+                end
+            end
+        end
 
         def self.display_configuration(manifest, package_list = nil)
             # Load the manifest for packages that are already present on the
@@ -1760,13 +1782,7 @@ where 'mode' is one of:
             Autoproj::CmdLine.setup_all_package_directories
             Autoproj::CmdLine.finalize_package_setup
 
-            # Load the manifest for packages that are already present on the
-            # file system
-            manifest.packages.each_value do |pkg|
-                if File.directory?(pkg.autobuild.srcdir)
-                    manifest.load_package_manifest(pkg.autobuild.name)
-                end
-            end
+            load_all_available_package_manifests
             remaining_arguments
         end
 

data/lib/autoproj/manifest.rb

@@ -1897,9 +1897,9 @@ module Autoproj
         end
 
         # Returns the set of packages that are selected by the layout
-        def all_selected_packages
+        def all_selected_packages(validate = true)
             result = Set.new
-            root = default_packages.packages.to_set
+            root = default_packages(validate).packages.to_set
             root.each do |pkg_name|
                 Autobuild::Package[pkg_name].all_dependencies(result)
             end

data/lib/autoproj/system.rb

@@ -148,7 +148,7 @@ module Autoproj
     def self.export_env_sh(subdir = nil)
         # Make sure that we have the environment of all selected packages
         if Autoproj.manifest # we don't have a manifest if we are bootstrapping
-            Autoproj.manifest.all_selected_packages.each do |pkg_name|
+            Autoproj.manifest.all_selected_packages(false).each do |pkg_name|
                 Autobuild::Package[pkg_name].update_environment
             end
         end

data/lib/autoproj/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.0.rc6
+  version: 1.9.0.rc7
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: &11142600 !ruby/object:Gem::Requirement
+  requirement: &10775160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *11142600
+  version_requirements: *10775160
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &11142140 !ruby/object:Gem::Requirement
+  requirement: &10828400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *11142140
+  version_requirements: *10828400
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &11141700 !ruby/object:Gem::Requirement
+  requirement: &10826800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *11141700
+  version_requirements: *10826800
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &11141260 !ruby/object:Gem::Requirement
+  requirement: &10825800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *11141260
+  version_requirements: *10825800
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &11140820 !ruby/object:Gem::Requirement
+  requirement: &10824720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *11140820
+  version_requirements: *10824720
 description: autoproj is a manager for sets of software packages. It allows the user
   to import and build packages from source, still using the underlying distribution's
   native package manager for software that is available on it.