Add python wrapper for clang

commit_hash:0ac8fe42fec35bd7fd78602530d909a5369b4e0b

Author: Nechda

build/conf/compilers/gnu_compiler.conf

@@ -215,11 +215,17 @@ _C_CPP_KV_STYLE_NEW=${hide;kv:_C_CPP_KV_STYLE_P} ${hide;kv:_C_CPP_KV_STYLE_PC}
 _C_CPP_KV_STYLE_P=p CC
 _C_CPP_KV_STYLE_PC=pc green
 
+_C_CPP_WRAPPER=$YMAKE_PYTHON3 ${input:"build/scripts/wrapcc.py"} ${input:SRC}
+when ($CLANG_TIDY_ARGS || $RETRY_ARGS || $YNDEXER_ARGS || $OPENSOURCE == "yes") {
+    _C_CPP_WRAPPER=
+}
+
 _CPP_ARGS_NEW=\
     $CLANG_STATIC_ANALYZER_OPTIONS_NEW && \
     $CLANG_TIDY_ARGS \
     $YNDEXER_ARGS \
     $RETRY_ARGS \
+    $_C_CPP_WRAPPER \
     $CXX_COMPILER \
     $C_FLAGS_PLATFORM \
     $GCC_COMPILE_FLAGS \
@@ -240,6 +246,7 @@ _C_ARGS_NEW=\
     $CLANG_TIDY_ARGS \
     $YNDEXER_ARGS \
     $RETRY_ARGS \
+    $_C_CPP_WRAPPER \
     $C_COMPILER \
     $C_FLAGS_PLATFORM \
     $GCC_COMPILE_FLAGS \

build/scripts/clang_tidy.py

@@ -96,7 +96,7 @@ def filter_cmd(cmd):
         if not skip:
             yield x
 
-        if '/wrapcc.py' in x:
+        if '/retry_cc.py' in x:
             skip = False
 
 
@@ -116,7 +116,7 @@ def find_header(p, h):
 
 def main():
     args, clang_cmd = parse_args()
-    if '/wrapcc.py' in str(clang_cmd):
+    if '/retry_cc.py' in str(clang_cmd):
         clang_cmd = list(filter_cmd(clang_cmd))
     setup_script(args)
     clang_tidy_bin = args.clang_tidy_bin

build/scripts/retry_cc.py

@@ -0,0 +1,45 @@
+from __future__ import print_function
+
+import os
+import sys
+import time
+import subprocess
+
+
+def need_retry(text):
+    return 'Stack dump' in text
+
+
+def retry_inf(cmd):
+    while True:
+        try:
+            yield subprocess.check_output(cmd, stderr=subprocess.STDOUT), None
+        except subprocess.CalledProcessError as e:
+            yield e.output, e
+
+
+def retry(cmd):
+    for n, (out, err) in enumerate(retry_inf(cmd)):
+        if out:
+            sys.stderr.write(out)
+
+        if n > 5:
+            raise Exception('all retries failed')
+        elif need_retry(out):
+            time.sleep(1 + n)
+        elif err:
+            raise err
+        else:
+            return
+
+
+if __name__ == '__main__':
+    cmd = sys.argv[1:]
+
+    if '-c' in cmd:
+        try:
+            retry(cmd)
+        except subprocess.CalledProcessError as e:
+            sys.exit(e.returncode)
+    else:
+        os.execv(cmd[0], cmd)

build/scripts/wrapcc.py

@@ -1,45 +1,14 @@
-from __future__ import print_function
-
-import os
-import sys
-import time
 import subprocess
+import sys
 
 
-def need_retry(text):
-    return 'Stack dump' in text
-
-
-def retry_inf(cmd):
-    while True:
-        try:
-            yield subprocess.check_output(cmd, stderr=subprocess.STDOUT), None
-        except subprocess.CalledProcessError as e:
-            yield e.output, e
-
-
-def retry(cmd):
-    for n, (out, err) in enumerate(retry_inf(cmd)):
-        if out:
-            sys.stderr.write(out)
-
-        if n > 5:
-            raise Exception('all retries failed')
-        elif need_retry(out):
-            time.sleep(1 + n)
-        elif err:
-            raise err
-        else:
-            return
-
+def fix(path: str):
+    flags = []
+    return flags
 
 if __name__ == '__main__':
-    cmd = sys.argv[1:]
-
-    if '-c' in cmd:
-        try:
-            retry(cmd)
-        except subprocess.CalledProcessError as e:
-            sys.exit(e.returncode)
-    else:
-        os.execv(cmd[0], cmd)
+    path = sys.argv[1]
+    args = sys.argv[2:]
+    cmd = args + fix(path)
+    rc = subprocess.call(cmd, shell=False, stderr=sys.stderr, stdout=sys.stdout)
+    sys.exit(rc)

build/scripts/ya.make

@@ -117,6 +117,7 @@ ELSEIF (PY3)
         py_compile.py
         resolve_java_srcs.py
         retry.py
+        retry_cc.py
         rodata2asm.py
         rodata2cpp.py
         run_javac.py

build/ymake.core.conf

@@ -265,7 +265,7 @@ otherwise {
 }
 
 when ($RETRY == "yes") {
-    RETRY_ARGS=$YMAKE_PYTHON ${input:"build/scripts/wrapcc.py"}
+    RETRY_ARGS=$YMAKE_PYTHON ${input:"build/scripts/retry_cc.py"}
 }
 otherwise {
     RETRY_ARGS=