Tidy up

Author: furtib

src/codechecker.bzl

@@ -101,11 +101,10 @@ def _codechecker_impl(ctx):
     ctx.actions.expand_template(
         template = ctx.file._codechecker_script_template,
         output = ctx.outputs.codechecker_script,
-        is_executable = True,
+        is_executable = False,
         substitutions = {
             "{Mode}": "Run",
             "{Verbosity}": "DEBUG",
-            #"{PythonPath}": python_path(ctx),  # "/usr/bin/env python3",
             "{codechecker_bin}": CODECHECKER_BIN_PATH,
             "{compile_commands}": ctx.outputs.codechecker_commands.path,
             "{codechecker_skipfile}": ctx.outputs.codechecker_skipfile.path,
@@ -130,8 +129,6 @@ def _codechecker_impl(ctx):
             codechecker_files,
             ctx.outputs.codechecker_log,
         ],
-        #executable = ctx.outputs.codechecker_script,
-        #arguments = [],
         executable = python_path(ctx),
         tools = python_interpreter_tool(ctx),
         arguments = [ctx.outputs.codechecker_script.path],
@@ -235,13 +232,12 @@ def _codechecker_test_impl(ctx):
         substitutions = {
             "{Mode}": "Test",
             "{Verbosity}": "INFO",
-            #"{PythonPath}": python_path(ctx),  # "/usr/bin/env python3",
             "{codechecker_bin}": CODECHECKER_BIN_PATH,
             "{codechecker_files}": codechecker_files.short_path,
             "{Severities}": " ".join(ctx.attr.severities),
         },
     )
-    # For use in script the short path must be used
+    # For use in script the short path must be used (or absolute path)
     # For use in executable the full path
     python_interpreter_path = python_path(ctx)
     if python_interpreter_tool(ctx) != []:
@@ -259,13 +255,15 @@ def _codechecker_test_impl(ctx):
     )
 
     # Return test script and all required files
-    run_files = default_runfiles + [ctx.outputs.codechecker_test_script, ctx.outputs.test_script_wrapper] + python_interpreter_tool(ctx)
+    run_files = default_runfiles + [
+        ctx.outputs.codechecker_test_script,
+        ctx.outputs.test_script_wrapper,
+        ] + python_interpreter_tool(ctx)
 
     return [
         DefaultInfo(
             files = depset(all_files),
             runfiles = ctx.runfiles(files = run_files),
-            #executable = ctx.outputs.codechecker_test_script,
             executable = ctx.outputs.test_script_wrapper,
         ),
     ]

src/per_file.bzl

@@ -60,11 +60,21 @@ def _run_code_checker(
     codechecker_log = ctx.actions.declare_file(codechecker_log_file_name)
 
     if "--ctu" in options:
-        inputs = [ctx.outputs.per_file_script, compile_commands_json, config_file] + sources_and_headers
+        inputs = [
+            ctx.outputs.per_file_script,
+            compile_commands_json,
+            config_file,
+            ] + sources_and_headers
     else:
         # NOTE: we collect only headers, so CTU may not work!
         headers = depset(transitive = target[SourceFilesInfo].headers.to_list())
-        inputs = depset([ctx.outputs.per_file_script, compile_commands_json, config_file, src], transitive = [headers])
+        inputs = depset(
+            [
+                ctx.outputs.per_file_script,
+                compile_commands_json,
+                config_file,
+                src,
+                ], transitive = [headers])
 
     outputs = [clang_tidy_plist, clangsa_plist, codechecker_log]
 
@@ -131,9 +141,8 @@ def _create_wrapper_script(ctx, options, compile_commands_json, config_file):
     ctx.actions.expand_template(
         template = ctx.file._per_file_script_template,
         output = ctx.outputs.per_file_script,
-        is_executable = True,
+        is_executable = False,
         substitutions = {
-            #"{PythonPath}": ctx.attr._python_runtime[PyRuntimeInfo].interpreter_path,
             "{compile_commands_json}": compile_commands_json.path,
             "{codechecker_args}": options_str,
             "{config_file}": config_file.path,

src/per_file_script.py

@@ -1,5 +1,3 @@
-#{PythonPath}
-
 # Copyright 2023 Ericsson AB
 #
 # Licensed under the Apache License, Version 2.0 (the "License");