From f80c8ff7ff3b1eef22a3c90943f324d45d855b97 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 16 Nov 2022 07:52:11 +0200
Subject: Initial low verbosity diagnostics rework

---
 libbuild2/cc/compile-rule.cxx |  2 +-
 libbuild2/cc/install-rule.cxx | 14 ++++++++------
 libbuild2/cc/link-rule.cxx    |  2 +-
 libbuild2/cc/pkgconfig.cxx    |  6 +++---
 4 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'libbuild2/cc')

diff --git a/libbuild2/cc/compile-rule.cxx b/libbuild2/cc/compile-rule.cxx
index 2534058..5693334 100644
--- a/libbuild2/cc/compile-rule.cxx
+++ b/libbuild2/cc/compile-rule.cxx
@@ -7247,7 +7247,7 @@ namespace build2
       // @@ TODO: why don't we print env (here and/or below)? Also link rule.
       //
       if (verb == 1)
-        text << x_name << ' ' << s;
+        print_diag (x_name, s, t);
       else if (verb == 2)
         print_process (args);
 
diff --git a/libbuild2/cc/install-rule.cxx b/libbuild2/cc/install-rule.cxx
index 0b4d1e1..5118332 100644
--- a/libbuild2/cc/install-rule.cxx
+++ b/libbuild2/cc/install-rule.cxx
@@ -271,9 +271,9 @@ namespace build2
         const scope& rs (t.root_scope ());
         auto& lp (t.data<install_match_data> (perform_uninstall_id).libs_paths);
 
-        auto rm = [&rs, &id] (const path& l)
+        auto rm = [&rs, &id] (const path& f, const path& l)
         {
-          return uninstall_f (rs, id, nullptr, l.leaf (), 2 /* verbosity */);
+          return uninstall_l (rs, id, f.leaf (), l.leaf (), 2 /* verbosity */);
         };
 
         const path& lk (lp.link);
@@ -281,10 +281,12 @@ namespace build2
         const path& so (lp.soname);
         const path& in (lp.interm);
 
-        if (!lk.empty ()) r = rm (lk) || r;
-        if (!ld.empty ()) r = rm (ld) || r;
-        if (!so.empty ()) r = rm (so) || r;
-        if (!in.empty ()) r = rm (in) || r;
+        const path* f (lp.real);
+
+        if (!in.empty ()) {r = rm (*f, in) || r; f = &in;}
+        if (!so.empty ()) {r = rm (*f, so) || r; f = &so;}
+        if (!ld.empty ()) {r = rm (*f, ld) || r; f = &ld;}
+        if (!lk.empty ()) {r = rm (*f, lk) || r;         }
       }
 
       return r;
diff --git a/libbuild2/cc/link-rule.cxx b/libbuild2/cc/link-rule.cxx
index c2ba8e7..24dc373 100644
--- a/libbuild2/cc/link-rule.cxx
+++ b/libbuild2/cc/link-rule.cxx
@@ -3825,7 +3825,7 @@ namespace build2
       }
 
       if (verb == 1)
-        text << (lt.static_library () ? "ar " : "ld ") << t;
+        print_diag (lt.static_library () ? "ar" : "ld", t);
       else if (verb == 2)
         print_process (args);
 
diff --git a/libbuild2/cc/pkgconfig.cxx b/libbuild2/cc/pkgconfig.cxx
index 87515e3..eae328e 100644
--- a/libbuild2/cc/pkgconfig.cxx
+++ b/libbuild2/cc/pkgconfig.cxx
@@ -1399,10 +1399,10 @@ namespace build2
       // Note that generation can take some time if we have a large number of
       // prerequisite libraries.
       //
-      if (verb)
-        text << "pc " << *t;
-      else if (verb >= 2)
+      if (verb >= 2)
         text << "cat >" << p;
+      else if (verb)
+        print_diag ("pc", g, *t);
 
       if (ctx.dry_run)
         return;
-- 
cgit v1.1