From 9d00c97600e6b59f43b0d9e54a6a3780ca1c67c1 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Tue, 7 Oct 2025 04:25:01 -0400 Subject: [PATCH 1/2] Add tar extraction args --- exports/taskfiles/utils/cmake.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/exports/taskfiles/utils/cmake.yaml b/exports/taskfiles/utils/cmake.yaml index 63ee963..a99fab2 100644 --- a/exports/taskfiles/utils/cmake.yaml +++ b/exports/taskfiles/utils/cmake.yaml @@ -160,6 +160,12 @@ tasks: # project's top level CMakeLists.txt. # @param {string[]} [CMAKE_TARGETS] A list of specific targets to build instead of the default # target. + # + # Tar extraction parameters + # @param {string[]} [TAR_EXCLUDE_PATTERNS] Path wildcard patterns that should not be extracted. + # @param {string[]} [TAR_INCLUDE_PATTERNS] Path wildcard patterns to extract. + # @param {int} [TAR_NUM_COMPONENTS_TO_STRIP=1] Number of leading path components to strip from the + # extracted files. install-remote-tar: internal: true label: "{{.TASK}}:{{.CMAKE_PACKAGE_NAME}}-{{.TAR_URL}}-{{.INSTALL_PREFIX}}" @@ -180,6 +186,13 @@ tasks: CMAKE_TARGETS: ref: "default (list) .CMAKE_TARGETS" + # Tar extraction parameters + TAR_EXCLUDE_PATTERNS: + ref: "default (list) .TAR_EXCLUDE_PATTERNS" + TAR_INCLUDE_PATTERNS: + ref: "default (list) .TAR_INCLUDE_PATTERNS" + TAR_NUM_COMPONENTS_TO_STRIP: "{{default 1 .TAR_NUM_COMPONENTS_TO_STRIP}}" + # Directory parameters BUILD_DIR: "{{.WORK_DIR}}/{{.CMAKE_PACKAGE_NAME}}-build" EXTRACTION_DIR: "{{.WORK_DIR}}/{{.CMAKE_PACKAGE_NAME}}-extracted" @@ -190,7 +203,10 @@ tasks: deps: - task: "remote:download-and-extract-tar" vars: + EXCLUDE_PATTERNS: "{{.TAR_EXCLUDE_PATTERNS}}" FILE_SHA256: "{{.TAR_SHA256}}" + INCLUDE_PATTERNS: "{{.TAR_INCLUDE_PATTERNS}}" + NUM_COMPONENTS_TO_STRIP: "{{.TAR_NUM_COMPONENTS_TO_STRIP}}" OUTPUT_DIR: "{{.EXTRACTION_DIR}}" URL: "{{.TAR_URL}}" cmds: From e6859a8b53f8809bb5ee055d8c94538ebb03cf34 Mon Sep 17 00:00:00 2001 From: Bingran Hu Date: Tue, 7 Oct 2025 04:43:44 -0400 Subject: [PATCH 2/2] Fix list var passing --- exports/taskfiles/utils/cmake.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/exports/taskfiles/utils/cmake.yaml b/exports/taskfiles/utils/cmake.yaml index a99fab2..39e63f2 100644 --- a/exports/taskfiles/utils/cmake.yaml +++ b/exports/taskfiles/utils/cmake.yaml @@ -203,9 +203,11 @@ tasks: deps: - task: "remote:download-and-extract-tar" vars: - EXCLUDE_PATTERNS: "{{.TAR_EXCLUDE_PATTERNS}}" + EXCLUDE_PATTERNS: + ref: ".TAR_EXCLUDE_PATTERNS" FILE_SHA256: "{{.TAR_SHA256}}" - INCLUDE_PATTERNS: "{{.TAR_INCLUDE_PATTERNS}}" + INCLUDE_PATTERNS: + ref: ".TAR_INCLUDE_PATTERNS" NUM_COMPONENTS_TO_STRIP: "{{.TAR_NUM_COMPONENTS_TO_STRIP}}" OUTPUT_DIR: "{{.EXTRACTION_DIR}}" URL: "{{.TAR_URL}}"