diff --git a/taskfiles/deps/main.yaml b/taskfiles/deps/main.yaml index 657c1c8c9c..c05829bf76 100644 --- a/taskfiles/deps/main.yaml +++ b/taskfiles/deps/main.yaml @@ -165,9 +165,9 @@ tasks: - task: "yscope-dev-utils:cmake:install" vars: BUILD_DIR: "{{.BUILD_DIR}}" + CMAKE_PACKAGE_NAME: "{{.LIB_NAME}}" CMAKE_SETTINGS_DIR: "{{.G_DEPS_CORE_CMAKE_SETTINGS_DIR}}" INSTALL_PREFIX: "{{.INSTALL_PREFIX}}" - NAME: "{{.LIB_NAME}}" # This command must be last - task: "yscope-dev-utils:checksum:compute" diff --git a/taskfiles/deps/utils.yaml b/taskfiles/deps/utils.yaml index 2db0c43788..a80fe953a7 100644 --- a/taskfiles/deps/utils.yaml +++ b/taskfiles/deps/utils.yaml @@ -63,13 +63,13 @@ tasks: cmds: - task: "yscope-dev-utils:cmake:install-remote-tar" vars: - CMAKE_SETTINGS_DIR: "{{.G_DEPS_CORE_CMAKE_SETTINGS_DIR}}" - FILE_SHA256: "{{.TARBALL_SHA256}}" - GEN_ARGS: + CMAKE_GEN_ARGS: ref: ".CMAKE_GEN_ARGS" - JOBS: "{{.G_CORE_MAX_PARALLELISM_PER_BUILD_TASK}}" - NAME: "{{.LIB_NAME}}" - URL: "{{.TARBALL_URL}}" + CMAKE_JOBS: "{{.G_CORE_MAX_PARALLELISM_PER_BUILD_TASK}}" + CMAKE_PACKAGE_NAME: "{{.LIB_NAME}}" + CMAKE_SETTINGS_DIR: "{{.G_DEPS_CORE_CMAKE_SETTINGS_DIR}}" + TAR_SHA256: "{{.TARBALL_SHA256}}" + TAR_URL: "{{.TARBALL_URL}}" WORK_DIR: "{{.G_DEPS_CORE_DIR}}" # This command must be last diff --git a/tools/scripts/deps-download/init.sh b/tools/scripts/deps-download/init.sh index 47ae0df2a5..bd268c94cf 100755 --- a/tools/scripts/deps-download/init.sh +++ b/tools/scripts/deps-download/init.sh @@ -10,7 +10,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" project_root_dir="$script_dir/../../../" download_dep_script="$script_dir/download-dep.py" -readonly YSCOPE_DEV_UTILS_COMMIT_SHA="2693d8b69050b8d48f96ae60cfce7be8626d3875" +readonly YSCOPE_DEV_UTILS_COMMIT_SHA="76aecbd6d0db6e2078005431946b5c2e716c4291" python3 "${download_dep_script}" \ "https://github.com/y-scope/yscope-dev-utils/archive/${YSCOPE_DEV_UTILS_COMMIT_SHA}.zip" \ "yscope-dev-utils-${YSCOPE_DEV_UTILS_COMMIT_SHA}" \ diff --git a/tools/yscope-dev-utils b/tools/yscope-dev-utils index 2693d8b690..76aecbd6d0 160000 --- a/tools/yscope-dev-utils +++ b/tools/yscope-dev-utils @@ -1 +1 @@ -Subproject commit 2693d8b69050b8d48f96ae60cfce7be8626d3875 +Subproject commit 76aecbd6d0db6e2078005431946b5c2e716c4291