autoproj 1.9.0 → 1.9.1

data/Manifest.txt

@@ -10,10 +10,8 @@ bin/autoproj
 bin/autoproj-clean
 bin/autoproj-create-set
 bin/autoproj-envsh
-bin/autoproj-list
 bin/autoproj-locate
 bin/autoproj-query
-bin/autoproj-show
 bin/autoproj_bootstrap
 bin/autoproj_bootstrap.in
 bin/autoproj_stress_test

data/bin/autoproj

@@ -18,33 +18,6 @@ def color(*args)
     Autoproj.color(*args)
 end
 
-def report
-    Autobuild::Reporting.report do
-        yield
-    end
-    Autobuild::Reporting.success
-
-rescue ConfigError => e
-    STDERR.puts
-    STDERR.puts color(e.message, :red, :bold)
-    if Autoproj.in_autoproj_installation?(Dir.pwd)
-        root_dir = /^#{Regexp.quote(Autoproj.root_dir)}(?!\/\.gems)/
-        e.backtrace.find_all { |path| path =~ root_dir }.
-            each do |path|
-                STDERR.puts color("  in #{path}", :red, :bold)
-            end
-    end
-    if Autobuild.debug then raise
-    else exit 1
-    end
-rescue Interrupt
-    STDERR.puts
-    STDERR.puts color("Interrupted by user", :red, :bold)
-    if Autobuild.debug then raise
-    else exit 1
-    end
-end
-
 Autoproj::OSDependencies.autodetect_ruby
 
 # Check the first element of ARGV. If a tool called autoproj-VALUE exists, just
@@ -65,7 +38,7 @@ if File.file?("#{prefix}-#{ARGV.first}")
 end
 
 # Find the autoproj root dir
-report do
+Autoproj::CmdLine.report do
     selected_packages =
         begin Autoproj::CmdLine.parse_arguments(ARGV.dup)
         rescue RuntimeError => e
@@ -150,12 +123,21 @@ EOTEXT
     # First do the resolution to get auto-add, finalize the package
     # configuration, and then re-resolve
     Autoproj.silent do
-        Autoproj::CmdLine.resolve_user_selection(selected_packages)
+        begin
+            Autoproj::CmdLine.resolve_user_selection(selected_packages)
+        rescue Autoproj::Manifest::ExcludedSelection => e
+            raise e, "#{e.selection}, which is selected on the command line, cannot be built: #{e.message}"
+        end
     end
     # Now load the rest of the configuration
     Autoproj::CmdLine.finalize_package_setup
     # Finally, filter out exclusions
-    resolved_selected_packages = Autoproj::CmdLine.resolve_user_selection(selected_packages)
+    resolved_selected_packages =
+        begin
+            Autoproj::CmdLine.resolve_user_selection(selected_packages)
+        rescue Autoproj::Manifest::ExcludedSelection => e
+            raise e, "#{e.sel}, which is selected on the command line, cannot be built: #{e.message}"
+        end
     Autoproj::CmdLine.validate_user_selection(selected_packages, resolved_selected_packages)
 
     if !selected_packages.empty?
@@ -258,6 +240,7 @@ EOTEXT
     # line.
     all_enabled_packages = Autoproj::CmdLine.import_packages(selected_packages)
     Autoproj::CmdLine.load_all_available_package_manifests
+    Autoproj::CmdLine.export_installation_manifest
 
     if Autoproj::CmdLine.update_os_dependencies? && !all_enabled_packages.empty?
         begin

data/bin/autoproj-envsh

@@ -2,10 +2,13 @@
 
 require 'autoproj'
 require 'autoproj/cmdline'
-Autoproj.silent do
-    Autoproj::CmdLine.initialize_root_directory
-    Autoproj::CmdLine.initialize_and_load(ARGV)
+Autoproj::CmdLine.report do
+    Autoproj.silent do
+        Autoproj::CmdLine.initialize_root_directory
+        Autoproj::CmdLine.initialize_and_load(ARGV)
+    end
+    Autoproj.export_env_sh
+    Autoproj::CmdLine.export_installation_manifest
+    Autoproj.message "autoproj: updated #{Autoproj.root_dir}/#{Autoproj::ENV_FILENAME}", :green
 end
-Autoproj.export_env_sh
-Autoproj.message "autoproj: updated #{Autoproj.root_dir}/#{Autoproj::ENV_FILENAME}", :green
 

data/bin/autoproj_bootstrap

@@ -5,6 +5,24 @@ if RUBY_VERSION < "1.8.7"
     exit 1
 end
 
+if defined? Encoding # This is a 1.9-only thing
+    Encoding.default_internal = Encoding::UTF_8
+    Encoding.default_external = Encoding::UTF_8
+end
+
+require 'rbconfig'
+module Autobuild
+    @windows = RbConfig::CONFIG["host_os"] =~%r!(msdos|mswin|djgpp|mingw|[Ww]indows)!
+    def self.windows?
+        @windows
+    end
+
+    @macos =  RbConfig::CONFIG["host_os"] = ~%r!([Dd]arwin)!
+    def self.macos?
+        @macos
+    end
+end
+
 require 'set'
 curdir_entries = Dir.entries('.').to_set - [".", "..", "autoproj_bootstrap", ".gems", 'env.sh'].to_set
 if !curdir_entries.empty? && ENV['AUTOPROJ_BOOTSTRAP_IGNORE_NONEMPTY_DIR'] != '1'
@@ -841,13 +859,13 @@ fi
                 end
             else
                 Autoproj.message "  autodetecting the operating system"
-                name, versions = os_from_lsb
-                if name
-                    if name != "debian"
+                lsb_name, lsb_versions = os_from_lsb
+                if lsb_name
+                    if lsb_name != "debian"
                         if File.exists?("/etc/debian_version")
-                            @operating_system = [[name, "debian"], versions]
+                            @operating_system = [[lsb_name, "debian"], lsb_versions]
                         else
-                            @operating_system = [[name], versions]
+                            @operating_system = [[lsb_name], lsb_versions]
                         end
                     end
                 end
@@ -861,6 +879,9 @@ fi
                         if versions.first =~ /sid/
                             versions = ["unstable", "sid"]
                         end
+                        if lsb_versions
+                            lsb_versions.each { |v| versions << v if !versions.include?(v) }
+                        end
                         [['debian'], versions]
                     elsif File.exists?('/etc/fedora-release')
                         release_string = File.read('/etc/fedora-release').strip
@@ -1808,9 +1829,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(false).each do |pkg_name|
-                Autobuild::Package[pkg_name].update_environment
-            end
+            Autoproj::CmdLine.update_environment
         end
 
         filename = if subdir

data/bin/autoproj_bootstrap.in

@@ -5,6 +5,24 @@ if RUBY_VERSION < "1.8.7"
     exit 1
 end
 
+if defined? Encoding # This is a 1.9-only thing
+    Encoding.default_internal = Encoding::UTF_8
+    Encoding.default_external = Encoding::UTF_8
+end
+
+require 'rbconfig'
+module Autobuild
+    @windows = RbConfig::CONFIG["host_os"] =~%r!(msdos|mswin|djgpp|mingw|[Ww]indows)!
+    def self.windows?
+        @windows
+    end
+
+    @macos =  RbConfig::CONFIG["host_os"] = ~%r!([Dd]arwin)!
+    def self.macos?
+        @macos
+    end
+end
+
 require 'set'
 curdir_entries = Dir.entries('.').to_set - [".", "..", "autoproj_bootstrap", ".gems", 'env.sh'].to_set
 if !curdir_entries.empty? && ENV['AUTOPROJ_BOOTSTRAP_IGNORE_NONEMPTY_DIR'] != '1'

data/lib/autoproj/autobuild.rb

@@ -299,9 +299,8 @@ module Autoproj
             dir ||= find_topmost_directory_containing(full_path, 'CMakeLists.txt')
 
             return "cmake_package", dir
-        elsif !Dir.glob('*.rb').empty?
-            dir = find_topmost_directory_containing(full_path, "Rakefile") ||
-                find_topmost_directory_containing(full_path, "lib/*.rb")
+        elsif dir = find_topmost_directory_containing(full_path, "Rakefile") ||
+            find_topmost_directory_containing(full_path, "lib/*.rb")
 
             return "ruby_package", dir
         end

data/lib/autoproj/cmdline.rb

@@ -42,6 +42,46 @@ module Autoproj
     end
 
     module CmdLine
+        def self.handle_ruby_version
+            ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']
+            ruby_bindir = RbConfig::CONFIG['bindir']
+
+            ruby_executable = File.join(ruby_bindir, ruby)
+            if Autoproj.has_config_key?('ruby_executable')
+                expected = Autoproj.user_config('ruby_executable')
+                if expected != ruby_executable
+                    raise ConfigError.new, "this autoproj installation was bootstrapped using #{expected}, but you are currently running under #{ruby_executable}. This is usually caused by calling a wrong gem program (for instance, gem1.8 instead of gem1.9.1)"
+                end
+            end
+            Autoproj.change_option('ruby_executable', ruby_executable, true)
+
+            install_suffix = ""
+            if match = /ruby(.*)$/.match(ruby)
+                install_suffix = match[1]
+            end
+
+            bindir = File.join(Autoproj.build_dir, 'bin')
+            FileUtils.mkdir_p bindir
+            Autoproj.env_add 'PATH', bindir
+
+            File.open(File.join(bindir, 'ruby'), 'w') do |io|
+                io.puts "#! /bin/sh"
+                io.puts "exec #{File.join(ruby_bindir, ruby)} \"$@\""
+            end
+            FileUtils.chmod 0755, File.join(bindir, 'ruby')
+
+            subprograms = ['gem', 'irb'].each do |name|
+                # Look for the corresponding gem program
+                prg_name = "#{name}#{install_suffix}"
+                if File.file?(prg_path = File.join(ruby_bindir, prg_name))
+                    File.open(File.join(bindir, name), 'w') do |io|
+                        io.puts "#! /bin/sh"
+                        io.puts "exec #{prg_path} \"$@\""
+                    end
+                end
+            end
+        end
+
         def self.initialize
             if defined? Encoding # This is a 1.9-only thing
                 Encoding.default_internal = Encoding::UTF_8
@@ -59,14 +99,7 @@ module Autoproj
             Autoproj.loaded_autobuild_files.clear
             Autoproj.load_config
 
-            ruby_executable = Autoproj.find_in_path(RbConfig::CONFIG['RUBY_INSTALL_NAME'])
-            if Autoproj.has_config_key?('ruby_executable')
-                expected = Autoproj.user_config('ruby_executable')
-                if expected != ruby_executable
-                    raise ConfigError.new, "this autoproj installation was bootstrapped using #{expected}, but you are currently running under #{ruby_executable}. This is usually caused by calling a wrong gem program (for instance, gem1.8 instead of gem1.9.1)"
-                end
-            end
-            Autoproj.change_option('ruby_executable', ruby_executable, true)
+            handle_ruby_version
 
             if Autoproj.has_config_key?('autobuild')
                 params = Autoproj.user_config('autobuild')
@@ -102,19 +135,6 @@ module Autoproj
             Autobuild.srcdir  = Autoproj.root_dir
             Autobuild.logdir = File.join(Autobuild.prefix, 'log')
 
-            ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']
-            if ruby != 'ruby'
-                bindir = File.join(Autoproj.build_dir, 'bin')
-                FileUtils.mkdir_p bindir
-                File.open(File.join(bindir, 'ruby'), 'w') do |io|
-                    io.puts "#! /bin/sh"
-                    io.puts "exec #{ruby} \"$@\""
-                end
-                FileUtils.chmod 0755, File.join(bindir, 'ruby')
-
-                Autoproj.env_add 'PATH', bindir
-            end
-
             Autoproj.manifest = Manifest.new
 
             local_source = LocalPackageSet.new(Autoproj.manifest)
@@ -332,16 +352,20 @@ module Autoproj
 
 
         def self.setup_all_package_directories
-            manifest = Autoproj.manifest
+            # Override the package directories from our reused installations
+            imported_packages = Set.new
+            Autoproj.manifest.reused_installations.each do |manifest|
+                manifest.each do |pkg|
+                    imported_packages << pkg.name
+                    Autobuild::Package[pkg.name].srcdir = pkg.srcdir
+                    Autobuild::Package[pkg.name].prefix = pkg.prefix
+                end
+            end
 
-            # Now starts a different stage of the whole build. Until now, we were
-            # working on the whole package set. Starting from now, we need to build the
-            # package sets based on the layout file
-            #
-            # First, we allow to user to specify packages based on disk paths, so
-            # resolve those
+            manifest = Autoproj.manifest
             manifest.packages.each_value do |pkg_def|
                 pkg = pkg_def.autobuild
+                next if imported_packages.include?(pkg_def.name)
                 setup_package_directories(pkg)
             end
         end
@@ -371,10 +395,7 @@ module Autoproj
                 Autobuild::Package[pkg_name].disable
             end
 
-            # Make sure that we have the environment of all selected packages
-            manifest.all_selected_packages.each do |pkg_name|
-                Autobuild::Package[pkg_name].update_environment
-            end
+            update_environment
 
             # We now have processed the process setup blocks. All configuration
             # should be done and we can save the configuration data.
@@ -392,6 +413,8 @@ module Autoproj
                 if File.directory?(pkg.autobuild.srcdir)
                     begin
                         manifest.load_package_manifest(pkg.autobuild.name)
+                    rescue Interrupt
+                        raise
                     rescue Exception => e
                         Autoproj.warn "cannot load package manifest for #{pkg.autobuild.name}: #{e.message}"
                     end
@@ -399,6 +422,19 @@ module Autoproj
             end
         end
 
+        def self.update_environment
+            Autoproj.manifest.reused_installations.each do |manifest|
+                manifest.each do |pkg|
+                    Autobuild::Package[pkg.name].update_environment
+                end
+            end
+
+            # Make sure that we have the environment of all selected packages
+            manifest.all_selected_packages(false).each do |pkg_name|
+                Autobuild::Package[pkg_name].update_environment
+            end
+        end
+
         def self.display_configuration(manifest, package_list = nil)
             # Load the manifest for packages that are already present on the
             # file system
@@ -670,6 +706,7 @@ module Autoproj
                 Autoproj.each_post_import_block(pkg) do |block|
                     block.call(pkg)
                 end
+                pkg.update_environment
 
                 # Verify that its dependencies are there, and add
                 # them to the selected_packages set so that they get
@@ -1527,6 +1564,7 @@ where 'mode' is one of:
                 do_switch_config(false, type, url, *options)
             end
 
+            handle_ruby_version
             Autoproj.save_config
 
             Autobuild.env_set 'RUBYOPT', '-rubygems'
@@ -1783,6 +1821,7 @@ where 'mode' is one of:
             Autoproj::CmdLine.finalize_package_setup
 
             load_all_available_package_manifests
+            update_environment
             remaining_arguments
         end
 
@@ -1841,6 +1880,42 @@ where 'mode' is one of:
                 puts "  #{Pathname.new(dir).relative_path_from(root)}"
             end
         end
+
+        def self.export_installation_manifest
+            File.open(File.join(Autoproj.root_dir, ".autoproj-installation-manifest"), 'w') do |io|
+                Autoproj.manifest.all_selected_packages.each do |pkg_name|
+                    pkg = Autobuild::Package[pkg_name]
+                    io.puts "#{pkg_name},#{pkg.srcdir},#{pkg.prefix}"
+                end
+            end
+        end
+
+        def self.report
+            Autobuild::Reporting.report do
+                yield
+            end
+            Autobuild::Reporting.success
+
+        rescue ConfigError => e
+            STDERR.puts
+            STDERR.puts color(e.message, :red, :bold)
+            if Autoproj.in_autoproj_installation?(Dir.pwd)
+                root_dir = /^#{Regexp.quote(Autoproj.root_dir)}(?!\/\.gems)/
+                e.backtrace.find_all { |path| path =~ root_dir }.
+                    each do |path|
+                        STDERR.puts color("  in #{path}", :red, :bold)
+                    end
+            end
+            if Autobuild.debug then raise
+            else exit 1
+            end
+        rescue Interrupt
+            STDERR.puts
+            STDERR.puts color("Interrupted by user", :red, :bold)
+            if Autobuild.debug then raise
+            else exit 1
+            end
+        end
     end
 end
 

data/lib/autoproj/manifest.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'csv'
 require 'utilrb/kernel/options'
 require 'set'
 require 'rexml/document'
@@ -966,7 +967,6 @@ module Autoproj
     # The Manifest class represents the information included in the main
     # manifest file, and allows to manipulate it
     class Manifest
-
         # Data structure used to use autobuild importers without a package, to
         # import configuration data.
         #
@@ -1023,7 +1023,7 @@ module Autoproj
 
             @file = file
             @data = data
-            data['ignore_packages'] ||= Set.new
+            @ignored_packages |= (data['ignored_packages'] || Set.new)
             data['exclude_packages'] ||= Set.new
 
             if data['constants']
@@ -1044,6 +1044,12 @@ module Autoproj
         # The path to the manifest file that has been loaded
         attr_reader :file
 
+        # The set of package names for packages that should be ignored
+        attr_reader :ignored_packages
+
+        # A set of other autoproj installations that are being reused
+        attr_reader :reused_installations
+
         # True if osdeps should be handled in update and build, or left to the
         # osdeps command
         def auto_osdeps?
@@ -1075,6 +1081,8 @@ module Autoproj
             @osdeps_overrides = Hash.new
             @metapackages = Hash.new
             @ignored_os_dependencies = Set.new
+            @reused_installations = Array.new
+            @ignored_packages = Set.new
 
             @constant_definitions = Hash.new
             if Autoproj.has_config_key?('manifest_source')
@@ -1086,7 +1094,7 @@ module Autoproj
         # Call this method to ignore a specific package. It must not be used in
         # init.rb, as the manifest is not yet loaded then
         def ignore_package(package_name)
-            data['ignore_packages'] << package_name
+            @ignored_packages << package_name
         end
 
         # True if the given package should not be built, with the packages that
@@ -1094,7 +1102,7 @@ module Autoproj
         #
         # This is useful if the packages are already installed on this system.
         def ignored?(package_name)
-            data['ignore_packages'].any? do |l|
+            ignored_packages.any? do |l|
                 if package_name == l
                     true
                 elsif (pkg_set = metapackages[l]) && pkg_set.include?(package_name)
@@ -1107,7 +1115,7 @@ module Autoproj
 
         # Enumerates the package names of all ignored packages
         def each_ignored_package
-            data['ignore_packages'].each do |l|
+            ignored_packages.each do |l|
                 if pkg_set = metapackages[l]
                     pkg_set.each_package do |pkg|
                         yield(pkg.name)
@@ -1126,7 +1134,7 @@ module Autoproj
 
         # Removes all registered ignored packages
         def clear_ignored
-            data['ignore_packages'].clear
+            ignored_packages.clear
         end
 
         # The set of package names that are listed in the excluded_packages
@@ -1767,7 +1775,7 @@ module Autoproj
             else
                 pkg_set = find_metapackage(name)
                 if !pkg_set
-                    raise ConfigError.new, "#{name} is neither a package nor a package set name. Packages in autoproj must be declared in an autobuild file."
+                    raise UnknownPackage.new(name), "#{name} is neither a package nor a package set name. Packages in autoproj must be declared in an autobuild file."
                 end
                 pkg_set.each_package.
                     map(&:name).
@@ -1813,22 +1821,27 @@ module Autoproj
             metapackages.each_value(&block)
         end
 
-        # Returns the packages contained in the provided layout definition
+        # Returns the packages selected in this manifest's layout
         #
-        # If recursive is false, yields only the packages at this level.
-        # Otherwise, return all packages.
+        # @return [PackageSelection]
         def layout_packages(validate)
             result = PackageSelection.new
             Autoproj.in_file(self.file) do
                 normalized_layout.each_key do |pkg_or_set|
-                    result.select(pkg_or_set, resolve_package_set(pkg_or_set))
+                    begin
+                        result.select(pkg_or_set, resolve_package_set(pkg_or_set))
+                    rescue UnknownPackage => e
+                        raise e, "#{e.name}, which is selected in the layout, is unknown: #{e.message}", e.backtrace
+                    end
                 end
             end
             
             begin
                 result.filter_excluded_and_ignored_packages(self)
-            rescue ConfigError
-                raise if validate
+            rescue ExcludedSelection => e
+                if validate
+                    raise e, "#{e.sel}, which is selected in the layout, cannot be built: #{e.message}", e.backtrace
+                end
             end
             result
         end
@@ -2086,6 +2099,24 @@ module Autoproj
             @osdeps_overrides.delete(osdeps_name.to_s)
         end
 
+        # Exception raised by
+        # PackageSelection#filter_excluded_and_ignored_packages when a given
+        # selection is completely excluded
+        class ExcludedSelection < ConfigError
+            attr_reader :selection
+            def initialize(selection)
+                @selection = selection
+            end
+        end
+
+        # Exception raised when an unknown package is encountered
+        class UnknownPackage < ConfigError
+            attr_reader :name
+            def initialize(name)
+                @name = name
+            end
+        end
+
         # Class holding information about which packages have been selected, and
         # why. It is used to decide whether some non-availability of packages
         # are errors or simply warnings (i.e. if the user really wants a given
@@ -2162,12 +2193,12 @@ module Autoproj
                         if exclusions.size == 1
                             reason = exclusions[0][1]
                             if sel == exclusions[0][0]
-                                raise ConfigError.new, "#{sel} is excluded from the build: #{reason}"
+                                raise ExcludedSelection.new(sel), "it is excluded from the build: #{reason}"
                             else
-                                raise ConfigError.new, "#{sel} expands to #{exclusions.map(&:first).join(", ")}, which is excluded from the build: #{reason}"
+                                raise ExcludedSelection.new(sel), "it expands to #{exclusions.map(&:first).join(", ")}, which is excluded from the build: #{reason}"
                             end
                         else
-                            raise ConfigError.new, "#{sel} expands to #{exclusions.map(&:first).join(", ")}, and all these packages are excluded from the build:\n  #{exclusions.map { |name, reason| "#{name}: #{reason}" }.join("\n  ")}"
+                            raise ExcludedSelection.new(sel), "it expands to #{exclusions.map(&:first).join(", ")}, and all these packages are excluded from the build:\n  #{exclusions.map { |name, reason| "#{name}: #{reason}" }.join("\n  ")}"
                         end
                     elsif !ignored.empty?
                         ignored.each do |pkg_name|
@@ -2300,6 +2331,21 @@ module Autoproj
             end
             result
         end
+
+        def reuse(*dir)
+            dir = File.expand_path(File.join(*dir), Autoproj.root_dir)
+            if reused_installations.any? { |mnf| mnf.path == dir }
+                return
+            end
+
+            manifest = InstallationManifest.new(dir)
+            manifest.load(File.join(dir,  ".autoproj-installation-manifest"))
+            @reused_installations << manifest
+            manifest.each do |pkg|
+                puts pkg.name
+                ignore_package pkg.name
+            end
+        end
     end
 
     class << self
@@ -2317,6 +2363,27 @@ module Autoproj
         osdeps
     end
 
+    # Manifest of installed packages imported from another autoproj installation
+    class InstallationManifest
+        Package = Struct.new :name, :srcdir, :prefix
+
+        attr_reader :path
+        attr_reader :packages
+        def initialize(path)
+            @path = path
+        end
+
+        def load(path)
+            @packages = CSV.read(path).map do |row|
+                Package.new(*row)
+            end
+        end
+
+        def each(&block)
+            packages.each(&block)
+        end
+    end
+
     # Access to the information contained in a package's manifest.xml file
     #
     # Use PackageManifest.load to create

data/lib/autoproj/osdeps.rb

@@ -742,13 +742,13 @@ fi
                 end
             else
                 Autoproj.message "  autodetecting the operating system"
-                name, versions = os_from_lsb
-                if name
-                    if name != "debian"
+                lsb_name, lsb_versions = os_from_lsb
+                if lsb_name
+                    if lsb_name != "debian"
                         if File.exists?("/etc/debian_version")
-                            @operating_system = [[name, "debian"], versions]
+                            @operating_system = [[lsb_name, "debian"], lsb_versions]
                         else
-                            @operating_system = [[name], versions]
+                            @operating_system = [[lsb_name], lsb_versions]
                         end
                     end
                 end
@@ -762,6 +762,9 @@ fi
                         if versions.first =~ /sid/
                             versions = ["unstable", "sid"]
                         end
+                        if lsb_versions
+                            lsb_versions.each { |v| versions << v if !versions.include?(v) }
+                        end
                         [['debian'], versions]
                     elsif File.exists?('/etc/fedora-release')
                         release_string = File.read('/etc/fedora-release').strip

data/lib/autoproj/system.rb

@@ -148,9 +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(false).each do |pkg_name|
-                Autobuild::Package[pkg_name].update_environment
-            end
+            Autoproj::CmdLine.update_environment
         end
 
         filename = if subdir

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.9.0"
+    VERSION = "1.9.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: &24040760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *24040760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &24040300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *24040300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &24039840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *24039840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &24039380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,18 +69,28 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *24039380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &24038940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
   type: :development
   prerelease: false
-  version_requirements: *24038940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.4'
 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.
@@ -79,10 +104,8 @@ executables:
 - autoproj-clean
 - autoproj-create-set
 - autoproj-envsh
-- autoproj-list
 - autoproj-locate
 - autoproj-query
-- autoproj-show
 - autoproj_bootstrap
 - autoproj_bootstrap.in
 - autoproj_stress_test
@@ -105,10 +128,8 @@ files:
 - bin/autoproj-clean
 - bin/autoproj-create-set
 - bin/autoproj-envsh
-- bin/autoproj-list
 - bin/autoproj-locate
 - bin/autoproj-query
-- bin/autoproj-show
 - bin/autoproj_bootstrap
 - bin/autoproj_bootstrap.in
 - bin/autoproj_stress_test
@@ -172,14 +193,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: autobuild
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Easy installation and management of sets of software packages
 test_files:
-- test/test_manifest.rb
-- test/test_package_manifest.rb
 - test/test_os_dependencies.rb
 - test/test_debian.rb
+- test/test_manifest.rb
 - test/package_managers/test_apt_dpkg_manager.rb
 - test/package_managers/test_gem.rb
+- test/test_package_manifest.rb

data/bin/autoproj-list

@@ -1,68 +0,0 @@
-#! /usr/bin/env ruby
-
-require 'autoproj'
-require 'autoproj/cmdline'
-
-Autoproj.silent do
-    Autoproj::CmdLine.initialize_root_directory
-    Autoproj::CmdLine.initialize_and_load(ARGV)
-end
-manifest = Autoproj.manifest
-
-# 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
-
-all_packages = Hash.new
-package_sets = manifest.each_package_set.to_a
-package_sets.each do |pkg_set|
-    pkg_set.each_package.each do |pkg|
-        all_packages[pkg.name] = [pkg, pkg_set.name]
-    end
-end
-
-metapackages = manifest.metapackages.values
-
-if package_sets.empty?
-    Autoproj.message("autoproj: no package sets defined in autoproj/manifest", :bold, :red)
-    exit(0)
-end
-
-Autoproj.message
-Autoproj.message("autoproj: package sets", :bold)
-package_sets.sort_by(&:name).each do |pkg_set|
-    next if pkg_set.empty?
-    if pkg_set.imported_from
-        Autoproj.message "  #{pkg_set.name} (imported by #{pkg_set.imported_from.name})"
-    else
-        Autoproj.message "  #{pkg_set.name} (listed in manifest)"
-    end
-end
-
-Autoproj.message
-Autoproj.message("autoproj: metapackages", :bold)
-metapackages.sort_by(&:name).each do |metap|
-    Autoproj.message "  #{metap.name}"
-end
-
-packages_not_present = []
-
-Autoproj.message
-Autoproj.message("autoproj: packages", :bold)
-all_packages.to_a.sort_by(&:first).map(&:last).each do |pkg, pkg_set|
-    if File.exists?(File.join(pkg.srcdir, "manifest.xml"))
-        manifest.load_package_manifest(pkg.name)
-        manifest.resolve_optional_dependencies
-    end
-
-    pkg_manifest = pkg.description
-    if File.directory?(pkg.srcdir)
-        Autoproj.message "  #{pkg.name}#{": #{pkg_manifest.short_documentation}" if pkg_manifest && pkg_manifest.short_documentation}"
-    else
-        Autoproj.message "  #{pkg.name}: not yet checked out", :magenta
-    end
-end

data/bin/autoproj-show

@@ -1,102 +0,0 @@
-#! /usr/bin/env ruby
-
-require 'autoproj'
-require 'autoproj/cmdline'
-Autoproj.silent = true
-Autoproj::CmdLine.initialize_root_directory
-Autoproj::CmdLine.initialize_and_load(ARGV)
-
-require 'pp'
-default_packages = Autoproj.manifest.default_packages
-revdeps = Autoproj.manifest.compute_revdeps
-
-user_selection = ARGV.map do |arg|
-    if File.directory?(arg)
-        File.expand_path(arg)
-    else arg
-    end
-end
-resolved_selection = Autoproj::CmdLine.resolve_user_selection(user_selection, :filter => false)
-packages = resolved_selection.selection.keys
-
-def find_selection_path(from, to)
-    path = [from]
-    if from == to
-        return path
-    end
-
-    Autobuild::Package[from].dependencies.each do |dep_pkg_name|
-        if result = find_selection_path(dep_pkg_name, to)
-            return path + result
-        end
-    end
-    nil
-end
-
-packages.each do |name|
-    result = Autoproj.manifest.resolve_package_name(name, :filter => false)
-    packages, osdeps = result.partition { |type, name| type == :package }
-    packages = packages.map(&:last)
-    osdeps   = osdeps.map(&:last)
-
-    packages.each do |pkg_name|
-        puts "source package #{pkg_name}"
-        if default_packages.include?(pkg_name)
-            selection = default_packages.selection[pkg_name]
-            if selection.include?(pkg_name) && selection.size == 1
-                puts "  is directly selected by the manifest"
-            else
-                selection = selection.dup
-                selection.delete(pkg_name)
-                puts "  is directly selected by the manifest via #{selection.to_a.join(", ")}"
-            end
-        else
-            puts " is not directly selected by the manifest"
-        end
-        if Autoproj.manifest.ignored?(pkg_name)
-            puts " is ignored"
-        end
-        if Autoproj.manifest.excluded?(pkg_name)
-            puts " is excluded: #{Autoproj.manifest.exclusion_reason(pkg_name)}"
-        end
-
-        all_reverse_dependencies = Set.new
-        pkg_revdeps = revdeps[pkg_name].dup.to_a
-        while !pkg_revdeps.empty?
-            parent_name = pkg_revdeps.shift
-            next if all_reverse_dependencies.include?(parent_name)
-            all_reverse_dependencies << parent_name
-            pkg_revdeps.concat(revdeps[parent_name].to_a)
-        end
-        if all_reverse_dependencies.empty?
-            puts "  no reverse dependencies"
-        else
-            puts "  reverse dependencies: #{all_reverse_dependencies.sort.join(", ")}"
-        end
-
-        selections = Set.new
-        all_reverse_dependencies = all_reverse_dependencies.to_a.sort
-        all_reverse_dependencies.each do |parent_name|
-            if default_packages.include?(parent_name)
-                selections |= default_packages.selection[parent_name]
-            end
-        end
-
-        if !selections.empty?
-            puts "  selected by way of"
-            selections.each do |root_pkg|
-                path = find_selection_path(root_pkg, pkg_name)
-                puts "    #{path.join(">")}"
-            end
-        end
-        puts "  directly depends on: #{Autobuild::Package[pkg_name].dependencies.sort.join(", ")}"
-    end
-
-    osdeps.each do |pkg_name|
-        puts "the osdep '#{pkg_name}'"
-        Autoproj.osdeps.resolve_os_dependencies(pkg_name).each do |manager, packages|
-            puts "  #{manager.names.first}: #{packages.map { |*subnames| subnames.join(" ") }.join(", ")}"
-        end
-    end
-end
-