Change "CodeChecker analyze --dump-compiler-info-file" format

Author: bruntib

analyzer/codechecker_analyzer/buildlog/log_parser.py

@@ -1224,7 +1224,6 @@ def _process_entry_worker(args):
 
 
 def parse_unique_log(compilation_database,
-                     report_dir,
                      compile_uniqueing="none",
                      compiler_info_file=None,
                      keep_gcc_include_fixed=False,
@@ -1252,8 +1251,6 @@ def parse_unique_log(compilation_database,
                             by "arguments" which is a split command. Older
                             versions of intercept-build provide the build
                             command this way.
-    report_dir  -- The output report directory. The compiler infos
-                   will be written to <report_dir>/compiler.info.json.
     compile_uniqueing -- Compilation database uniqueing mode.
                          If there are more than one compile commands for a
                          target file, only a single one is kept.
@@ -1398,9 +1395,6 @@ def parse_unique_log(compilation_database,
                                   compile_uniqueing)
                         sys.exit(1)
 
-        ImplicitCompilerInfo.dump_compiler_info(
-            os.path.join(report_dir, "compiler_info.json"))
-
         LOG.debug('Parsing log file done.')
         return list(uniqued_build_actions.values()), skipped_cmp_cmd_count
 

analyzer/codechecker_analyzer/cli/analyze.py

@@ -232,7 +232,8 @@ def add_arguments_to_parser(parser):
     parser.add_argument('--dump-compiler-info-file',
                         dest="dump_compiler_info_file",
                         required=False,
-                        default=argparse.SUPPRESS,
+                        action='store_true',
+                        default=False,
                         help="Dump implicit gcc compiler info to a json file "
                              "that can be used for fine-tuning analysis later."
                              "These are information like the implicit include "
@@ -1264,7 +1265,8 @@ def main(args):
 
     args.output_path = os.path.abspath(args.output_path)
     if os.path.exists(args.output_path) and \
-            not os.path.isdir(args.output_path):
+            not os.path.isdir(args.output_path) and \
+            not args.dump_compiler_info_file:
         LOG.error("The given output path is not a directory: " +
                   args.output_path)
         sys.exit(1)
@@ -1352,20 +1354,15 @@ def main(args):
                  "overwriting with current result", args.output_path)
         shutil.rmtree(args.output_path)
 
-    if not os.path.exists(args.output_path):
+    if not os.path.exists(args.output_path) and \
+            not args.dump_compiler_info_file:
         os.makedirs(args.output_path)
 
-    # TODO: I'm not sure that this directory should be created here.
-    fixit_dir = os.path.join(args.output_path, 'fixit')
-    if not os.path.exists(fixit_dir):
-        os.makedirs(fixit_dir)
-
     LOG.debug("args: %s", str(args))
     LOG.debug("Output will be stored to: '%s'", args.output_path)
 
     actions, skipped_cmp_cmd_count = log_parser.parse_unique_log(
         compile_commands,
-        args.output_path,
         args.compile_uniqueing,
         compiler_info_file,
         args.keep_gcc_include_fixed,
@@ -1381,16 +1378,18 @@ def main(args):
                     "compilation database or all of them were skipped.")
         sys.exit(0)
 
-    if 'dump_compiler_info_file' in args and args.dump_compiler_info_file:
-        compiler_info = Path(args.output_path) / 'compiler_info.json'
-        try:
-            os.rename(
-                compiler_info,
-                compiler_info.with_name(args.dump_compiler_info_file))
-        except ValueError as err:
-            LOG.error(err)
-            LOG.error("Provide a single filename.")
+    if args.dump_compiler_info_file:
+        log_parser.ImplicitCompilerInfo.dump_compiler_info(
+            args.output_path)
         sys.exit(0)
+    else:
+        log_parser.ImplicitCompilerInfo.dump_compiler_info(
+            Path(args.output_path) / "compiler_info.json")
+
+    # TODO: I'm not sure that this directory should be created here.
+    fixit_dir = os.path.join(args.output_path, 'fixit')
+    if not os.path.exists(fixit_dir):
+        os.makedirs(fixit_dir)
 
     uniqued_compilation_db_file = os.path.join(
         args.output_path, "unique_compile_commands.json")

analyzer/codechecker_analyzer/cli/check.py

@@ -140,6 +140,8 @@ def add_arguments_to_parser(parser):
     parser.add_argument('--dump-compiler-info-file',
                         dest="dump_compiler_info_file",
                         required=False,
+                        action='store_true',
+                        default=False,
                         help="Dump implicit gcc compiler info to a json file "
                              "that can be used for fine-tuning analysis later."
                              "These are information like the implicit include "