autoproj 1.7.3 → 1.7.4

data/History.txt

@@ -1,27 +1,54 @@
+= Version 1.7.4
+ * add amake to the gem (forgot it in 1.7.3)
+ * fix some corner-cases in osdeps handling
+ * fix autoproj build <builddir> when <builddir> is
+   not the root of a package
+ * make autoproj build <builddir> (and amake <builddir>)
+   auto-add the package if it is not registered in
+   the current build configuration
+ * the --no-deps option allows to do operations without
+   taking the dependencies into account (for instance,
+   update or build a single package)
+ * allow version specifications for gems in the osdeps
+   files, e.g.
+     
+     hoe:
+       gem: "hoe < 1.9.0"
+
+ * add the required_autoproj_version field in source.yml
+   to require a specific autoproj version
+
 = Version 1.7.3
 == For basic usage
- * amake is a command that is a shortcut to "autoproj build". I.e.
-    amake .
-   will build the package in the current directory and all its dependencies
- * added tag support. The manifest and the autobuild files allow to add textual
-   tags to packages, that will be picked up by documentation later on. Moreover,
-   some tags can be used to tune the build. For instance, rock uses the 'stable'
-   tag to set the CMAKE_BUILD_TYPE variable on cmake packages to either Debug
-   (non-stable) or RelWithDebInfo (stable).
+ * amake is a command that is a shortcut to "autoproj
+   build". I.e.  amake .  will build the package in the
+   current directory and all its dependencies
+ * added tag support. The manifest and the autobuild
+   files allow to add textual tags to packages, that
+   will be picked up by documentation later on.
+   Moreover, some tags can be used to tune the build.
+   For instance, rock uses the 'stable' tag to set the
+   CMAKE_BUILD_TYPE variable on cmake packages to
+   either Debug (non-stable) or RelWithDebInfo
+   (stable).
 
 == For advanced usage
  * support ignoring/excluding OS packages
- * define Package#post_import which allows to run a code block after the package
-   has been imported, but before the build. The global
+ * define Package#post_import which allows to run a
+   code block after the package has been imported, but
+   before the build. The global
      Autoproj.post_import do |pkg|
      end
    allows to do it for all defined packages.
- * define Package#remove_obsolete_installed_file(*path) which allows to remove
-   files from the installation directory. Useful for simple upgrade cases, when
+ * define Package#remove_obsolete_installed_file(*path)
+   which allows to remove files from the installation
+   directory. Useful for simple upgrade cases, when
    files move from one package to another
- * in source.yml, a package name is interpreted as a regular expression only if
-   it contains non-alphanumeric characters. This avoids some surprising effects
-   if the name of package BlaBla is a subset of the package BlaBlaBlo
+ * in source.yml, a package name is interpreted as a
+   regular expression only if it contains
+   non-alphanumeric characters. This avoids some
+   surprising effects if the name of package BlaBla is
+   a subset of the package BlaBlaBlo
 
 = Version 1.7.2
 == Quickfix release

data/Manifest.txt

@@ -2,6 +2,7 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
+bin/amake
 bin/autolocate
 bin/autoproj
 bin/autoproj_bootstrap

data/Rakefile

@@ -14,7 +14,7 @@ begin
             self.changes     = paragraphs_of('History.txt', 0..1).join("\n\n")
 
             extra_deps << 
-                ['autobuild',   '>= 1.5.25'] <<
+                ['autobuild',   '>= 1.5.33'] <<
                 ['rmail',   '>= 1.0.0'] <<
                 ['utilrb', '>= 1.3.3'] <<
                 ['nokogiri', '>= 1.3.3'] <<

data/bin/amake

@@ -0,0 +1,9 @@
+#! /bin/sh
+
+if test -z "$@"; then
+    autoproj fast-build .
+else
+    autoproj fast-build "$@"
+fi
+
+

data/bin/autoproj

@@ -103,6 +103,7 @@ EOTEXT
         Autobuild.do_update = Autoproj.auto_update?
     end
 
+    Autoproj::CmdLine.setup_all_package_directories
     resolved_selected_packages = Autoproj::CmdLine.resolve_user_selection(selected_packages)
     if !selected_packages.empty?
         command_line_selection = resolved_selected_packages.dup
@@ -111,7 +112,7 @@ EOTEXT
     end
     Autoproj.manifest.explicit_selection = resolved_selected_packages
     selected_packages = resolved_selected_packages
-    Autoproj::CmdLine.initial_package_setup
+    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

@@ -259,9 +259,12 @@ module Autoproj
                 return @operating_system
             elsif Autoproj.has_config_key?('operating_system')
                 os = Autoproj.user_config('operating_system')
-                if os.respond_to?(:to_ary) # upgrade from previous format
-                    @operating_system = os
-                    return os
+		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
 
@@ -283,9 +286,9 @@ module Autoproj
                     if File.exists?('/etc/debian_version')
                         codenames = [File.read('/etc/debian_version').strip]
                         if codenames.first =~ /sid/
-                            codenames << "unstable" << "sid"
+                            versions = codenames + ["unstable", "sid"]
                         end
-                        [['debian'], codenames]
+                        [['debian'], versions]
                     elsif File.exists?('/etc/gentoo-release')
                         release_string = File.read('/etc/gentoo-release').strip
                         release_string =~ /^.*([^\s]+)$/
@@ -301,9 +304,14 @@ module Autoproj
             end
 
             # Normalize the names to lowercase
-            @operating_system =
-                 [@operating_system[0].map(&:downcase),
-                 [@operating_system[1].map(&:downcase) + ["default"]]]
+            names, versions = @operating_system[0], @operating_system[1]
+            names    = names.map(&:downcase)
+            versions = versions.map(&:downcase)
+            if !versions.include?('default')
+                versions += ['default']
+            end
+
+            @operating_system = [names, versions]
             Autoproj.change_option('operating_system', @operating_system, true)
             @operating_system
         end
@@ -409,7 +417,7 @@ fi
             # Find a matching entry for the OS name
             os_entry = nil
             os_names.find do |os_name|
-                os_entry = dep_def.find do |name_list, data|
+                os_entry = dep_def.find do |name_list, _|
                     name_list.split(',').
                         map(&:downcase).
                         any? { |n| n == os_name }
@@ -426,18 +434,14 @@ fi
                 return IGNORE
             end
 
+	    # If data is a hash, it means we have to check the OS version as well
             if data.kind_of?(Hash)
-                version_entry = nil
-                os_versions.each do |os_version|
-                    version_entry =
-                        data.find do |version_list, data|
-                            version_list.to_s.split(',').
-                                map(&:downcase).
-                                any? do |v|
-                                    os_version.any? { |osv| Regexp.new(v) =~ osv }
-                                end
+                version_entry = data.find do |version_list, _|
+                    version_list.to_s.split(',').
+                        map(&:downcase).
+                        any? do |v|
+                            os_versions.any? { |osv| Regexp.new(v) =~ osv }
                         end
-                    break if version_entry
                 end
 
                 if !version_entry
@@ -447,8 +451,10 @@ fi
             end
 
             if data.respond_to?(:to_ary)
+		# List of packages
                 return [PACKAGES, data]
             elsif data.respond_to?(:to_str)
+		# Single package
                 return [PACKAGES, [data.to_str]]
             else
                 raise ConfigError.new, "invalid package specificiation #{data} in #{source_of(name)}"
@@ -522,8 +528,10 @@ fi
                 else
                     status
                 end
-            else
+            elsif !gemdeps.empty?
                 AVAILABLE
+            else
+                NO_PACKAGE
             end
         end
 
@@ -535,7 +543,17 @@ fi
         # package manager, and the set of packages that have to be installed
         # using Ruby's package manager, RubyGems.
         #
-        # Raises ConfigError if no package can be found
+        # The os_packages arrays is a list of names (strings)
+        #
+        # The gem_packages arrays is a list of [name, version] pairs. +version+
+        # is a version string, that is set only if the package has been given
+        # with a =VERSION specification, e.g.
+        #
+        #   gems:
+        #       hoe=1.8.0
+        #
+        # Raises ConfigError if an error exists in the osdeps files, and returns
+        # empty sets if the package can't be found
         def partition_packages(package_set, package_osdeps = Hash.new)
             package_set = package_set.
                 map { |name| OSDependencies.aliases[name] || name }.
@@ -576,6 +594,13 @@ fi
                     end
                 end
             end
+            gems.map! do |name|
+                if name =~ /^([^><=~]*)([><=~]+.*)$/
+                    [$1.strip, $2.strip]
+                else
+                    [name]
+                end
+            end
             return osdeps, gems
         end
 
@@ -616,10 +641,10 @@ fi
         def filter_uptodate_gems(gems)
             # Don't install gems that are already there ...
             gems = gems.dup
-            gems.delete_if do |name|
-                version_requirements = Gem::Requirement.default
+            gems.delete_if do |name, version|
+                version_requirements = Gem::Requirement.new(version || '>= 0')
                 installed = Gem.source_index.find_name(name, version_requirements)
-                if !installed.empty? && Autobuild.do_update
+                if (!installed.empty? && !version) && Autobuild.do_update
                     # Look if we can update the package ...
                     dep = Gem::Dependency.new(name, version_requirements)
                     available = gem_fetcher.find_matching(dep, false, true, OSDependencies.gem_with_prerelease)
@@ -675,7 +700,7 @@ to what you should install to compile the software successfully.
 
 	    Autoproj.configuration_option 'osdeps_mode', 'string',
 		:default => 'ruby',
-		:doc => [short_doc, long_doc],
+		:doc => message,
                 :possible_values => %w{ruby none},
                 :lowercase => true
         end
@@ -848,7 +873,7 @@ with the corresponding option (--all, --ruby, --os or --none).
             false
         end
 
-        def gems_interaction(gems, cmdline, silent)
+        def gems_interaction(gems, cmdlines, silent)
             if OSDependencies.force_osdeps
                 return true
             elsif osdeps_mode == HANDLE_ALL || osdeps_mode == HANDLE_RUBY
@@ -869,7 +894,7 @@ with the corresponding option (--all, --ruby, --os or --none).
     
     The following command line can be used to install them manually
     
-      #{cmdline.join(" ")}
+      #{cmdlines.map { |c| c.join(" ") }.join("\n      ")}
     
     Autoproj expects these Gems to be installed in #{Autoproj.gem_home} This can
     be overriden by setting the AUTOPROJ_GEM_HOME environment variable manually
@@ -892,7 +917,7 @@ with the corresponding option (--all, --ruby, --os or --none).
 
             osdeps, gems = partition_packages(packages, package_osdeps)
             if handled_os
-                os_names, os_versions = OSDependencies.operating_system
+                os_names, _ = OSDependencies.operating_system
                 os_packages = resolve_os_dependencies(osdeps)
                 if filter_uptodate_packages
                     os_packages = filter_uptodate_os_packages(os_packages, os_names)
@@ -932,15 +957,26 @@ with the corresponding option (--all, --ruby, --os or --none).
             if !gems.empty?
                 guess_gem_program
 
-                cmdline = [Autobuild.tool('gem'), 'install']
+                base_cmdline = [Autobuild.tool('gem'), 'install']
                 if Autoproj::OSDependencies.gem_with_prerelease
-                    cmdline << "--prerelease"
+                    base_cmdline << "--prerelease"
+                end
+                with_version, without_version = gems.partition { |name, v| v }
+
+                cmdlines = []
+                if !without_version.empty?
+                    cmdlines << (base_cmdline + without_version.flatten)
+                end
+                with_version.each do |name, v|
+                    cmdlines << base_cmdline + [name, "-v", v]
                 end
-                cmdline.concat(gems)
 
-                if gems_interaction(gems, cmdline, silent?)
-                    Autobuild.progress "installing/updating RubyGems dependencies: #{gems.sort.join(", ")}"
-                    Autobuild::Subprocess.run 'autoproj', 'osdeps', *cmdline
+                if gems_interaction(gems, cmdlines, silent?)
+                    Autobuild.progress "installing/updating RubyGems dependencies: #{gems.map { |g| g.join(" ") }.sort.join(", ")}"
+
+                    cmdlines.each do |c|
+                        Autobuild::Subprocess.run 'autoproj', 'osdeps', *c
+                    end
                     did_something = true
                 end
             end

data/lib/autoproj/autobuild.rb

@@ -55,10 +55,27 @@ module Autobuild
             tags.include?(tag.to_s)
         end
 
+        # Asks autoproj to remove references to the given obsolete oroGen
+        # package
+        def remove_obsolete_installed_orogen_package(name)
+            post_install do
+                path = File.join(prefix, 'lib', 'pkgconfig')
+                Dir.glob(File.join(path, "#{name}-*.pc")) do |pcfile|
+                    Autoproj.progress "  removing obsolete file #{pcfile}", :bold
+                    FileUtils.rm_f pcfile
+                end
+                pcfile = File.join(path, "orogen-project-#{name}.pc")
+                if File.exists?(pcfile)
+                    Autoproj.progress "  removing obsolete file #{pcfile}", :bold
+                    FileUtils.rm_f pcfile
+                end
+            end
+        end
+
         # Asks autoproj to remove the given file in the package's installation
         # prefix
         def remove_obsolete_installed_file(*path)
-            post_import do
+            post_install do
                 path = File.join(prefix, *path)
                 if File.exists?(path)
                     Autoproj.progress "  removing obsolete file #{path}", :bold
@@ -79,6 +96,10 @@ module Autobuild
 
         alias __depends_on__ depends_on
         def depends_on(name)
+            if Autoproj::CmdLine.ignore_dependencies?
+                return
+            end
+
             explicit_selection  = Autoproj.manifest.explicitly_selected_package?(name)
 	    osdeps_availability = Autoproj.osdeps.availability_of(name)
             available_as_source = Autobuild::Package[name]
@@ -120,6 +141,10 @@ module Autobuild
         end
 
         def optional_dependency(name)
+            if Autoproj::CmdLine.ignore_dependencies?
+                return
+            end
+
             optional_dependencies << name
         end
 
@@ -450,6 +475,30 @@ def orogen_package(options, &block)
     end
 end
 
+# Declare that the packages declared in the block should be built only on the
+# given operating system. OS descriptions are space-separated strings containing
+# OS name and version.
+#
+# The block will simply be ignored if run on another architecture
+def only_on(*architectures)
+    architectures = architectures.map do |name|
+        if name.respond_to?(:to_str)
+            [name]
+        else name
+        end
+    end
+
+    os_names, os_versions = Autoproj::OSDependencies.operating_system
+    matching_archs = architectures.find_all { |arch| os_names.include?(arch[0].downcase) }
+    if matching_archs.empty?
+        return
+    elsif matching_archs.none? { |arch| !arch[1] || os_versions.include?(arch[1].downcase) }
+        return
+    end
+
+    yield
+end
+
 # Declare that the packages declared in the block should not be built in the
 # given operating system. OS descriptions are space-separated strings containing
 # OS name and version.
@@ -464,11 +513,11 @@ def not_on(*architectures)
         end
     end
 
-    os = Autoproj::OSDependencies.operating_system
-    matching_archs = architectures.find_all { |arch| arch[0] == os[0] }
+    os_names, os_versions = Autoproj::OSDependencies.operating_system
+    matching_archs = architectures.find_all { |arch| os_names.include?(arch[0].downcase) }
     if matching_archs.empty?
         return yield
-    elsif matching_archs.all? { |arch| arch[1] && !os[1].include?(arch[1].downcase) }
+    elsif matching_archs.all? { |arch| arch[1] && !os_versions.include?(arch[1].downcase) }
         return yield
     end
 

data/lib/autoproj/cmdline.rb

@@ -148,6 +148,12 @@ module Autoproj
             manifest = Autoproj.manifest
             manifest.cache_package_sets
 
+            manifest.each_package_set(false) do |pkg_set|
+                if Gem::Version.new(pkg_set.required_autoproj_version) > Gem::Version.new(Autoproj::VERSION)
+                    raise ConfigError.new(pkg_set.source_file), "the #{pkg_set.name} package set requires autoproj v#{pkg_set.required_autoproj_version} but this is v#{Autoproj::VERSION}"
+                end
+            end
+
             # 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|
@@ -238,7 +244,31 @@ module Autoproj
             end
         end
 
-        def self.initial_package_setup
+        def self.setup_package_directories(pkg)
+            pkg_name = pkg.name
+
+            layout =
+                if randomize_layout?
+                    Digest::SHA256.hexdigest(pkg_name)[0, 12]
+                else manifest.whereis(pkg_name)
+                end
+
+            place =
+                if target = manifest.moved_packages[pkg_name]
+                    File.join(layout, target)
+                else
+                    File.join(layout, pkg_name)
+                end
+
+            pkg = Autobuild::Package[pkg_name]
+            pkg.srcdir = File.join(Autoproj.root_dir, place)
+            pkg.prefix = File.join(Autoproj.build_dir, layout)
+            pkg.doc_target_dir = File.join(Autoproj.build_dir, 'doc', pkg_name)
+            pkg.logdir = File.join(pkg.prefix, "log")
+        end
+
+
+        def self.setup_all_package_directories
             manifest = Autoproj.manifest
 
             # Now starts a different stage of the whole build. Until now, we were
@@ -249,28 +279,11 @@ module Autoproj
             # resolve those
             manifest.packages.each_value do |pkg_def|
                 pkg = pkg_def.autobuild
-                pkg_name = pkg.name
-
-                layout =
-                    if randomize_layout?
-                        Digest::SHA256.hexdigest(pkg_name)[0, 12]
-                    else manifest.whereis(pkg_name)
-                    end
-
-                place =
-                    if target = manifest.moved_packages[pkg_name]
-                        File.join(layout, target)
-                    else
-                        File.join(layout, pkg_name)
-                    end
-
-                pkg = Autobuild::Package[pkg_name]
-                pkg.srcdir = File.join(Autoproj.root_dir, place)
-                pkg.prefix = File.join(Autoproj.build_dir, layout)
-                pkg.doc_target_dir = File.join(Autoproj.build_dir, 'doc', pkg_name)
-                pkg.logdir = File.join(pkg.prefix, "log")
+                setup_package_directories(pkg)
             end
+        end
 
+        def self.finalize_package_setup
             # Now call the blocks that the user defined in the autobuild files. We do it
             # now so that the various package directories are properly setup
             manifest.packages.each_value do |pkg|
@@ -436,9 +449,29 @@ module Autoproj
             end
             selected_packages = selected_packages.to_set
 
-            selected_packages = manifest.expand_package_selection(selected_packages)
-            if selected_packages.empty?
-                Autoproj.progress("autoproj: wrong package selection on command line", :red)
+            selected_packages, nonresolved = manifest.expand_package_selection(selected_packages)
+
+            # Try to auto-add stuff in nonresolved
+            nonresolved.delete_if do |sel|
+                next if !File.directory?(sel)
+                while sel != '/'
+                    if handler = Autoproj.package_handler_for(sel)
+                        Autoproj.progress "  auto-adding #{sel} using the #{handler.gsub(/_package/, '')} package handler"
+                        relative_to_root = Pathname.new(sel).relative_path_from(Pathname.new(Autoproj.root_dir))
+                        pkg = Autoproj.in_package_set(manifest.local_package_set, manifest.file) do
+                            send(handler, relative_to_root)
+                        end
+                        setup_package_directories(pkg)
+                        selected_packages << pkg.name
+                        break(true)
+                    end
+
+                    sel = File.dirname(sel)
+                end
+            end
+
+            if !nonresolved.empty?
+                Autoproj.progress("autoproj: wrong package selection on command line, cannot find a match for #{nonresolved.to_a.join(", ")}", :red)
                 exit 1
             elsif Autoproj.verbose
                 Autoproj.progress "will install #{selected_packages.to_a.join(", ")}"
@@ -664,6 +697,7 @@ module Autoproj
         def self.reconfigure?; @mode == "reconfigure" end
 
         def self.show_statistics?; !!@show_statistics end
+        def self.ignore_dependencies?; @ignore_dependencies end
 
         def self.osdeps?; @mode == "osdeps" end
         def self.show_osdeps?; @mode == "osdeps" && @show_osdeps end
@@ -772,15 +806,12 @@ where 'mode' is one of:
                     Autobuild.ignore_errors = true
                 end
                 opts.on("--os-version", "displays the operating system as detected by autoproj") do
-                    os = OSDependencies.operating_system
-                    if !os
+                    os_names, os_versions = OSDependencies.operating_system
+                    if !os_names
                         puts "no information about that OS"
                     else
-                        puts "name: #{os[0]}"
-                        puts "version:"
-                        os[1].each do |version_name|
-                            puts "  #{version_name}"
-                        end
+                        puts "name(s): #{os_names.join(", ")}"
+                        puts "version(s): #{os_versions.join(", ")}"
                     end
                     exit 0
                 end
@@ -794,6 +825,9 @@ where 'mode' is one of:
                 opts.on("--list-newest", "for each source directory, list what is the newest file used by autoproj for dependency tracking") do
                     Autoproj::CmdLine.list_newest = true
                 end
+                opts.on('-n', '--no-deps', 'completely ignore dependencies') do |value|
+                    @ignore_dependencies = true
+                end
                 opts.on("--no-osdeps", "in build and update modes, disable osdeps handling") do |value|
                     @osdeps_forced_mode = 'none'
                 end
@@ -1455,9 +1489,9 @@ export PATH=$GEM_HOME/bin:$PATH
                     partition_packages([pkg_osdep], ospkg_to_pkg)
 
                 gems.each do |gem_name|
-                    mapping[gem_name][1] = true
-                    mapping[gem_name][2][pkg_osdep] = Autoproj.osdeps.source_of(pkg_osdep)
-                    mapping[gem_name][3] |= pkgs
+                    mapping[gem_name.join(" ")][1] = true
+                    mapping[gem_name.join(" ")][2][pkg_osdep] = Autoproj.osdeps.source_of(pkg_osdep)
+                    mapping[gem_name.join(" ")][3] |= pkgs
                 end
 
                 if Autoproj::OSDependencies.supported_operating_system?
@@ -1556,7 +1590,8 @@ export PATH=$GEM_HOME/bin:$PATH
             Autoproj::CmdLine.update_os_dependencies = false
             Autoproj::CmdLine.initialize
             Autoproj::CmdLine.load_configuration
-            Autoproj::CmdLine.initial_package_setup
+            Autoproj::CmdLine.setup_all_package_directories
+            Autoproj::CmdLine.finalize_package_setup
 
             # Load the manifest for packages that are already present on the
             # file system

data/lib/autoproj/manifest.rb

@@ -396,6 +396,11 @@ module Autoproj
             end
         end
 
+        def required_autoproj_version
+            definition = @source_definition || raw_description_file
+            definition['required_autoproj_version'] || '0'
+        end
+
         # Returns the source name
         def name
             if @name
@@ -1505,6 +1510,9 @@ module Autoproj
             # All the packages that are available on this installation
             all_layout_packages = self.all_selected_packages
 
+            # A selection to packages map that represents the matches found
+            matches = Hash.new { |h, k| h[k] = Set.new }
+
             # First, remove packages that are directly referenced by name or by
             # package set names
             selection.each do |sel|
@@ -1513,15 +1521,16 @@ module Autoproj
                 packages = all_layout_packages.
                     find_all { |pkg_name| pkg_name =~ sel }.
                     to_set
+                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
-                    expanded_packages |= (packages & all_layout_packages)
+                    source_packages = (packages & all_layout_packages)
+                    matches[sel] |= source_packages
+                    expanded_packages |= source_packages
                 end
-
-                !packages.empty? || !sources.empty?
             end
 
             # Finally, check for package source directories
@@ -1533,10 +1542,13 @@ module Autoproj
                     if pkg_name =~ match_pkg_name || sel =~ Regexp.new("^#{Regexp.quote(pkg.srcdir)}") || pkg.srcdir =~ Regexp.new("^#{Regexp.quote(sel)}")
                         # Check-out packages that are not in the manifest only
                         # if they are explicitely selected
-                        if pkg_name != sel && pkg.srcdir != sel && !all_layout_packages.include?(pkg.name)
-                            next
+                        if !all_layout_packages.include?(pkg.name)
+                            if !File.directory?(pkg.srcdir) && pkg_name != sel && pkg.srcdir != sel
+                                next
+                            end
                         end
 
+                        matches[sel] << pkg_name
                         expanded_packages << pkg_name
                     end
                 end
@@ -1544,7 +1556,7 @@ module Autoproj
 
             # Remove packages that are explicitely excluded and/or ignored
             expanded_packages.delete_if { |pkg_name| excluded?(pkg_name) || ignored?(pkg_name) }
-            expanded_packages.to_set
+            return expanded_packages.to_set, (selection - matches.keys)
         end
 
         attr_reader :moved_packages

data/lib/autoproj/osdeps.rb

@@ -160,9 +160,12 @@ module Autoproj
                 return @operating_system
             elsif Autoproj.has_config_key?('operating_system')
                 os = Autoproj.user_config('operating_system')
-                if os.respond_to?(:to_ary) # upgrade from previous format
-                    @operating_system = os
-                    return os
+		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
 
@@ -184,9 +187,9 @@ module Autoproj
                     if File.exists?('/etc/debian_version')
                         codenames = [File.read('/etc/debian_version').strip]
                         if codenames.first =~ /sid/
-                            codenames << "unstable" << "sid"
+                            versions = codenames + ["unstable", "sid"]
                         end
-                        [['debian'], codenames]
+                        [['debian'], versions]
                     elsif File.exists?('/etc/gentoo-release')
                         release_string = File.read('/etc/gentoo-release').strip
                         release_string =~ /^.*([^\s]+)$/
@@ -202,9 +205,14 @@ module Autoproj
             end
 
             # Normalize the names to lowercase
-            @operating_system =
-                 [@operating_system[0].map(&:downcase),
-                 [@operating_system[1].map(&:downcase) + ["default"]]]
+            names, versions = @operating_system[0], @operating_system[1]
+            names    = names.map(&:downcase)
+            versions = versions.map(&:downcase)
+            if !versions.include?('default')
+                versions += ['default']
+            end
+
+            @operating_system = [names, versions]
             Autoproj.change_option('operating_system', @operating_system, true)
             @operating_system
         end
@@ -310,7 +318,7 @@ fi
             # Find a matching entry for the OS name
             os_entry = nil
             os_names.find do |os_name|
-                os_entry = dep_def.find do |name_list, data|
+                os_entry = dep_def.find do |name_list, _|
                     name_list.split(',').
                         map(&:downcase).
                         any? { |n| n == os_name }
@@ -327,18 +335,14 @@ fi
                 return IGNORE
             end
 
+	    # If data is a hash, it means we have to check the OS version as well
             if data.kind_of?(Hash)
-                version_entry = nil
-                os_versions.each do |os_version|
-                    version_entry =
-                        data.find do |version_list, data|
-                            version_list.to_s.split(',').
-                                map(&:downcase).
-                                any? do |v|
-                                    os_version.any? { |osv| Regexp.new(v) =~ osv }
-                                end
+                version_entry = data.find do |version_list, _|
+                    version_list.to_s.split(',').
+                        map(&:downcase).
+                        any? do |v|
+                            os_versions.any? { |osv| Regexp.new(v) =~ osv }
                         end
-                    break if version_entry
                 end
 
                 if !version_entry
@@ -348,8 +352,10 @@ fi
             end
 
             if data.respond_to?(:to_ary)
+		# List of packages
                 return [PACKAGES, data]
             elsif data.respond_to?(:to_str)
+		# Single package
                 return [PACKAGES, [data.to_str]]
             else
                 raise ConfigError.new, "invalid package specificiation #{data} in #{source_of(name)}"
@@ -423,8 +429,10 @@ fi
                 else
                     status
                 end
-            else
+            elsif !gemdeps.empty?
                 AVAILABLE
+            else
+                NO_PACKAGE
             end
         end
 
@@ -436,7 +444,17 @@ fi
         # package manager, and the set of packages that have to be installed
         # using Ruby's package manager, RubyGems.
         #
-        # Raises ConfigError if no package can be found
+        # The os_packages arrays is a list of names (strings)
+        #
+        # The gem_packages arrays is a list of [name, version] pairs. +version+
+        # is a version string, that is set only if the package has been given
+        # with a =VERSION specification, e.g.
+        #
+        #   gems:
+        #       hoe=1.8.0
+        #
+        # Raises ConfigError if an error exists in the osdeps files, and returns
+        # empty sets if the package can't be found
         def partition_packages(package_set, package_osdeps = Hash.new)
             package_set = package_set.
                 map { |name| OSDependencies.aliases[name] || name }.
@@ -477,6 +495,13 @@ fi
                     end
                 end
             end
+            gems.map! do |name|
+                if name =~ /^([^><=~]*)([><=~]+.*)$/
+                    [$1.strip, $2.strip]
+                else
+                    [name]
+                end
+            end
             return osdeps, gems
         end
 
@@ -517,10 +542,10 @@ fi
         def filter_uptodate_gems(gems)
             # Don't install gems that are already there ...
             gems = gems.dup
-            gems.delete_if do |name|
-                version_requirements = Gem::Requirement.default
+            gems.delete_if do |name, version|
+                version_requirements = Gem::Requirement.new(version || '>= 0')
                 installed = Gem.source_index.find_name(name, version_requirements)
-                if !installed.empty? && Autobuild.do_update
+                if (!installed.empty? && !version) && Autobuild.do_update
                     # Look if we can update the package ...
                     dep = Gem::Dependency.new(name, version_requirements)
                     available = gem_fetcher.find_matching(dep, false, true, OSDependencies.gem_with_prerelease)
@@ -576,7 +601,7 @@ to what you should install to compile the software successfully.
 
 	    Autoproj.configuration_option 'osdeps_mode', 'string',
 		:default => 'ruby',
-		:doc => [short_doc, long_doc],
+		:doc => message,
                 :possible_values => %w{ruby none},
                 :lowercase => true
         end
@@ -749,7 +774,7 @@ with the corresponding option (--all, --ruby, --os or --none).
             false
         end
 
-        def gems_interaction(gems, cmdline, silent)
+        def gems_interaction(gems, cmdlines, silent)
             if OSDependencies.force_osdeps
                 return true
             elsif osdeps_mode == HANDLE_ALL || osdeps_mode == HANDLE_RUBY
@@ -770,7 +795,7 @@ with the corresponding option (--all, --ruby, --os or --none).
     
     The following command line can be used to install them manually
     
-      #{cmdline.join(" ")}
+      #{cmdlines.map { |c| c.join(" ") }.join("\n      ")}
     
     Autoproj expects these Gems to be installed in #{Autoproj.gem_home} This can
     be overriden by setting the AUTOPROJ_GEM_HOME environment variable manually
@@ -793,7 +818,7 @@ with the corresponding option (--all, --ruby, --os or --none).
 
             osdeps, gems = partition_packages(packages, package_osdeps)
             if handled_os
-                os_names, os_versions = OSDependencies.operating_system
+                os_names, _ = OSDependencies.operating_system
                 os_packages = resolve_os_dependencies(osdeps)
                 if filter_uptodate_packages
                     os_packages = filter_uptodate_os_packages(os_packages, os_names)
@@ -833,15 +858,26 @@ with the corresponding option (--all, --ruby, --os or --none).
             if !gems.empty?
                 guess_gem_program
 
-                cmdline = [Autobuild.tool('gem'), 'install']
+                base_cmdline = [Autobuild.tool('gem'), 'install']
                 if Autoproj::OSDependencies.gem_with_prerelease
-                    cmdline << "--prerelease"
+                    base_cmdline << "--prerelease"
+                end
+                with_version, without_version = gems.partition { |name, v| v }
+
+                cmdlines = []
+                if !without_version.empty?
+                    cmdlines << (base_cmdline + without_version.flatten)
+                end
+                with_version.each do |name, v|
+                    cmdlines << base_cmdline + [name, "-v", v]
                 end
-                cmdline.concat(gems)
 
-                if gems_interaction(gems, cmdline, silent?)
-                    Autobuild.progress "installing/updating RubyGems dependencies: #{gems.sort.join(", ")}"
-                    Autobuild::Subprocess.run 'autoproj', 'osdeps', *cmdline
+                if gems_interaction(gems, cmdlines, silent?)
+                    Autobuild.progress "installing/updating RubyGems dependencies: #{gems.map { |g| g.join(" ") }.sort.join(", ")}"
+
+                    cmdlines.each do |c|
+                        Autobuild::Subprocess.run 'autoproj', 'osdeps', *c
+                    end
                     did_something = true
                 end
             end

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.3"
+    VERSION = "1.7.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 1
   - 7
-  - 3
-  version: 1.7.3
+  - 4
+  version: 1.7.4
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 +01:00
+date: 2011-02-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 65
         segments: 
         - 1
         - 5
-        - 25
-        version: 1.5.25
+        - 33
+        version: 1.5.33
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -174,6 +174,7 @@ description: |-
 email: 
 - sylvain.joyeux@dfki.de
 executables: 
+- amake
 - autolocate
 - autoproj
 - autoproj_bootstrap
@@ -190,6 +191,7 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
+- bin/amake
 - bin/autolocate
 - bin/autoproj
 - bin/autoproj_bootstrap