From eb264e1892c2a1379fa3bcab9aefea219e8e7138 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 8 Sep 2015 10:56:32 +0200
Subject: Rework diagnostics verbosity, add quiet mode/option

---
 build/cli/module.cxx |  8 ++++----
 build/cli/rule.cxx   | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'build/cli')

diff --git a/build/cli/module.cxx b/build/cli/module.cxx
index f8d1522..240aaa7 100644
--- a/build/cli/module.cxx
+++ b/build/cli/module.cxx
@@ -36,7 +36,7 @@ namespace build
               bool first)
     {
       tracer trace ("cli::init");
-      level4 ([&]{trace << "for " << base.out_path ();});
+      level5 ([&]{trace << "for " << base.out_path ();});
 
       // Make sure the cxx module has been loaded since we need its
       // targets types (?xx{}). Note that we don't try to load it
@@ -104,9 +104,9 @@ namespace build
           const string& cli (as<string> (p.first));
           const char* args[] = {cli.c_str (), "--version", nullptr};
 
-          if (verb)
+          if (verb >= 2)
             print_process (args);
-          else
+          else if (verb)
             text << "test " << cli;
 
           string ver;
@@ -141,7 +141,7 @@ namespace build
             throw failed ();
           }
 
-          if (verb)
+          if (verb >= 2)
             text << cli << " " << ver;
         }
       }
diff --git a/build/cli/rule.cxx b/build/cli/rule.cxx
index 8b0ba85..ef3b1dc 100644
--- a/build/cli/rule.cxx
+++ b/build/cli/rule.cxx
@@ -46,7 +46,7 @@ namespace build
             //
             if (t.name != p.name ())
             {
-              level3 ([&]{trace << ".cli file stem '" << p.name () << "' "
+              level4 ([&]{trace << ".cli file stem '" << p.name () << "' "
                                 << "doesn't match target " << t;});
               return r;
             }
@@ -58,7 +58,7 @@ namespace build
 
         if (!r)
         {
-          level3 ([&]{trace << "no .cli source file for target " << t;});
+          level4 ([&]{trace << "no .cli source file for target " << t;});
           return r;
         }
 
@@ -117,7 +117,7 @@ namespace build
                 g->prerequisites.emplace_back (p.as_prerequisite (trace));
               }
               else
-                level3 ([&]{trace << ".cli file stem '" << p.name () << "' "
+                level4 ([&]{trace << ".cli file stem '" << p.name () << "' "
                                   << "doesn't match target " << t;});
               break;
             }
@@ -135,7 +135,7 @@ namespace build
           //
           if (t.is_a<cxx::ixx> () && g->i == nullptr)
           {
-            level3 ([&]{trace << "generation of inline file " << t
+            level4 ([&]{trace << "generation of inline file " << t
                               << " is disabled with --suppress-inline";});
             g = nullptr;
           }
@@ -245,9 +245,9 @@ namespace build
       args.push_back (rels.string ().c_str ());
       args.push_back (nullptr);
 
-      if (verb)
+      if (verb >= 2)
         print_process (args);
-      else
+      else if (verb)
         text << "cli " << *s;
 
       try
-- 
cgit v1.1