autoproj 1.7.11 → 1.7.12.rc1

data/History.txt

@@ -1,3 +1,65 @@
+= Version 1.7.12
+ * improved some error messages
+ * fixed error if config.yml is empty
+ * fixed issues with implicitly selecting ignored or excluded packages on the
+   command line
+ * added metapackage support. One can now "group" packages under a certain name,
+   said name being used in the manifest' layout, exclude_packgaes and/or
+   ignore_packages.
+
+   This is used in the autobuild files with
+
+      metapackage 'name', 'package1', 'package2', ...
+
+   The "default" metapackage, i.e. the list of packages that are selected when a
+   package set name is used in layout/exclude/ignore, can also be configured
+   with
+
+      default_packages 'package1', 'package2', ...
+
+   When a package set 'pkg_set' is created, two metapackages are created:
+
+     pkg_set
+     pkg_set.all
+
+   The first one is configurable with default_packages, while the second one
+   always lists all packages directly defined in pkg_set
+
+ * added support for custom source handlers. Custom source handlers are a way to
+   declare shortcuts for importers.
+
+   For instance,
+   
+     Autoproj.gitorious_server_configuration('SPACEGIT', 'spacegit.dfki.uni-bremen.de')
+
+   defines a special 'spacegit' handler, and one can now do, in its source.yml,
+
+     version_control:
+        - my/package:
+          spacegit: imoby/scripts
+
+   The version control is then transparently expanded by autoproj to
+
+        - my/package:
+          type: git
+          url: git://spacegit.dfki.uni-bremen.de/imoby/scripts.git
+          push_to: git@spacegit.dfki.uni-bremen.de:imoby/scripts.git
+
+   These custom handlers can be used everywhere a version control specification
+   is required. They can be defined with Autoproj.add_source_handler (see the
+   API documentation)
+
+ * fix CVS support. This requires autobuild >= 1.5.42. The syntax in source.yml
+   is
+
+      type: cvs
+      url: <URL of the CVSROOT>
+      module: module_name
+      cvsup: ['options', 'for', 'cvsup']
+      cvsco: ['options', 'for', 'cvsco']
+
+   The default options for cvs up and cvs co are resp. -dP and -d.
+
 = Version 1.7.11
  * loads of fixes related to ignore_packages
    - fix ignored packages being built if a package depends on them

data/bin/autolocate

@@ -62,6 +62,15 @@ if candidates.empty?
     end
 end
 
+if candidates.size > 1
+    # If there is more than one candidate, check if there are some that are not
+    # present on disk
+    present = candidates.find_all { |dir| File.directory?(dir) }
+    if present.size == 1
+        candidates = present
+    end
+end
+
 if candidates.empty?
     STDERR.puts Autoproj.console.color("cannot find #{selection} in the current autoproj installation", :bold, :red)
     exit 1

data/bin/autoproj

@@ -104,6 +104,16 @@ EOTEXT
     end
 
     Autoproj::CmdLine.setup_all_package_directories
+    # resolve_user_selection auto-adds packages present on disk but not listed
+    # in the manifest. However, since we have not yet loaded overrides /
+    # package blocks, it is possible that it contains excluded / ignored
+    # packages
+    #
+    # First do the resolution to get auto-add, finalize the package
+    # configuration, and then re-resolve
+    Autoproj::CmdLine.resolve_user_selection(selected_packages)
+    # Now load the rest of the configuration, and filter out exclusions
+    Autoproj::CmdLine.finalize_package_setup
     resolved_selected_packages = Autoproj::CmdLine.resolve_user_selection(selected_packages)
     if !selected_packages.empty?
         command_line_selection = resolved_selected_packages.dup
@@ -112,7 +122,6 @@ EOTEXT
     end
     Autoproj.manifest.explicit_selection = resolved_selected_packages
     selected_packages = resolved_selected_packages
-    Autoproj::CmdLine.finalize_package_setup
 
     # If in verbose mode, or if we only update sources, list the sources
     if Autoproj.verbose || Autoproj::CmdLine.display_configuration?

data/bin/autoproj_bootstrap

@@ -254,17 +254,21 @@ module Autoproj
         # one.
         #
         # Examples: ['debian', ['sid', 'unstable']] or ['ubuntu', ['lucid lynx', '10.04']]
-        def self.operating_system
-            if !@operating_system.nil?
-                return @operating_system
-            elsif Autoproj.has_config_key?('operating_system')
-                os = Autoproj.user_config('operating_system')
-		if os.respond_to?(:to_ary)
-		    if os[0].respond_to?(:to_ary) && os[0].all? { |s| s.respond_to?(:to_str) } &&
-		       os[1].respond_to?(:to_ary) && os[1].all? { |s| s.respond_to?(:to_str) }
-		       @operating_system = os
-                       return os
-		    end
+        def self.operating_system(options = Hash.new)
+            options = Kernel.validate_options options, :force => false
+
+            if !options[:force]
+                if !@operating_system.nil?
+                    return @operating_system
+                elsif Autoproj.has_config_key?('operating_system')
+                    os = Autoproj.user_config('operating_system')
+                    if os.respond_to?(:to_ary)
+                        if os[0].respond_to?(:to_ary) && os[0].all? { |s| s.respond_to?(:to_str) } &&
+                           os[1].respond_to?(:to_ary) && os[1].all? { |s| s.respond_to?(:to_str) }
+                           @operating_system = os
+                           return os
+                        end
+                    end
                 end
             end
 
@@ -1213,6 +1217,10 @@ module Autoproj
         config_file = File.join(Autoproj.config_dir, "config.yml")
         if File.exists?(config_file)
             config = YAML.load(File.read(config_file))
+            if !config
+                return
+            end
+
             config.each do |key, value|
                 @user_config[key] = [value, false]
             end
@@ -1394,20 +1402,26 @@ module Autoproj
     # If any error is detected, the backtrace will be filtered so that it is
     # easier to understand by the user. Moreover, if +source+ is non-nil, the
     # package set name will be mentionned.
-    def self.load(source, *path)
+    def self.load(package_set, *path)
         path = File.join(*path)
-        Kernel.load path
-    rescue Interrupt
-        raise
-    rescue Exception => e
-        Autoproj.filter_load_exception(e, source, path)
+        in_package_set(package_set, File.expand_path(path).gsub(/^#{Regexp.quote(Autoproj.root_dir)}\//, '')) do
+            begin
+                Kernel.load path
+            rescue Interrupt
+                raise
+            rescue ConfigError => e
+                raise
+            rescue Exception => e
+                filter_load_exception(e, package_set, path)
+            end
+        end
     end
 
     # Same as #load, but runs only if the file exists.
-    def self.load_if_present(source, *path)
+    def self.load_if_present(package_set, *path)
         path = File.join(*path)
         if File.file?(path)
-            self.load(source, *path)
+            self.load(package_set, *path)
         end
     end
 
@@ -1438,6 +1452,8 @@ end
 
 DEFS = <<EODEFS
 --- 
+cvs: 
+  debian,ubuntu: cvs
 svn: 
   arch: subversion
   gentoo: dev-util/subversion

data/lib/autoproj/autobuild.rb

@@ -238,12 +238,19 @@ module Autoproj
 
     # Returns the information about the file that is currently being loaded
     #
-    # The return value is [source, path], where +source+ is the Source instance
-    # and +path+ is the path of the file w.r.t. the autoproj root directory
+    # The return value is [package_set, path], where +package_set+ is the
+    # PackageSet instance and +path+ is the path of the file w.r.t. the autoproj
+    # root directory
     def self.current_file
         @file_stack.last
     end
 
+    # The PackageSet object representing the package set that is currently being
+    # loaded
+    def self.current_package_set
+        current_file.first
+    end
+
     def self.define(package_type, spec, &block)
         package = Autobuild.send(package_type, spec)
         Autoproj.manifest.register_package(package, block, *current_file)
@@ -251,7 +258,7 @@ module Autoproj
     end
 
     @loaded_autobuild_files = Set.new
-    def self.filter_load_exception(error, source, path)
+    def self.filter_load_exception(error, package_set, path)
         raise error if Autoproj.verbose
         rx_path = Regexp.quote(path)
         if error_line = error.backtrace.find { |l| l =~ /#{rx_path}/ }
@@ -259,18 +266,18 @@ module Autoproj
                 line_number = "#{line_number}:"
             end
 
-            if source.local?
+            if package_set.local?
                 raise ConfigError.new(path), "#{path}:#{line_number} #{error.message}", error.backtrace
             else
-                raise ConfigError.new(path), "#{File.basename(path)}(source=#{source.name}):#{line_number} #{error.message}", error.backtrace
+                raise ConfigError.new(path), "#{File.basename(path)}(package_set=#{package_set.name}):#{line_number} #{error.message}", error.backtrace
             end
         else
             raise error
         end
     end
 
-    def self.in_package_set(source, path)
-        @file_stack.push([source, File.expand_path(path).gsub(/^#{Regexp.quote(Autoproj.root_dir)}\//, '')])
+    def self.in_package_set(package_set, path)
+        @file_stack.push([package_set, File.expand_path(path).gsub(/^#{Regexp.quote(Autoproj.root_dir)}\//, '')])
         yield
     ensure
         @file_stack.pop
@@ -280,19 +287,10 @@ module Autoproj
         attr_reader :loaded_autobuild_files
     end
 
-    def self.import_autobuild_file(source, path)
+    def self.import_autobuild_file(package_set, path)
         return if @loaded_autobuild_files.include?(path)
-
-        in_package_set(source, File.expand_path(path).gsub(/^#{Regexp.quote(Autoproj.root_dir)}\//, '')) do
-            begin
-                Kernel.load path
-            rescue ConfigError => e
-                raise
-            rescue Exception => e
-                filter_load_exception(e, source, path)
-            end
-            @loaded_autobuild_files << path
-        end
+        Autoproj.load(package_set, path)
+        @loaded_autobuild_files << path
     end
 
     # Tries to find a handler automatically for 'full_path'
@@ -657,3 +655,28 @@ end
 def move_package(name, new_dir)
     Autoproj.manifest.move_package(name, new_dir)
 end
+
+# Removes all the packages currently added from the given metapackage
+#
+# Calling this function will make sure that the given metapackage is now empty.
+def clear_metapackage(name)
+    meta = Autoproj.manifest.metapackage(name)
+    meta.packages.clear
+end
+
+# Declares a new metapackage, or adds packages to an existing one
+def metapackage(name, *packages)
+    Autoproj.manifest.metapackage(name, *packages)
+end
+
+# This can be used only during the load of a package set
+#
+# It defines the set of packages that will be built if 'package_set_name' is
+# used. By default, all of the package set's packages are included. After a call
+# to default_packages, only the packages listed (and their dependencies) are.
+def default_packages(*names)
+    pkg_set = Autoproj.current_package_set
+    clear_metapackage(pkg_set.name)
+    metapackage(pkg_set.name, *names)
+end
+

data/lib/autoproj/cmdline.rb

@@ -130,7 +130,7 @@ module Autoproj
             # Do that AFTER we have properly setup Autoproj.osdeps as to avoid
             # unnecessarily redetecting the operating system
             if update_os_dependencies? || osdeps?
-                Autoproj.reset_option('operating_system')
+                Autoproj.change_option('operating_system', Autoproj::OSDependencies.operating_system(:force => true), true)
             end
         end
 
@@ -172,7 +172,7 @@ module Autoproj
 
             # Load init.rb files. each_source must not load the source.yml file, as
             # init.rb may define configuration options that are used there
-            manifest.each_source(false) do |source|
+            manifest.each_package_set(false) do |source|
                 Autoproj.load_if_present(source, source.local_dir, "init.rb")
             end
 
@@ -468,7 +468,7 @@ module Autoproj
 
             selected_packages, nonresolved = manifest.expand_package_selection(selected_packages)
 
-            # Try to auto-add stuff in nonresolved
+            # Try to auto-add stuff if nonresolved
             nonresolved.delete_if do |sel|
                 next if !File.directory?(sel)
                 while sel != '/'

data/lib/autoproj/default.osdeps

@@ -89,5 +89,8 @@ archive:
     gentoo: [app-arch/tar, app-arch/unzip]
     arch: [tar, unzip]
 
+cvs:
+    debian,ubuntu: cvs
+
 # vim: expandtab
 

data/lib/autoproj/gitorious.rb

@@ -79,6 +79,18 @@ module Autoproj
                 end
             end
         end
+
+        Autoproj.add_source_handler name.downcase do |url, options|
+            if url !~ /\.git$/
+                url += ".git"
+            end
+            if url !~ /^\//
+                url = "/#{url}"
+            end
+            base_url = Autoproj.user_config("#{name}_ROOT")
+            base_push_url = Autoproj.user_config("#{name}_PUSH_ROOT")
+            return Hash[:type => 'git', :url => "#{base_url}#{url}", :push_to => "#{base_push_url}#{url}"].merge(options)
+        end
     end
 end
 

data/lib/autoproj/manifest.rb

@@ -111,7 +111,7 @@ module Autoproj
             # (to_absolute_url might be called on installations that are being
             # bootstrapped, and as such don't have a root dir yet).
             url = Autoproj.single_expansion(url, 'HOME' => ENV['HOME'])
-            if url && url !~ /^(\w+:\/)?\/|^\w+\@|^(\w+\@)?[\w\.-]+:/
+            if url && url !~ /^(\w+:\/)?\/|^[:\w]+\@|^(\w+\@)?[\w\.-]+:/
                 url = File.expand_path(url, root_dir || Autoproj.root_dir)
             end
             url
@@ -137,33 +137,105 @@ module Autoproj
         end
     end
 
-    def self.vcs_definition_to_hash(spec)
-        options = Hash.new
-        if spec.size == 1 && spec.keys.first =~ /auto_imports$/
-            # The user probably wrote
-            #   - string
-            #     auto_imports: false
-            options['auto_imports'] = spec.values.first
-            spec = spec.keys.first.split(" ").first
+    @custom_source_handlers = Hash.new
+
+    # Returns true if +vcs+ refers to a source handler name added by
+    # #add_source_handler
+    def self.has_source_handler?(vcs)
+        @custom_source_handlers.has_key?(vcs.to_s)
+    end
+
+    # Returns the source handlers associated with +vcs+
+    #
+    # Source handlers are added by Autoproj.add_source_handler. The returned
+    # value is an object that responds to #call(url, options) and return a VCS
+    # definition as a hash
+    def self.call_source_handler(vcs, url, options)
+        handler = @custom_source_handlers[vcs.to_s]
+        if !handler
+            raise ArgumentError, "there is no source handler for #{vcs}"
+        else
+            return handler.call(url, options)
         end
+    end
 
-        if spec.respond_to?(:to_str)
-            vcs, *url = spec.to_str.split ':'
-            spec = if url.empty?
-                       source_dir = File.expand_path(File.join(Autoproj.config_dir, spec))
-                       if !File.directory?(source_dir)
-                           raise ConfigError.new, "'#{spec.inspect}' is neither a remote source specification, nor a local source definition"
-                       end
+    # call-seq:
+    #   Autoproj.add_source_handler name do |url, options|
+    #     # build a hash that represent source configuration
+    #     # and return it
+    #   end
+    #
+    # Add a custom source handler named +name+
+    #
+    # Custom source handlers are shortcuts that can be used to represent VCS
+    # information. For instance, the gitorious_server_configuration method
+    # defines a source handler that allows to easily add new gitorious packages:
+    #
+    #   gitorious_server_configuration 'GITORIOUS', 'gitorious.org'
+    #
+    # defines the "gitorious" source handler, which allows people to write
+    #
+    #
+    #   version_control:
+    #       - tools/orocos.rb
+    #         gitorious: rock-toolchain/orocos-rb
+    #         branch: test
+    #
+    # 
+    def self.add_source_handler(name, &handler)
+        @custom_source_handlers[name.to_s] = lambda(&handler)
+    end
 
-                       Hash[:type => 'local', :url => source_dir]
-                   else
-                       Hash[:type => vcs.to_str, :url => url.join(":").to_str]
-                   end
+    def self.vcs_definition_to_hash(spec)
+        options = Hash.new
+
+        plain = Array.new
+        filtered_spec = Hash.new
+        spec.each do |key, value|
+            keys = key.to_s.split(/\s+/)
+            plain.concat(keys[0..-2])
+            filtered_spec[keys[-1].to_sym] = value
+        end
+        spec = filtered_spec
+
+        if plain.size > 1
+            raise ConfigError.new, "invalid syntax"
+        elsif plain.size == 1
+            short_url = plain.first
+            vcs, *url = short_url.split(':')
+
+            # Check if VCS is a known version control system or source handler
+            # shortcut. If it is not, look for a local directory called
+            # short_url
+            if Autobuild.respond_to?(vcs)
+                spec.merge!(:type => vcs, :url => url.join(':'))
+            elsif has_source_handler?(vcs)
+                spec = call_source_handler(vcs, url.join(':'), spec)
+            else
+                source_dir = File.expand_path(File.join(Autoproj.config_dir, short_url))
+                if !File.directory?(source_dir)
+                    raise ConfigError.new, "'#{spec.inspect}' is neither a remote source specification, nor a local source definition"
+                end
+                spec.merge!(:type => 'local', :url => source_dir)
+            end
         end
 
         spec, vcs_options = Kernel.filter_options spec, :type => nil, :url => nil
+        spec.merge!(vcs_options)
+        if !spec[:url]
+            # Verify that none of the keys are source handlers. If it is the
+            # case, convert
+            filtered_spec = Hash.new
+            spec.dup.each do |key, value|
+                if has_source_handler?(key)
+                    spec.delete(key)
+                    spec = call_source_handler(key, value, spec)
+                    break
+                end
+            end
+        end
 
-        return spec.merge(vcs_options).merge(options)
+        spec
     end
 
     # Autoproj configuration files accept VCS definitions in three forms:
@@ -278,6 +350,18 @@ module Autoproj
         # automatically loaded by autoproj
         def auto_imports?; !!@auto_imports end
 
+        # Returns the Metapackage object that has the same name than this
+        # package set
+        def metapackage
+            manifest.metapackage(name)
+        end
+
+        # List of the packages that are built if the package set is selected in
+        # the layout
+        def default_packages
+            metapackage.packages
+        end
+
         # Create this source from a VCSDefinition object
         def initialize(manifest, vcs)
             @manifest = manifest
@@ -713,6 +797,32 @@ module Autoproj
         end
     end
 
+    # A set of packages that can be referred to by name
+    class Metapackage
+        # The metapackage name
+        attr_reader :name
+        # The packages listed in this metapackage
+        attr_reader :packages
+
+        def initialize(name)
+            @name = name
+            @packages = []
+        end
+        # Adds a package to this metapackage
+        def add(pkg)
+            @packages << pkg
+        end
+        def each_package(&block)
+            @packages.each(&block)
+        end
+        def include?(pkg)
+            if !pkg.respond_to?(:to_str)
+                pkg = pkg.name
+            end
+            @packages.any? { |p| p.name == pkg }
+        end
+    end
+
     # The Manifest class represents the information included in the main
     # manifest file, and allows to manipulate it
     class Manifest
@@ -809,6 +919,8 @@ module Autoproj
 
         attr_reader :constant_definitions
 
+        attr_reader :metapackages
+
 	def initialize
             @file = nil
 	    @data = nil
@@ -819,6 +931,7 @@ module Autoproj
             @disabled_imports = Set.new
             @moved_packages = Hash.new
             @osdeps_overrides = Hash.new
+            @metapackages = Hash.new
 
             @constant_definitions = Hash.new
             if Autoproj.has_config_key?('manifest_source')
@@ -843,8 +956,8 @@ module Autoproj
                 data['ignore_packages'].any? do |l|
                     if package_name == l
                         true
-                    elsif source = definition_source(package_name)
-                        source.name == l
+                    elsif (pkg_set = metapackages[l]) && pkg_set.include?(package_name)
+                        true
                     else
                         false
                     end
@@ -926,7 +1039,7 @@ module Autoproj
             #
             # And honestly I don't think someone will have 20 000 package sets
             done_something = false
-            each_source(false) do |source| 
+            each_package_set(false) do |source| 
                 next if source_name && source.name != source_name
                 done_something = true
 
@@ -936,7 +1049,7 @@ module Autoproj
             end
 
             if source_name && !done_something
-                raise ConfigError.new(file), "in #{file}: source '#{source_name}' does not exist"
+                raise ConfigError.new(file), "in #{file}: package set '#{source_name}' does not exist"
             end
 	end
 
@@ -946,7 +1059,7 @@ module Autoproj
                 return enum_for(:each_source_file)
             end
 
-            each_source(false) do |source|
+            each_package_set(false) do |source|
 		Dir.glob(File.join(source.local_dir, "*.osdeps")).each do |file|
 		    yield(source, file)
 		end
@@ -972,7 +1085,7 @@ module Autoproj
             false
         end
 
-        # Like #each_source, but filters out local package sets
+        # Like #each_package_set, but filters out local package sets
         def each_remote_package_set(load_description = true)
             if !block_given?
                 enum_for(:each_remote_package_set, load_description)
@@ -1078,6 +1191,10 @@ module Autoproj
         # changes on the manifest's data structures
         def cache_package_sets
             @package_sets = each_package_set(false).to_a
+            @package_sets.each do |pkg_set|
+                @metapackages[pkg_set.name] ||= Metapackage.new(pkg_set.name)
+                @metapackages["#{pkg_set.name}.all"] ||= Metapackage.new(pkg_set.name)
+            end
         end
 
         # Register a new package
@@ -1087,6 +1204,8 @@ module Autoproj
                 pkg.add_setup_block(block)
             end
             @packages[package.name] = pkg
+            @metapackages[pkg.package_set.name].add(pkg.autobuild)
+            @metapackages["#{pkg.package_set.name}.all"].add(pkg.autobuild)
         end
 
         def definition_source(package_name)
@@ -1104,14 +1223,29 @@ module Autoproj
             packages[name]
         end
 
-        # Lists all defined packages and where they have been defined
-        def each_package
+        # Lists all defined packages as PackageDefinition objects
+        def each_package_definition(&block)
+            if !block_given?
+                return enum_for(:each_package_definition)
+            end
+            packages.each_value(&block)
+        end
+
+        # Lists all defined autobuild packages as instances of
+        # Autobuild::Package and its subclasses
+        def each_autobuild_package
             if !block_given?
                 return enum_for(:each_package)
             end
             packages.each_value { |pkg| yield(pkg.autobuild) }
         end
 
+        # DEPRECATED: use either #each_autobuild_package and
+        # #each_package_definition
+        def each_package(&block)
+            each_autobuild_package(&block)
+        end
+
         # The VCS object for the main configuration itself
         attr_reader :vcs
 
@@ -1255,7 +1389,7 @@ module Autoproj
                     package_set
             end
 
-            sources = each_source.to_a.dup
+            sources = each_package_set.to_a.dup
 
             # Remove sources listed before the package source
             while !sources.empty? && sources[0].name != package_source.name
@@ -1323,17 +1457,54 @@ module Autoproj
             if Autobuild::Package[name]
                 [name]
             else
-                pkg_set = each_package_set(false).find { |set| set.name == name }
+                pkg_set = find_metapackage(name)
                 if !pkg_set
-                    raise ConfigError.new, "#{name} is neither a package nor a source"
+                    raise ConfigError.new, "#{name} is neither a package nor a package set name. Packages in autoproj must be declared in an autobuild file."
                 end
-                packages.values.
-                    find_all { |pkg| pkg.package_set.name == pkg_set.name }.
-                    map { |pkg| pkg.autobuild.name }.
+                pkg_set.each_package.
+                    map(&:name).
                     find_all { |pkg_name| !Autoproj.osdeps || !Autoproj.osdeps.has?(pkg_name) }
             end
         end
 
+        def find_metapackage(name)
+            @metapackages[name.to_s]
+        end
+
+        # call-seq:
+        #   metapackage 'meta_name' => Metapackage
+        #   metapackage 'meta_name', 'pkg1', 'pkg2' => Metapackage
+        #
+        # Metapackage definition
+        #
+        # In the first form, returns a Metapackage instance for the metapackage
+        # named 'meta_name'.
+        #
+        # In the second form, adds the listed packages to the metapackage and
+        # returns the Metapackage instance
+        def metapackage(name, *packages, &block)
+            meta = (@metapackages[name.to_s] ||= Metapackage.new(name))
+            packages.each do |pkg_name|
+                package_names = resolve_package_set(pkg_name)
+                package_names.each do |pkg_name|
+                    meta.add(Autobuild::Package[pkg_name])
+                end
+            end
+
+            if block
+                meta.instance_eval(&block)
+            end
+            meta
+        end
+
+        # Lists all defined metapackages
+        #
+        # Autoproj defines one metapackage per package set, which by default
+        # includes all the packages that the package set defines.
+        def each_metapackage(&block)
+            metapackages.each_value(&block)
+        end
+
         # Returns the packages contained in the provided layout definition
         #
         # If recursive is false, yields only the packages at this level.
@@ -1343,7 +1514,9 @@ module Autoproj
                 normalized_layout.each_key do |pkg_or_set|
                     begin
                         resolve_package_set(pkg_or_set).each do |pkg_name|
-                            result << pkg_name
+                            if !excluded?(pkg_name) && !ignored?(pkg_name)
+                                result << pkg_name
+                            end
                             Autobuild::Package[pkg_name].all_dependencies(result)
                         end
                     rescue ConfigError
@@ -1377,8 +1550,11 @@ module Autoproj
 
         # Returns all the packages that can be built in this installation
         def all_packages
-            packages.values.
-                map { |pkg| pkg.autobuild.name }.
+            result = Set.new
+            each_package_set do |pkg_set|
+                result |= metapackage(pkg_set.name).packages.map(&:name).to_set
+            end
+            result.to_a.
                 find_all { |pkg_name| !Autoproj.osdeps || !Autoproj.osdeps.has?(pkg_name) }
         end
 
@@ -1480,7 +1656,9 @@ module Autoproj
             end
 
             manifest_path = File.join(package.srcdir, "manifest.xml")
-            if !File.file?(manifest_path)
+            if !File.directory?(package.srcdir)
+                return
+            elsif !File.file?(manifest_path)
                 Autoproj.warn "#{package.name} from #{source.name} does not have a manifest"
                 return
             end
@@ -1614,12 +1792,13 @@ module Autoproj
                 matches[sel] = packages
                 expanded_packages |= packages
 
-                sources = each_source.find_all { |source| source.name =~ sel }
-                sources.each do |source|
-                    packages = resolve_package_set(source.name).to_set
-                    source_packages = (packages & all_layout_packages)
-                    matches[sel] |= source_packages
-                    expanded_packages |= source_packages
+                each_metapackage do |pkg|
+                    if pkg.name =~ sel
+                        packages = resolve_package_set(pkg.name).to_set
+                        packages = (packages & all_layout_packages)
+                        matches[sel] |= packages
+                        expanded_packages |= packages
+                    end
                 end
             end
 

data/lib/autoproj/options.rb

@@ -177,6 +177,10 @@ module Autoproj
         config_file = File.join(Autoproj.config_dir, "config.yml")
         if File.exists?(config_file)
             config = YAML.load(File.read(config_file))
+            if !config
+                return
+            end
+
             config.each do |key, value|
                 @user_config[key] = [value, false]
             end

data/lib/autoproj/osdeps.rb

@@ -155,17 +155,21 @@ module Autoproj
         # one.
         #
         # Examples: ['debian', ['sid', 'unstable']] or ['ubuntu', ['lucid lynx', '10.04']]
-        def self.operating_system
-            if !@operating_system.nil?
-                return @operating_system
-            elsif Autoproj.has_config_key?('operating_system')
-                os = Autoproj.user_config('operating_system')
-		if os.respond_to?(:to_ary)
-		    if os[0].respond_to?(:to_ary) && os[0].all? { |s| s.respond_to?(:to_str) } &&
-		       os[1].respond_to?(:to_ary) && os[1].all? { |s| s.respond_to?(:to_str) }
-		       @operating_system = os
-                       return os
-		    end
+        def self.operating_system(options = Hash.new)
+            options = Kernel.validate_options options, :force => false
+
+            if !options[:force]
+                if !@operating_system.nil?
+                    return @operating_system
+                elsif Autoproj.has_config_key?('operating_system')
+                    os = Autoproj.user_config('operating_system')
+                    if os.respond_to?(:to_ary)
+                        if os[0].respond_to?(:to_ary) && os[0].all? { |s| s.respond_to?(:to_str) } &&
+                           os[1].respond_to?(:to_ary) && os[1].all? { |s| s.respond_to?(:to_str) }
+                           @operating_system = os
+                           return os
+                        end
+                    end
                 end
             end
 

data/lib/autoproj/system.rb

@@ -166,20 +166,26 @@ module Autoproj
     # If any error is detected, the backtrace will be filtered so that it is
     # easier to understand by the user. Moreover, if +source+ is non-nil, the
     # package set name will be mentionned.
-    def self.load(source, *path)
+    def self.load(package_set, *path)
         path = File.join(*path)
-        Kernel.load path
-    rescue Interrupt
-        raise
-    rescue Exception => e
-        Autoproj.filter_load_exception(e, source, path)
+        in_package_set(package_set, File.expand_path(path).gsub(/^#{Regexp.quote(Autoproj.root_dir)}\//, '')) do
+            begin
+                Kernel.load path
+            rescue Interrupt
+                raise
+            rescue ConfigError => e
+                raise
+            rescue Exception => e
+                filter_load_exception(e, package_set, path)
+            end
+        end
     end
 
     # Same as #load, but runs only if the file exists.
-    def self.load_if_present(source, *path)
+    def self.load_if_present(package_set, *path)
         path = File.join(*path)
         if File.file?(path)
-            self.load(source, *path)
+            self.load(package_set, *path)
         end
     end
 

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.11"
+    VERSION = "1.7.12.rc1"
 end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
+  hash: 15424039
+  prerelease: 7
   segments: 
   - 1
   - 7
-  - 11
-  version: 1.7.11
+  - 12
+  - rc
+  - 1
+  version: 1.7.12.rc1
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-22 00:00:00 Z
+date: 2011-07-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: autobuild
@@ -242,12 +244,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: autobuild