1 files changed, 64 insertions, 10 deletions

diff --git a/libbuild2/b-options.hxx b/libbuild2/b-options.hxx
index d8d85d3..48dd35f 100644
--- a/libbuild2/b-options.hxx
+++ b/libbuild2/b-options.hxx
@@ -13,8 +13,6 @@
 //
 // End prologue.
 
-#include <set>
-
 #include <libbuild2/common-options.hxx>
 
 namespace build2
@@ -98,18 +96,18 @@ namespace build2
     const bool&
     stat () const;
 
-    const std::set<string>&
-    dump () const;
-
-    bool
-    dump_specified () const;
-
     const bool&
     progress () const;
 
     const bool&
     no_progress () const;
 
+    const bool&
+    diag_color () const;
+
+    const bool&
+    no_diag_color () const;
+
     const size_t&
     jobs () const;
 
@@ -147,9 +145,15 @@ namespace build2
     dry_run () const;
 
     const bool&
+    no_diag_buffer () const;
+
+    const bool&
     match_only () const;
 
     const bool&
+    load_only () const;
+
+    const bool&
     no_external_modules () const;
 
     const structured_result_format&
@@ -164,6 +168,42 @@ namespace build2
     const bool&
     no_mtime_check () const;
 
+    const strings&
+    dump () const;
+
+    bool
+    dump_specified () const;
+
+    const string&
+    dump_format () const;
+
+    bool
+    dump_format_specified () const;
+
+    const dir_paths&
+    dump_scope () const;
+
+    bool
+    dump_scope_specified () const;
+
+    const vector<pair<name, optional<name>>>&
+    dump_target () const;
+
+    bool
+    dump_target_specified () const;
+
+    const vector<name>&
+    trace_match () const;
+
+    bool
+    trace_match_specified () const;
+
+    const vector<name>&
+    trace_execute () const;
+
+    bool
+    trace_execute_specified () const;
+
     const bool&
     no_column () const;
 
@@ -249,10 +289,10 @@ namespace build2
     uint16_t verbose_;
     bool verbose_specified_;
     bool stat_;
-    std::set<string> dump_;
-    bool dump_specified_;
     bool progress_;
     bool no_progress_;
+    bool diag_color_;
+    bool no_diag_color_;
     size_t jobs_;
     bool jobs_specified_;
     size_t max_jobs_;
@@ -265,12 +305,26 @@ namespace build2
     bool max_stack_specified_;
     bool serial_stop_;
     bool dry_run_;
+    bool no_diag_buffer_;
     bool match_only_;
+    bool load_only_;
     bool no_external_modules_;
     structured_result_format structured_result_;
     bool structured_result_specified_;
     bool mtime_check_;
     bool no_mtime_check_;
+    strings dump_;
+    bool dump_specified_;
+    string dump_format_;
+    bool dump_format_specified_;
+    dir_paths dump_scope_;
+    bool dump_scope_specified_;
+    vector<pair<name, optional<name>>> dump_target_;
+    bool dump_target_specified_;
+    vector<name> trace_match_;
+    bool trace_match_specified_;
+    vector<name> trace_execute_;
+    bool trace_execute_specified_;
     bool no_column_;
     bool no_line_;
     path buildfile_;