1 files changed, 63 insertions, 13 deletions

diff --git a/tests/manifest/driver.cxx b/tests/manifest/driver.cxx
index 7ea77e3..56c886d 100644
--- a/tests/manifest/driver.cxx
+++ b/tests/manifest/driver.cxx
@@ -3,24 +3,28 @@
 
 #include <ios>      // ios_base::failbit, ios_base::badbit
 #include <string>
-#include <cassert>
 #include <iostream>
 
-#include <libbutl/manifest-parser.mxx>
-#include <libbutl/manifest-serializer.mxx>
-#include <libbutl/standard-version.mxx>
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
+#include <libbutl/standard-version.hxx>
 
 #include <libbpkg/manifest.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace butl;
 using namespace bpkg;
 
 // Usages:
 //
-// argv[0] (-pp|-dp|-gp|-pr|-dr|-gr|-s)
-// argv[0] -p -c -i
+// argv[0] (-pp|-dp|-gp|-pr|-dr|-gr|-s) [-l]
+// argv[0] -p [-c] [-i] [-l]
 // argv[0] -ec <version>
+// argv[0] -et <type> <name>
+// argv[0] -v
 //
 // In the first form read and parse manifest list from stdin and serialize it
 // to stdout. The following options specify the manifest type.
@@ -32,19 +36,28 @@ using namespace bpkg;
 // -dr  parse dir repository manifest list
 // -gr  parse git repository manifest list
 // -s   parse signature manifest
+// -v   print the libbpkg version
 //
 // In the second form read and parse the package manifest from stdin and
 // serialize it to stdout.
 //
-// -c   complete the dependency constraints
+// -c   complete the incomplete values (depends, <distribution>-version, etc)
 // -i   ignore unknown
 //
 // Note: the above options should go after -p on the command line.
 //
+// -l
+//    Don't break long lines while serializing a manifest.
+//
 // In the third form read and parse dependency constraints from stdin and
 // roundtrip them to stdout together with their effective constraints,
 // calculated using version passed as an argument.
 //
+// In the forth form print the effective type and the type sub-options to
+// stdout (one per line) and exit.
+//
+// In the fifth form print the libbpkg version to stdout and exit.
+//
 int
 main (int argc, char* argv[])
 {
@@ -53,28 +66,38 @@ main (int argc, char* argv[])
 
   cout.exceptions (ios_base::failbit | ios_base::badbit);
 
-  manifest_parser     p (cin,  "stdin");
-  manifest_serializer s (cout, "stdout");
+  if (mode == "-v")
+  {
+    cout << standard_version (LIBBPKG_VERSION_STR) << endl;
+    return 0;
+  }
+
+  manifest_parser p (cin,  "stdin");
 
   try
   {
     if (mode == "-p")
     {
-      bool complete_dependencies (false);
+      bool complete_values (false);
       bool ignore_unknown (false);
+      bool long_lines (false);
 
       for (int i (2); i != argc; ++i)
       {
         string o (argv[i]);
 
         if (o == "-c")
-          complete_dependencies = true;
+          complete_values = true;
         else if (o == "-i")
           ignore_unknown = true;
+        else if (o == "-l")
+          long_lines = true;
         else
           assert (false);
       }
 
+      manifest_serializer s (cout, "stdout", long_lines);
+
       cin.exceptions (ios_base::failbit | ios_base::badbit);
 
       package_manifest (
@@ -95,7 +118,7 @@ main (int argc, char* argv[])
           }
         },
         ignore_unknown,
-        complete_dependencies).serialize (s);
+        complete_values).serialize (s);
     }
     else if (mode == "-ec")
     {
@@ -116,9 +139,36 @@ main (int argc, char* argv[])
         cout << c << " " << ec << endl;
       }
     }
+    else if (mode == "-et")
+    {
+      assert (argc == 4);
+
+      optional<string> t (*argv[2] != '\0'
+                          ? string (argv[2])
+                          : optional<string> ());
+
+      package_name n (argv[3]);
+
+      cout << package_manifest::effective_type (t, n) << endl;
+
+      for (const string& so: package_manifest::effective_type_sub_options (t))
+        cout << so << endl;
+    }
     else
     {
-      assert (argc == 2);
+      bool long_lines (false);
+
+      for (int i (2); i != argc; ++i)
+      {
+        string o (argv[i]);
+
+        if (o == "-l")
+          long_lines = true;
+        else
+          assert (false);
+      }
+
+      manifest_serializer s (cout, "stdout", long_lines);
 
       cin.exceptions (ios_base::failbit | ios_base::badbit);