Optional verbose output when processing wire files

Author: zmij

cmake/scripts/wire2lua.cmake

@@ -20,7 +20,7 @@ function(wire2lua)
         OPTIONS
     )
     parse_argn("" argnames ${ARGN})
-    set(wire2lua_options ${WIRE_IDL_DIRECTORIES})
+    set(wire2lua_options ${OPTIONS} ${WIRE_IDL_DIRECTORIES})
     if(NOT TARGET)
         message(FATAL_ERROR "No output specified for wire2lua")
     endif()

src/wire/idl/preprocess.cpp

@@ -48,11 +48,13 @@ struct preprocessor::impl {
         }
         args.push_back(file_name);
 
-        ::std::cerr << "Execute preprocessor";
-        for (auto const& a : args) {
-            ::std::cerr << " " << a;
+        if (options.verbose) {
+            ::std::cerr << "Execute preprocessor";
+            for (auto const& a : args) {
+                ::std::cerr << " " << a;
+            }
+            ::std::cerr << "\n";
         }
-        ::std::cerr << "\n";
 
         io::file_descriptor_sink sink{ pipe_.sink, io::close_handle };
 

src/wire/idl/preprocess.hpp

@@ -21,6 +21,7 @@ using string_list = ::std::vector< ::std::string >;
 struct preprocess_options {
     string_list    include_dirs;
     bool           output_comments;
+    bool           verbose;
 };
 
 class preprocessor {

src/wire/wire2cpp/wire2cpp.cpp

@@ -66,6 +66,9 @@ try {
         ("output-comments,C",
             po::bool_switch(&preproc_opts.output_comments),
             "Output comments from IDL")
+        ("verbose,v",
+            po::bool_switch(&preproc_opts.verbose),
+            "Verbose output")
     ;
     po::options_description out_opts_desc{"Output options"};
     out_opts_desc.add_options()

src/wire/wire2lua/wire2lua.cpp

@@ -71,6 +71,9 @@ try {
         ("output-comments,C",
             po::bool_switch(&preproc_opts.output_comments),
             "Output comments from IDL")
+        ("verbose,v",
+            po::bool_switch(&preproc_opts.verbose),
+            "Verbose output")
     ;
     po::options_description out_opts_desc{"Output options"};
     out_opts_desc.add_options()
@@ -142,6 +145,9 @@ try {
         global_namespace_list generated;
         // Preprocess and parse
         for (auto const& file : options.files) {
+            if (preproc_opts.verbose) {
+                ::std::cout << "Parse wire file " << file << "\n";
+            }
             preprocessor preproc{ file, preproc_opts };
 
             std::string input_str = preproc.to_string();
@@ -164,11 +170,13 @@ try {
                         return ns->current_compilation_unit()->name == d->name;
                     });
                 if (f != generated.end()) {
-                    if (!unit_name_printed) {
-                        ::std::cout << cu->name << " depends on:\n";
-                        unit_name_printed = true;
+                    if (preproc_opts.verbose) {
+                        if (!unit_name_printed) {
+                            ::std::cout << cu->name << " depends on:\n";
+                            unit_name_printed = true;
+                        }
+                        ::std::cout << "\t" << d->name << "\n";
                     }
-                    ::std::cout << "\t" << d->name << "\n";
                     dependencies[cu->name].push_back(*f);
                 }
             }