autoproj 1.8.2.rc1 → 1.8.2.rc2

data/bin/autoproj

@@ -136,11 +136,13 @@ EOTEXT
     #
     # First do the resolution to get auto-add, finalize the package
     # configuration, and then re-resolve
-    resolved_selected_packages = Autoproj::CmdLine.resolve_user_selection(selected_packages)
+    Autoproj.silent do
+        Autoproj::CmdLine.resolve_user_selection(selected_packages)
+    end
     # Now load the rest of the configuration
     Autoproj::CmdLine.finalize_package_setup
     # Finally, filter out exclusions
-    resolved_selected_packages.filter_excluded_and_ignored_packages(Autoproj.manifest)
+    resolved_selected_packages = Autoproj::CmdLine.resolve_user_selection(selected_packages)
 
     if !selected_packages.empty?
         command_line_selection = resolved_selected_packages.dup

data/bin/autoproj-inspect

@@ -2,27 +2,67 @@
 
 require 'autoproj'
 require 'autoproj/cmdline'
-require 'pp'
-
 Autoproj.silent = true
-root_dir  = Autoproj::CmdLine.initialize_root_directory
-selection = Autoproj::CmdLine.initialize_and_load(ARGV)
+Autoproj::CmdLine.initialize_root_directory
+Autoproj::CmdLine.initialize_and_load(ARGV)
 
-selection.each do |name|
-    puts "resolved '#{name}' with"
-    resolved = Autoproj.manifest.resolve_package_name(name)
+require 'pp'
+default_packages = Autoproj.manifest.default_packages
+revdeps = Autoproj.manifest.compute_revdeps
 
-    packages, osdeps = resolved.partition { |type, name| type == :package }
+selected_packages = ARGV.map do |arg|
+    if File.directory?(arg)
+        File.expand_path(arg)
+    else arg
+    end
+end
+selected_packages = Autoproj::CmdLine.resolve_user_selection(selected_packages)
+
+selected_packages.selection.each_key do |name|
+    result = Autoproj.manifest.resolve_package_name(name)
+    packages, osdeps = result.partition { |type, name| type == :package }
     packages = packages.map(&:last)
     osdeps   = osdeps.map(&:last)
 
-    puts "#{packages.size} source packages"
-    puts "  " + packages.sort.join("\n  ")
-    puts "#{osdeps.size} OS dependencies"
+    packages.each do |pkg_name|
+        puts "source package #{pkg_name}"
+        if default_packages.include?(pkg_name)
+            selection = default_packages.selection[pkg_name]
+            selection.delete(pkg_name)
+            if selection.empty?
+                puts "  is directly selected by the manifest"
+            else
+                puts "  is directly selected by the manifest via #{selection.to_a.join(", ")}"
+            end
+        else
+            puts " is not directly selected by the manifest"
+        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
+
+        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.to_a.join(", ")}"
+        end
+    end
+
     osdeps.each do |pkg_name|
-        puts "  the osdep '#{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(", ")}"
+            puts "  #{manager.names.first}: #{packages.map { |*subnames| subnames.join(" ") }.join(", ")}"
         end
     end
 end

data/lib/autoproj/cmdline.rb

@@ -14,6 +14,10 @@ module Autoproj
     @verbose = false
     @console = HighLine.new
 
+    def self.silent(&block)
+        Autobuild.silent(&block)
+    end
+
     def self.message(*args)
         Autobuild.message(*args)
     end

data/lib/autoproj/manifest.rb

@@ -1886,11 +1886,12 @@ module Autoproj
 
         # Returns the set of packages that are selected by the layout
         def all_selected_packages
-            result = default_packages.packages.to_set
-            result.each do |pkg_name|
+            result = Set.new
+            root = default_packages.packages.to_set
+            root.each do |pkg_name|
                 Autobuild::Package[pkg_name].all_dependencies(result)
             end
-            result
+            result | root
         end
 
         # Returns the set of packages that should be built if the user does not
@@ -2241,6 +2242,23 @@ module Autoproj
         def move_package(package_name, new_dir)
             moved_packages[package_name] = File.join(new_dir, File.basename(package_name))
         end
+
+        # Compute the reverse dependencies of all the packages
+        #
+        # The return value is a hash of the form
+        # 
+        #   package_name => [list_of_packages_that_depend_on_package_name]
+        #
+        # Where the list is given as a list of package names as well
+        def compute_revdeps
+            result = Hash.new { |h, k| h[k] = Set.new }
+            each_autobuild_package do |pkg|
+                pkg.dependencies.each do |pkg_name|
+                    result[pkg_name] << pkg.name
+                end
+            end
+            result
+        end
     end
 
     class << self

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.8.2.rc1"
+    VERSION = "1.8.2.rc2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoproj
 version: !ruby/object:Gem::Version
-  version: 1.8.2.rc1
+  version: 1.8.2.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: autobuild
-  requirement: &5160020 !ruby/object:Gem::Requirement
+  requirement: &11454720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *5160020
+  version_requirements: *11454720
 - !ruby/object:Gem::Dependency
   name: utilrb
-  requirement: &5157900 !ruby/object:Gem::Requirement
+  requirement: &11453940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *5157900
+  version_requirements: *11453940
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &5155740 !ruby/object:Gem::Requirement
+  requirement: &11453060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *5155740
+  version_requirements: *11453060
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &5153800 !ruby/object:Gem::Requirement
+  requirement: &11451860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *5153800
+  version_requirements: *11451860
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &5169340 !ruby/object:Gem::Requirement
+  requirement: &11450480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *5169340
+  version_requirements: *11450480
 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.