Fix task order depedencies

Author: Bill-hbrhbr

taskfile.yaml

@@ -8,7 +8,6 @@ includes:
 
 vars:
   G_BUILD_DIR: "{{.ROOT_DIR}}/build"
-  G_CMAKE_CACHE: "{{.G_BUILD_DIR}}/CMakeCache.txt"
   G_COMPILE_COMMANDS_DB: "{{.G_BUILD_DIR}}/compile_commands.json"
   G_CPP_SRC_DIR: "{{.ROOT_DIR}}/src"
 

taskfiles/build.yaml

@@ -1,35 +1,63 @@
 version: "3"
 
+vars:
+  G_BUILD_CONF_ARGS_DEPS_INSTALL_PREFIXES: >-
+    -DCatch2_ROOT={{.G_DEPS_DIR}}/Catch2-install
+  G_BUILD_CONF_ARGS: >-
+    {{.G_BUILD_CONF_ARGS_DEPS_INSTALL_PREFIXES}}
+
 tasks:
   target:
     desc: "Builds ystdlib-cpp."
+    deps:
+      - ":deps:install-all"
     cmds:
       - task: ":utils:cmake-config-and-build"
         vars:
           BUILD_DIR: "{{.G_BUILD_DIR}}"
-          SOURCE_DIR: "{{.ROOT_DIR}}"
-          CONF_ARGS: >-
-            -DCatch2_ROOT="{{.G_DEPS_DIR}}/Catch2-install"
+          CONF_ARGS: "{{.G_BUILD_CONF_ARGS}}"
           JOBS: "{{numCPU}}"
+          SOURCE_DIR: "{{.ROOT_DIR}}"
+      # TODO: move this into a separate task
+      - "{{.G_BUILD_DIR}}/unitTest"
 
+  # TODO: move this into yscope-dev-utils
   clean:
     desc: "Removes all built artifacts."
     deps:
-      - ":config-cmake-project"
+      - task: ":build:cmake-config"
+        vars:
+          BUILD_DIR: "{{.G_BUILD_DIR}}"
+          CONF_ARGS: "{{.G_BUILD_CONF_ARGS}}"
+          SOURCE_DIR: "{{.ROOT_DIR}}"
     cmds:
       - >-
         cmake
         --build "{{.G_BUILD_DIR}}"
         --parallel {{numCPU}}
         --target clean
 
-  config-cmake-project:
+  # TODO: move this into yscope-dev-utils
+  cmake-config:
     internal: true
+    label: "{{.TASK}}-{{.SOURCE_DIR}}-{{.BUILD_DIR}}-{{.CONF_ARGS}}"
+    vars:
+      CONF_ARGS: >-
+        {{default "" .CONF_ARGS}}
+    requires:
+      vars:
+        - "BUILD_DIR"
+        - "SOURCE_DIR"
     sources:
-      - "CMakeLists.txt"
-      - "{{.TASKFILE}}"
+      - "{{.SOURCE_DIR}}/CMakeLists.txt"
     generates:
-      - "{{.G_CMAKE_CACHE}}"
-      - "{{.G_COMPILE_COMMANDS_DB}}"
+      - "{{.BUILD_DIR}}/CMakeCache.txt"
+      - "{{.BUILD_DIR}}/compile_commands.json"
+    deps:
+      - ":deps:install-all"
     cmds:
-      - "cmake -S '{{.ROOT_DIR}}' -B '{{.G_BUILD_DIR}}'"
+      - >-
+        cmake
+        -S "{{.SOURCE_DIR}}"
+        -B "{{.BUILD_DIR}}"
+        {{.CONF_ARGS}}

taskfiles/deps.yaml

@@ -22,7 +22,7 @@ tasks:
 
   install-dep:
     internal: true
-    label: "install-{{.NAME}}-{{.VERSION}}-{{.CONF_ARGS}}"
+    label: "install-{{.NAME}}-{{.RELEASE}}-{{.CONF_ARGS}}"
     vars:
       BUILD_DIR: >-
         {{default (printf "%s/%s-build" .G_DEPS_DIR .NAME) .BUILD_DIR}}
@@ -40,6 +40,8 @@ tasks:
         - "SOURCE_SHA256"
     sources:
       - "{{.G_DEPS_DIR}}/{{.NAME}}-src.md5"
+    generates:
+      - "{{.G_DEPS_DIR}}/{{.NAME}}-src.md5"
     cmds:
       - task: ":utils:download-and-extract-tar"
         vars:

taskfiles/lint-cpp.yaml

@@ -65,7 +65,11 @@ tasks:
       - "{{.ROOT_DIR}}/.clang-tidy"
       - "{{.TASKFILE}}"
     deps:
-      - ":build:config-cmake-project"
+      - task: ":build:cmake-config"
+        vars:
+          BUILD_DIR: "{{.G_BUILD_DIR}}"
+          CONF_ARGS: "{{.G_BUILD_CONF_ARGS}}"
+          SOURCE_DIR: "{{.ROOT_DIR}}"
       - "cpp-configs"
       - "venv"
     cmds: