Fix Kirk comments

Author: anlowee

taskfiles/deps.yaml

@@ -77,15 +77,15 @@ tasks:
     cmds:
       - task: ":utils:cmake:install-remote-tar"
         vars:
-          CMAKE_PACKAGE_NAME: "{{.G_OUTCOME_LIB_NAME}}"
-          WORK_DIR: "{{.G_OUTCOME_WORK_DIR}}"
-          TAR_SHA256: "0382248cbb00806ce4b5f3ce6939797dc3b597c85fd3531614959e31ef488b39"
-          TAR_URL: "https://github.com/ned14/outcome/archive/refs/tags/v2.2.11.tar.gz"
           CMAKE_GEN_ARGS:
             - "-C {{.G_DEPS_CMAKE_SETTINGS_DIR}}/{{.G_QUICKCPPLIB_LIB_NAME}}.cmake"
             - "-DBUILD_TESTING=OFF"
             - "-DCMAKE_BUILD_TYPE=Release"
             - "-DCMAKE_POLICY_DEFAULT_CMP0074=NEW"
+          CMAKE_PACKAGE_NAME: "{{.G_OUTCOME_LIB_NAME}}"
+          TAR_SHA256: "0382248cbb00806ce4b5f3ce6939797dc3b597c85fd3531614959e31ef488b39"
+          TAR_URL: "https://github.com/ned14/outcome/archive/refs/tags/v2.2.11.tar.gz"
+          WORK_DIR: "{{.G_OUTCOME_WORK_DIR}}"
       - task: "add-package-root-to-cmake-settings"
         vars:
           NAME: "{{.G_OUTCOME_LIB_NAME}}"
@@ -97,13 +97,13 @@ tasks:
     cmds:
       - task: ":utils:cmake:install-remote-tar"
         vars:
-          CMAKE_PACKAGE_NAME: "{{.G_QUICKCPPLIB_LIB_NAME}}"
-          WORK_DIR: "{{.G_QUICKCPPLIB_WORK_DIR}}"
-          TAR_SHA256: "5d4c9b2d6fa177d3fb14f3fe3086867e43b44f4a7a944eb10ee4616b2b0f3c05"
-          TAR_URL: "https://github.com/ned14/quickcpplib/archive/f3e452e.tar.gz"
           CMAKE_GEN_ARGS:
             - "-DBUILD_TESTING=OFF"
             - "-DCMAKE_BUILD_TYPE=Release"
+          CMAKE_PACKAGE_NAME: "{{.G_QUICKCPPLIB_LIB_NAME}}"
+          TAR_SHA256: "5d4c9b2d6fa177d3fb14f3fe3086867e43b44f4a7a944eb10ee4616b2b0f3c05"
+          TAR_URL: "https://github.com/ned14/quickcpplib/archive/f3e452e.tar.gz"
+          WORK_DIR: "{{.G_QUICKCPPLIB_WORK_DIR}}"
       - task: "add-package-root-to-cmake-settings"
         vars:
           NAME: "{{.G_QUICKCPPLIB_LIB_NAME}}"

taskfiles/lint-cpp.yaml

@@ -17,7 +17,9 @@ tasks:
     desc: "Runs the C++ linters that identify formatting issues."
     sources: &cpp_format_src_files
       - "{{.G_LINT_VENV_CHECKSUM_FILE}}"
-      - "{{.G_CPP_SRC_DIR}}"
+      - "{{.G_CPP_SRC_DIR}}/**/*.cpp"
+      - "{{.G_CPP_SRC_DIR}}/**/*.h"
+      - "{{.G_CPP_SRC_DIR}}/**/*.hpp"
       - "{{.ROOT_DIR}}/.clang-format"
       - "{{.TASKFILE}}"
     deps:
@@ -27,8 +29,8 @@ tasks:
       - task: ":utils:cpp-lint:clang-format"
         vars:
           FLAGS: ["--dry-run"]
-          INCLUDE_FILENAME_PATTERNS: ["*.cpp", "*.h", "*.hpp", "*.inc"]
-          ROOT_PATHS: *cpp_format_src_files
+          INCLUDE_FILENAME_PATTERNS: ["*.cpp", "*.h", "*.hpp"]
+          ROOT_PATHS: ["{{.G_CPP_SRC_DIR}}"]
           VENV_DIR: "{{.G_LINT_VENV_DIR}}"
 
   cpp-format-fix:
@@ -41,8 +43,8 @@ tasks:
       - task: ":utils:cpp-lint:clang-format"
         vars:
           FLAGS: ["-i"]
-          INCLUDE_FILENAME_PATTERNS: ["*.cpp", "*.h", "*.hpp", "*.inc"]
-          ROOT_PATHS: *cpp_format_src_files
+          INCLUDE_FILENAME_PATTERNS: ["*.cpp", "*.h", "*.hpp"]
+          ROOT_PATHS: ["{{.G_CPP_SRC_DIR}}"]
           VENV_DIR: "{{.G_LINT_VENV_DIR}}"
 
   cpp-static-check:
@@ -53,11 +55,13 @@ tasks:
     aliases:
       - "cpp-static-fix"
     desc: "Runs the C++ static analyzers. Only checks for warnings and violations."
-    sources: &cpp_static_src_files
+    sources:
       - "{{.G_CMAKE_CACHE}}"
       - "{{.G_COMPILE_COMMANDS_DB}}"
       - "{{.G_LINT_VENV_CHECKSUM_FILE}}"
-      - "{{.G_CPP_SRC_DIR}}"
+      - "{{.G_CPP_SRC_DIR}}/**/*.cpp"
+      - "{{.G_CPP_SRC_DIR}}/**/*.h"
+      - "{{.G_CPP_SRC_DIR}}/**/*.hpp"
       - "{{.ROOT_DIR}}/.clang-tidy"
       - "{{.TASKFILE}}"
     deps:
@@ -70,9 +74,8 @@ tasks:
           FLAGS:
             - "--config-file '{{.ROOT_DIR}}/.clang-tidy'"
             - "-p '{{.G_COMPILE_COMMANDS_DB}}'"
-          INCLUDE_PATTERNS: ["*.cpp", "*.h", "*.hpp", "*.inc"]
-          OUTPUT_DIR: "{{.G_LINT_CLANG_TIDY_DIR}}"
-          ROOT_PATHS: *cpp_static_src_files
+          INCLUDE_FILENAME_PATTERNS: ["*.cpp", "*.h", "*.hpp"]
+          ROOT_PATHS: ["{{.G_CPP_SRC_DIR}}"]
           VENV_DIR: "{{.G_LINT_VENV_DIR}}"
 
   cpp-configs:

taskfiles/lint-yaml.yaml

@@ -13,16 +13,24 @@ tasks:
       - "{{.TASKFILE}}"
       - exclude: "{{.ROOT_DIR}}/**/build/*"
       - exclude: "{{.ROOT_DIR}}/**/tools/*"
+      # The following are for Clion's default generated build dirs
+      - exclude: "{{.ROOT_DIR}}/cmake-build-debug/*"
+      - exclude: "{{.ROOT_DIR}}/cmake-build-release/*"
     dir: "{{.ROOT_DIR}}"
     deps:
       - "venv"
     cmds:
       - |-
         . "{{.G_LINT_VENV_DIR}}/bin/activate"
         find . \
-          \( -path '**/build' -o -path '**/tools' \) -prune -o \
+          \( \
+            -path '**/build' \
+            -o -path '**/tools' \
+            -o -path '**/cmake-build-debug' \
+            -o -path '**/cmake-build-release' \
+          \) -prune -o \
           \( -iname "*.yaml" -o -iname "*.yml" \) \
           -print0 | \
-            xargs -0 yamllint \
-              --config-file "tools/yscope-dev-utils/exports/lint-configs/.yamllint.yml" \
-              --strict
+        xargs -0 yamllint \
+          --config-file "tools/yscope-dev-utils/exports/lint-configs/.yamllint.yml" \
+          --strict