Merge pull request #648 from jkloetzke/extend-query-recipe

Extend query recipe

Author: jkloetzke

doc/manpages/bob-query-recipe.rst

@@ -17,12 +17,14 @@ Synopsis
 
     bob query-recipe [-h] [-D DEFINES] [-c CONFIGFILE]
                      [--sandbox | --slim-sandbox | --dev-sandbox | --strict-sandbox | --no-sandbox]
-                     package
+                     packages [packages ...]
 
 Description
 -----------
 
-Query recipe and class files of package.
+Print the involved recipe and class files of packages. Each file name is
+printed only once, even if multiple packages are specied that share source
+files.
 
 Options
 -------

pym/bob/cmds/misc.py

@@ -268,7 +268,7 @@ def showPackage(package, recurse, done, donePackages):
 def doQueryRecipe(argv, bobRoot):
     parser = argparse.ArgumentParser(prog="bob query-recipe",
         description="Query recipe and class files of package.")
-    parser.add_argument('package', help="(Sub-)package to query")
+    parser.add_argument('packages', nargs='+', help="(Sub-)packages to query")
     parser.add_argument('-D', default=[], action='append', dest="defines",
         help="Override default environment variable")
     parser.add_argument('-c', dest="configFile", default=[], action='append',
@@ -292,9 +292,14 @@ def doQueryRecipe(argv, bobRoot):
     recipes = RecipeSet()
     recipes.setConfigFiles(args.configFile)
     recipes.parse(defines)
-    package = recipes.generatePackages(lambda s,m: "unused", args.sandbox).walkPackagePath(args.package)
+    packages = recipes.generatePackages(lambda s,m: "unused", args.sandbox)
+
+    result = set()
+    for p in args.packages:
+        for package in packages.queryPackagePath(p):
+            result.update(package.getRecipe().getSources())
 
-    for fn in package.getRecipe().getSources():
+    for fn in sorted(result):
         print(fn)
 
 def doInit(argv, bobRoot):