Browse Source

Fix tidy graph generation
d73e9d9d44959cde8441e9d1fca4068504282b2e

iaz1607 11 months ago
parent
commit
c54a70807c
2 changed files with 26 additions and 4 deletions
  1. 10 0
      build/conf/python.conf
  2. 16 4
      build/ymake.core.conf

+ 10 - 0
build/conf/python.conf

@@ -551,7 +551,12 @@ module PY2_LIBRARY: _LIBRARY {
         PY_PROTO_MYPY_PLUGIN_INTERNAL=$PY_PROTO_MYPY_PLUGIN_BASE ${output;hide;noauto;norel;nopath;noext;suf=__intpy2___pb2.pyi:File} ${hide;kv:"ext_out_name_for_${nopath;noext;suf=__intpy2___pb2.pyi:File} ${nopath;noext;suf=_pb2.pyi:File}"})
     }
     SET(MODULE_LANG PY2)
+
     ADD_CLANG_TIDY()
+    when ($TIDY_ENABLED == "yes") {
+        _MAKEFILE_INCLUDE_LIKE_DEPS+=${ARCADIA_ROOT}/build/yandex_specific/config/clang_tidy/tidy_project_map.json
+        _MAKEFILE_INCLUDE_LIKE_DEPS+=${ARCADIA_ROOT}/build/yandex_specific/config/clang_tidy/tidy_default_map.json
+    }
 }
 
 
@@ -592,7 +597,12 @@ module PY3_LIBRARY: _LIBRARY {
         PY_PROTO_MYPY_PLUGIN_INTERNAL=$PY_PROTO_MYPY_PLUGIN_BASE ${output;hide;noauto;norel;nopath;noext;suf=__intpy3___pb2.pyi:File} ${hide;kv:"ext_out_name_for_${nopath;noext;suf=__intpy3___pb2.pyi:File} ${nopath;noext;suf=_pb2.pyi:File}"})
     }
     SET(MODULE_LANG PY3)
+
     ADD_CLANG_TIDY()
+    when ($TIDY_ENABLED == "yes") {
+        _MAKEFILE_INCLUDE_LIKE_DEPS+=${ARCADIA_ROOT}/build/yandex_specific/config/clang_tidy/tidy_project_map.json
+        _MAKEFILE_INCLUDE_LIKE_DEPS+=${ARCADIA_ROOT}/build/yandex_specific/config/clang_tidy/tidy_default_map.json
+    }
 }
 
 

+ 16 - 4
build/ymake.core.conf

@@ -1117,10 +1117,6 @@ MODULE_TYPE=UNKNOWN
 
 macro ADD_CLANG_TIDY() {
     ADD_YTEST($MODULE_PREFIX$REALPRJNAME clang_tidy)
-    when ($TIDY_ENABLED == "yes") {
-        _MAKEFILE_INCLUDE_LIKE_DEPS+=${ARCADIA_ROOT}/build/yandex_specific/config/clang_tidy/tidy_project_map.json
-        _MAKEFILE_INCLUDE_LIKE_DEPS+=${ARCADIA_ROOT}/build/yandex_specific/config/clang_tidy/tidy_default_map.json
-    }
 }
 
 # tag:internal
@@ -1229,7 +1225,14 @@ module PROGRAM: _BASE_PROGRAM {
     .ALIASES=EXTRALIBS=PY_EXTRALIBS
 
     ADD_YTEST($MODULE_PREFIX$REALPRJNAME coverage.extractor)
+
     ADD_CLANG_TIDY()
+
+    when ($TIDY_ENABLED == "yes") {
+        _MAKEFILE_INCLUDE_LIKE_DEPS+=${ARCADIA_ROOT}/build/yandex_specific/config/clang_tidy/tidy_project_map.json
+        _MAKEFILE_INCLUDE_LIKE_DEPS+=${ARCADIA_ROOT}/build/yandex_specific/config/clang_tidy/tidy_default_map.json
+    }
+
     _DONT_REQUIRE_LICENSE()
 }
 
@@ -1890,6 +1893,10 @@ module LIBRARY: _LIBRARY {
     SET(MODULE_LANG CPP)
 
     ADD_CLANG_TIDY()
+    when ($TIDY_ENABLED == "yes") {
+        _MAKEFILE_INCLUDE_LIKE_DEPS+=${ARCADIA_ROOT}/build/yandex_specific/config/clang_tidy/tidy_project_map.json
+        _MAKEFILE_INCLUDE_LIKE_DEPS+=${ARCADIA_ROOT}/build/yandex_specific/config/clang_tidy/tidy_default_map.json
+    }
 }
 
 # tag:internal
@@ -2081,7 +2088,12 @@ module DLL_UNIT: _LINK_UNIT {
     SET(MODULE_TYPE DLL)
     SET(MODULE_TAG DLL)
     SET(MODULE_LANG CPP)
+
     ADD_CLANG_TIDY()
+    when ($TIDY_ENABLED == "yes") {
+        _MAKEFILE_INCLUDE_LIKE_DEPS+=${ARCADIA_ROOT}/build/yandex_specific/config/clang_tidy/tidy_project_map.json
+        _MAKEFILE_INCLUDE_LIKE_DEPS+=${ARCADIA_ROOT}/build/yandex_specific/config/clang_tidy/tidy_default_map.json
+    }
 
     when ($EXPORTS_FILE) {
         _EXPORT_SCRIPT_SEM=&& use_export_script ${input:EXPORTS_FILE}