Adding more flags

Author: Machiry

clang/tools/cconv-standalone/utils/cc_conv/convert_project.py

@@ -58,9 +58,12 @@ def parseTheArg():
     parser.add_argument("--skip", dest='skip_paths', action='append', type=str, default=[],
                         help='Relative path to source files that should be skipped.')
 
+    parser.add_argument("-dr", dest='skip_exec', action='store_true', default=False,
+                        help='Do not run the conversion. Just create the conversion script.')
+
     args = parser.parse_args()
 
-    if not args.prog_name or not os.path.isfile(args.prog_name):
+    if not args.skip_exec and (not args.prog_name or not os.path.isfile(args.prog_name)):
         logging.error("Error: --prog_name argument is not a valid file..")
         logging.error("Provided argument: {} is not a file.".format(args.prog_name))
         sys.exit()
@@ -93,7 +96,8 @@ def parseTheArg():
     logging.info("Finished updating project files.")
 
     logging.info("Trying to convert all the source files to header files")
-    runCheckedCConvert(progArgs.prog_name, compileCmdsJson, progArgs.includeDir, progArgs.skip_paths)
+    runCheckedCConvert(progArgs.prog_name, compileCmdsJson, progArgs.includeDir,
+                       progArgs.skip_paths, progArgs.skip_exec)
     logging.info("Finished converting all the files to checkedc files.")
 
 

clang/tools/cconv-standalone/utils/cc_conv/generate_ccommands.py

@@ -89,7 +89,8 @@ def tryFixUp(s):
     return
 
 
-def runCheckedCConvert(checkedc_bin, compile_commands_json, checkedc_include_dir, skip_paths, run_individual=False):
+def runCheckedCConvert(checkedc_bin, compile_commands_json, checkedc_include_dir, skip_paths,
+                       skip_running=False, run_individual=False):
     global INDIVIDUAL_COMMANDS_FILE
     global TOTAL_COMMANDS_FILE
     runs = 0
@@ -150,6 +151,7 @@ def runCheckedCConvert(checkedc_bin, compile_commands_json, checkedc_include_dir
         compilation_base_dir = os.path.dirname(compilation_base_dir)
     prog_name = checkedc_bin
     f = open(INDIVIDUAL_COMMANDS_FILE, 'w')
+    f.write("#!/bin/bash\n")
     for compiler_args, target_directory, src_file in s:
         args = []
         # get the command to change the working directory
@@ -176,11 +178,13 @@ def runCheckedCConvert(checkedc_bin, compile_commands_json, checkedc_include_dir
         f.write("\n")
     f.close()
     logging.debug("Saved all the individual commands into the file:" + INDIVIDUAL_COMMANDS_FILE)
+    os.system("chmod +x " + INDIVIDUAL_COMMANDS_FILE)
 
     vcodewriter = VSCodeJsonWriter()
     # get path to icconv
     vcodewriter.setClangdPath(os.path.join(os.path.dirname(prog_name), "icconv"))
     args = []
+    args.append("#!/bin/bash")
     args.append(prog_name)
     args.extend(DEFAULT_ARGS)
     args.extend(list(set(total_x_args)))
@@ -195,8 +199,9 @@ def runCheckedCConvert(checkedc_bin, compile_commands_json, checkedc_include_dir
     f = open(TOTAL_COMMANDS_FILE, 'w')
     f.write(" \\\n".join(args))
     f.close()
+    os.system("chmod +x " + TOTAL_COMMANDS_FILE)
     # run whole command
-    if not run_individual:
+    if not run_individual and not skip_running:
         logging.info("Running:" + str(' '.join(args)))
         subprocess.check_call(' '.join(args), shell=True)
     logging.debug("Saved the total command into the file:" + TOTAL_COMMANDS_FILE)