From 5f010bb45851d335136369e70f71903c394e9a48 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 3 Aug 2016 10:52:54 +0200
Subject: Add -V option as equivalent to --verbose 3

---
 build2/b-options     | 4 ++++
 build2/b-options.cxx | 7 +++++++
 build2/b-options.ixx | 6 ++++++
 build2/b.cli         | 6 ++++++
 build2/b.cxx         | 2 +-
 5 files changed, 24 insertions(+), 1 deletion(-)

(limited to 'build2')

diff --git a/build2/b-options b/build2/b-options
index b592ece..093a1dc 100644
--- a/build2/b-options
+++ b/build2/b-options
@@ -399,6 +399,9 @@ namespace build2
     v () const;
 
     const bool&
+    V () const;
+
+    const bool&
     q () const;
 
     const uint16_t&
@@ -463,6 +466,7 @@ namespace build2
 
     public:
     bool v_;
+    bool V_;
     bool q_;
     uint16_t verbose_;
     bool verbose_specified_;
diff --git a/build2/b-options.cxx b/build2/b-options.cxx
index cf15200..9b169d7 100644
--- a/build2/b-options.cxx
+++ b/build2/b-options.cxx
@@ -570,6 +570,7 @@ namespace build2
   options::
   options ()
   : v_ (),
+    V_ (),
     q_ (),
     verbose_ (1),
     verbose_specified_ (false),
@@ -661,6 +662,10 @@ namespace build2
        << "                     to \033[1m--verbose 2\033[0m." << ::std::endl;
 
     os << std::endl
+       << "\033[1m-V\033[0m                   Print all underlying commands being executed. This is" << ::std::endl
+       << "                     equivalent to \033[1m--verbose 3\033[0m." << ::std::endl;
+
+    os << std::endl
        << "\033[1m-q\033[0m                   Run quietly, only printing error messages. This is" << ::std::endl
        << "                     equivalent to \033[1m--verbose 0\033[0m." << ::std::endl;
 
@@ -739,6 +744,8 @@ namespace build2
     {
       _cli_options_map_["-v"] = 
       &::build2::cl::thunk< options, bool, &options::v_ >;
+      _cli_options_map_["-V"] = 
+      &::build2::cl::thunk< options, bool, &options::V_ >;
       _cli_options_map_["-q"] = 
       &::build2::cl::thunk< options, bool, &options::q_ >;
       _cli_options_map_["--verbose"] = 
diff --git a/build2/b-options.ixx b/build2/b-options.ixx
index 15329dc..3b799cb 100644
--- a/build2/b-options.ixx
+++ b/build2/b-options.ixx
@@ -223,6 +223,12 @@ namespace build2
   }
 
   inline const bool& options::
+  V () const
+  {
+    return this->V_;
+  }
+
+  inline const bool& options::
   q () const
   {
     return this->q_;
diff --git a/build2/b.cli b/build2/b.cli
index f0cd48e..16c8fb8 100644
--- a/build2/b.cli
+++ b/build2/b.cli
@@ -206,6 +206,12 @@ namespace build2
        \cb{--verbose 2}."
     }
 
+    bool -V
+    {
+      "Print all underlying commands being executed. This is equivalent to
+       \cb{--verbose 3}."
+    }
+
     bool -q
     {
       "Run quietly, only printing error messages. This is equivalent to
diff --git a/build2/b.cxx b/build2/b.cxx
index a3861eb..a14b998 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -137,7 +137,7 @@ main (int argc, char* argv[])
     //
     verb = ops.verbose_specified ()
       ? ops.verbose ()
-      : ops.v () ? 2 : ops.q () ? 0 : 1;
+      : ops.V () ? 3 : ops.v () ? 2 : ops.q () ? 0 : 1;
 
     // Version.
     //
-- 
cgit v1.1