Refactor based on the new dev utils

Author: Bill-hbrhbr

.github/workflows/unit-tests.yaml

@@ -63,4 +63,4 @@ jobs:
 
       # TODO: Change the task to run all unittests once any unittest is added. Until then we check
       # that building the project succeeds.
-      - run: "task build:target"
+      - run: "task build:unittest"

taskfiles/build.yaml

@@ -1,63 +1,31 @@
 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}}
+  G_CMAKE_CONF_ARGS:
+    - "-DCatch2_ROOT={{.G_DEPS_DIR}}/Catch2-install"
 
 tasks:
-  target:
-    desc: "Builds ystdlib-cpp."
+  unittest:
+    desc: "Builds and runs ystdlib-cpp's unittest."
     deps:
       - ":deps:install-all"
     cmds:
-      - task: ":utils:cmake-config-and-build"
+      - task: ":utils:cmake-generate"
         vars:
           BUILD_DIR: "{{.G_BUILD_DIR}}"
-          CONF_ARGS: "{{.G_BUILD_CONF_ARGS}}"
-          JOBS: "{{numCPU}}"
+          EXTRA_ARGS:
+            ref: ".G_CMAKE_CONF_ARGS"
           SOURCE_DIR: "{{.ROOT_DIR}}"
-      # TODO: move this into a separate task
-      - "{{.G_BUILD_DIR}}/unitTest"
+      - task: ":utils:cmake-build"
+        vars:
+          BUILD_DIR: "{{.G_BUILD_DIR}}"
+          JOBS: "{{numCPU}}"
+          TARGETS:
+            - "unitTest"
 
-  # TODO: move this into yscope-dev-utils
   clean:
     desc: "Removes all built artifacts."
     deps:
-      - task: ":build:cmake-config"
+      - task: ":utils:cmake-clean"
         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
-
-  # 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:
-      - "{{.SOURCE_DIR}}/CMakeLists.txt"
-    generates:
-      - "{{.BUILD_DIR}}/CMakeCache.txt"
-      - "{{.BUILD_DIR}}/compile_commands.json"
-    deps:
-      - ":deps:install-all"
-    cmds:
-      - >-
-        cmake
-        -S "{{.SOURCE_DIR}}"
-        -B "{{.BUILD_DIR}}"
-        {{.CONF_ARGS}}

taskfiles/deps.yaml

@@ -1,60 +1,23 @@
 version: "3"
 
-vars:
-  G_DEPS_DIR: "{{.G_BUILD_DIR}}/deps"
-  G_DEPS_RELEASES_JSON: >-
-    {
-      "Catch2": "v3.8.0"
-    }
-  G_DEPS_RELEASES:
-    ref: "fromJson .G_DEPS_RELEASES_JSON"
-
 tasks:
   install-all:
     desc: "Install all dependencies required by ystdlib-cpp."
     deps:
-      - task: "install-dep"
-        vars:
-          NAME: "Catch2"
-          ORG: "catchorg"
-          RELEASE: "{{.G_DEPS_RELEASES.Catch2}}"
-          SOURCE_SHA256: "1ab2de20460d4641553addfdfe6acd4109d871d5531f8f519a52ea4926303087"
+      - "install-Catch2"
 
-  install-dep:
+  install-Catch2:
     internal: true
-    label: "install-{{.NAME}}-{{.RELEASE}}-{{.CONF_ARGS}}"
-    vars:
-      BUILD_DIR: >-
-        {{default (printf "%s/%s-build" .G_DEPS_DIR .NAME) .BUILD_DIR}}
-      CONF_ARGS: >-
-        {{default "" .CONF_ARGS}}
-      INSTALL_PREFIX: >-
-        {{default (printf "%s/%s-install" .G_DEPS_DIR .NAME) .INSTALL_PREFIX}}
-      SOURCE_DIR: >-
-        {{default (printf "%s/%s-src" .G_DEPS_DIR .NAME) .SOURCE_DIR}}
-    requires:
-      vars:
-        - "NAME"
-        - "ORG"
-        - "RELEASE"
-        - "SOURCE_SHA256"
     sources:
-      - "{{.G_DEPS_DIR}}/{{.NAME}}-src.md5"
+      - "{{.G_DEPS_DIR}}/Catch2-install/*"
+      - "{{.G_DEPS_DIR}}/Catch2-src.md5"
     generates:
-      - "{{.G_DEPS_DIR}}/{{.NAME}}-src.md5"
+      - "{{.G_DEPS_DIR}}/Catch2-src.md5"
     cmds:
-      - task: ":utils:download-and-extract-tar"
+      - task: ":utils:cmake-install-remote-tar"
         vars:
-          FILE_SHA256: "{{.SOURCE_SHA256}}"
-          OUTPUT_DIR: "{{.SOURCE_DIR}}"
-          URL: >-
-            {{printf "https://github.com/%s/%s/archive/refs/tags/%s.tar.gz" .ORG .NAME .RELEASE}}
-      - task: ":utils:cmake-config-and-build"
-        vars:
-          BUILD_DIR: "{{.BUILD_DIR}}"
-          CONF_ARGS: "{{.CONF_ARGS}}"
-          SOURCE_DIR: "{{.SOURCE_DIR}}"
-      - task: ":utils:cmake-install"
-        vars:
-          BUILD_DIR: "{{.BUILD_DIR}}"
-          INSTALL_PREFIX: "{{.INSTALL_PREFIX}}"
+          NAME: "Catch2"
+          WORK_DIR: "{{.G_DEPS_DIR}}"
+          FILE_SHA256: "1ab2de20460d4641553addfdfe6acd4109d871d5531f8f519a52ea4926303087"
+          URL: "https://github.com/catchorg/Catch2/archive/refs/tags/v3.8.0.tar.gz"
+          JOBS: "{{numCPU}}"

taskfiles/lint-cpp.yaml

@@ -65,10 +65,11 @@ tasks:
       - "{{.ROOT_DIR}}/.clang-tidy"
       - "{{.TASKFILE}}"
     deps:
-      - task: ":build:cmake-config"
+      - task: ":utils:cmake-generate"
         vars:
           BUILD_DIR: "{{.G_BUILD_DIR}}"
-          CONF_ARGS: "{{.G_BUILD_CONF_ARGS}}"
+          EXTRA_ARGS:
+            ref: ".G_CMAKE_CONF_ARGS"
           SOURCE_DIR: "{{.ROOT_DIR}}"
       - "cpp-configs"
       - "venv"