Refactor to simplify code through minor duplication.

Author: davidlion

taskfile.yaml

@@ -15,10 +15,14 @@ vars:
   # This must match the package name in CMakeLists.txt.
   G_CMAKE_PACKAGE_NAME: "ystdlib"
 
-  # Build variables
+  # Build directories
   G_BUILD_DIR: "{{.ROOT_DIR}}/build"
   G_EXAMPLES_BUILD_DIR: "{{.G_BUILD_DIR}}/examples"
+  G_EXAMPLES_DEBUG_BUILD_DIR: "{{.G_EXAMPLES_BUILD_DIR}}/debug"
+  G_EXAMPLES_RELEASE_BUILD_DIR: "{{.G_EXAMPLES_BUILD_DIR}}/release"
   G_YSTDLIB_BUILD_DIR: "{{.G_BUILD_DIR}}/{{.G_CMAKE_PACKAGE_NAME}}"
+  G_YSTDLIB_DEBUG_BUILD_DIR: "{{.G_YSTDLIB_BUILD_DIR}}/debug"
+  G_YSTDLIB_RELEASE_BUILD_DIR: "{{.G_YSTDLIB_BUILD_DIR}}/release"
 
 tasks:
   clean:

taskfiles/examples.yaml

@@ -10,55 +10,47 @@ includes:
 
 tasks:
   build-debug:
+    vars:
+      BUILD_DIR: "{{.G_EXAMPLES_DEBUG_BUILD_DIR}}"
     cmds:
-      - task: "build"
+      - task: "generate"
         vars:
+          BUILD_DIR: "{{.BUILD_DIR}}"
           BUILD_TYPE: "debug"
+      - task: "utils:cmake:build"
+        vars:
+          BUILD_DIR: "{{.BUILD_DIR}}"
 
   build-release:
+    vars:
+      BUILD_DIR: "{{.G_EXAMPLES_RELEASE_BUILD_DIR}}"
     cmds:
-      - task: "build"
+      - task: "generate"
         vars:
+          BUILD_DIR: "{{.BUILD_DIR}}"
           BUILD_TYPE: "release"
+      - task: "utils:cmake:build"
+        vars:
+          BUILD_DIR: "{{.BUILD_DIR}}"
 
   clean-debug:
     cmds:
-      - task: "clean"
+      - task: "utils:cmake:clean"
         vars:
-          BUILD_TYPE: "debug"
+          BUILD_DIR: "{{.G_EXAMPLES_DEBUG_BUILD_DIR}}"
 
   clean-release:
-    cmds:
-      - task: "clean"
-        vars:
-          BUILD_TYPE: "release"
-
-  build:
-    internal: true
-    requires:
-      vars: ["BUILD_TYPE"]
-    deps:
-      - task: "generate"
-        vars:
-          BUILD_TYPE: "{{.BUILD_TYPE}}"
-    cmds:
-      - task: "utils:cmake:build"
-        vars:
-          BUILD_DIR: "{{.G_EXAMPLES_BUILD_DIR}}/{{.BUILD_TYPE}}"
-
-  clean:
-    internal: true
-    requires:
-      vars: ["BUILD_TYPE"]
     cmds:
       - task: "utils:cmake:clean"
         vars:
-          BUILD_DIR: "{{.G_EXAMPLES_BUILD_DIR}}/{{.BUILD_TYPE}}"
+          BUILD_DIR: "{{.G_EXAMPLES_RELEASE_BUILD_DIR}}"
 
   generate:
     internal: true
     requires:
-      vars: ["BUILD_TYPE"]
+      vars:
+        - "BUILD_DIR"
+        - "BUILD_TYPE"
     vars:
       YSTDLIB_INSTALL_PREFIX: >-
         {{.G_EXAMPLES_BUILD_DIR}}/deps/{{.G_CMAKE_PACKAGE_NAME}}/{{.BUILD_TYPE}}
@@ -69,7 +61,7 @@ tasks:
     cmds:
       - task: "utils:cmake:generate"
         vars:
-          BUILD_DIR: "{{.G_EXAMPLES_BUILD_DIR}}/{{.BUILD_TYPE}}"
+          BUILD_DIR: "{{.BUILD_DIR}}"
           EXTRA_ARGS:
             - "-DCMAKE_BUILD_TYPE={{.BUILD_TYPE}}"
             - "-D{{.G_CMAKE_PACKAGE_NAME}}_ROOT={{.YSTDLIB_INSTALL_PREFIX}}"

taskfiles/ystdlib.yaml

@@ -15,116 +15,89 @@ tasks:
       build-debug [ystdlib_LIBRARIES="<lib0;...;libn>"]: Configure and build debug libraries. If
       ystdlib_LIBRARIES is defined, only configure and build the listed libraries and their internal
       dependencies.
+    vars:
+      BUILD_DIR: "{{.G_YSTDLIB_DEBUG_BUILD_DIR}}"
     cmds:
-      - task: "build"
+      - task: "generate"
         vars:
+          BUILD_DIR: "{{.BUILD_DIR}}"
           BUILD_TYPE: "debug"
-          LIBRARIES: "{{.ystdlib_LIBRARIES}}"
+      - task: "utils:cmake:build"
+        vars:
+          BUILD_DIR: "{{.BUILD_DIR}}"
 
   build-release:
     # The name ystdlib_LIBRARIES should match its CMakeLists.txt equivalent for consistency.
     desc: >-
       build-release [ystdlib_LIBRARIES="<lib0;...;libn>"]: Configure and build release libraries. If
       ystdlib_LIBRARIES is defined, only configure and build the listed libraries and their internal
       dependencies.
+    vars:
+      BUILD_DIR: "{{.G_YSTDLIB_RELEASE_BUILD_DIR}}"
     cmds:
-      - task: "build"
+      - task: "generate"
         vars:
+          BUILD_DIR: "{{.BUILD_DIR}}"
           BUILD_TYPE: "release"
           LIBRARIES: "{{.ystdlib_LIBRARIES}}"
+      - task: "utils:cmake:build"
+        vars:
+          BUILD_DIR: "{{.BUILD_DIR}}"
 
   clean-debug:
     cmds:
-      - task: "clean"
+      - task: "utils:cmake:clean"
         vars:
-          BUILD_TYPE: "debug"
+          BUILD_DIR: "{{.G_YSTDLIB_DEBUG_BUILD_DIR}}"
 
   clean-release:
     cmds:
-      - task: "clean"
+      - task: "utils:cmake:clean"
         vars:
-          BUILD_TYPE: "release"
+          BUILD_DIR: "{{.G_YSTDLIB_RELEASE_BUILD_DIR}}"
 
   install-debug:
     desc: >-
       install-debug INSTALL_PREFIX="<prefix path>": Install the debug build into <prefix path>.
     requires:
-      vars: ["INSTALL_PREFIX"]
+      vars:
+        - "INSTALL_PREFIX"
     cmds:
-      - task: "install"
+      - task: "build-debug"
+      - task: "utils:cmake:install"
         vars:
-          BUILD_TYPE: "debug"
+          BUILD_DIR: "{{.G_YSTDLIB_DEBUG_BUILD_DIR}}"
           INSTALL_PREFIX: "{{.INSTALL_PREFIX}}"
 
   install-release:
     desc: >-
       install-release INSTALL_PREFIX="<prefix path>": Install the release build into <prefix path>.
     requires:
-      vars: ["INSTALL_PREFIX"]
+      vars:
+        - "INSTALL_PREFIX"
     cmds:
-      - task: "install"
+      - task: "build-release"
+      - task: "utils:cmake:install"
         vars:
-          BUILD_TYPE: "release"
+          BUILD_DIR: "{{.G_YSTDLIB_RELEASE_BUILD_DIR}}"
           INSTALL_PREFIX: "{{.INSTALL_PREFIX}}"
 
-  build:
-    internal: true
-    requires:
-      vars: ["BUILD_TYPE"]
-    deps:
-      - task: "generate"
-        vars:
-          BUILD_TYPE: "{{.BUILD_TYPE}}"
-          LIBRARIES: "{{.LIBRARIES}}"
-    cmds:
-      - task: "utils:cmake:build"
-        vars:
-          BUILD_DIR: "{{.G_YSTDLIB_BUILD_DIR}}/{{.BUILD_TYPE}}"
-
-  clean:
-    internal: true
-    requires:
-      vars: ["BUILD_TYPE"]
-    cmds:
-      - task: "utils:cmake:clean"
-        vars:
-          BUILD_DIR: "{{.G_YSTDLIB_BUILD_DIR}}/{{.BUILD_TYPE}}"
-
   generate:
     internal: true
     requires:
-      vars: ["BUILD_TYPE"]
+      vars:
+        - "BUILD_DIR"
+        - "BUILD_TYPE"
     deps:
       - "deps:install-all"
     cmds:
       - task: "utils:cmake:generate"
         vars:
-          BUILD_DIR: "{{.G_YSTDLIB_BUILD_DIR}}/{{.BUILD_TYPE}}"
+          BUILD_DIR: "{{.BUILD_DIR}}"
           EXTRA_ARGS:
-            - "-DCMAKE_BUILD_TYPE=\"{{.BUILD_TYPE}}\""
+            - "-DCMAKE_BUILD_TYPE={{.BUILD_TYPE}}"
             - >-
               {{- if .LIBRARIES -}}
                 -D{{.G_CMAKE_PACKAGE_NAME}}_LIBRARIES="{{.LIBRARIES}}"
               {{- end}}
           SOURCE_DIR: "{{.ROOT_DIR}}"
-
-  install:
-    internal: true
-    vars:
-      ABSOLUTE_INSTALL_PREFIX: >-
-        {{- if osIsAbs .INSTALL_PREFIX -}}
-          {{.INSTALL_PREFIX}}
-        {{- else -}}
-          {{.USER_WORKING_DIR}}/{{.INSTALL_PREFIX}}
-        {{- end}}
-    requires:
-      vars: ["BUILD_TYPE", "INSTALL_PREFIX"]
-    deps:
-      - task: "build"
-        vars:
-          BUILD_TYPE: "{{.BUILD_TYPE}}"
-    cmds:
-      - task: "utils:cmake:install"
-        vars:
-          BUILD_DIR: "{{.G_YSTDLIB_BUILD_DIR}}/{{.BUILD_TYPE}}"
-          INSTALL_PREFIX: "{{.ABSOLUTE_INSTALL_PREFIX}}"