From 7e5cd1dc234fbc732309fde8bb2bbdc3015dc189 Mon Sep 17 00:00:00 2001 From: Tyler Wilding Date: Mon, 25 Nov 2024 13:38:40 -0500 Subject: [PATCH] fully revert changes to Taskfile variable deduplication If someone on linux/macOS wanted or needed to change these values, they would have to copy them into the respective file. It would then be potentially confusing which variable is the source of truth (the OS file wins). Avoid this unneeded confusion, having the variables copied into the darwin and linux file is not a big deal. --- Taskfile.yml | 17 +---------------- scripts/tasks/Taskfile_darwin.yml | 10 ++++++++++ scripts/tasks/Taskfile_linux.yml | 10 ++++++++++ 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/Taskfile.yml b/Taskfile.yml index 6e1c669fd16..2235b180439 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -1,22 +1,7 @@ version: 3 includes: - build: - taskfile: ./scripts/tasks/Taskfile_{{OS}}.yml - optional: true - -# Default vars for Linux/Mac/Unix -vars: - GOALC_BIN_RELEASE_DIR: './build/goalc' - GK_BIN_RELEASE_DIR: './build/game' - DECOMP_BIN_RELEASE_DIR: './build/decompiler' - MEMDUMP_BIN_RELEASE_DIR: './build/tools' - TYPESEARCH_BIN_RELEASE_DIR: './build/tools' - OFFLINETEST_BIN_RELEASE_DIR: './build' - GOALCTEST_BIN_RELEASE_DIR: './build' - FORMATTER_BIN_RELEASE_DIR: './build/tools' - EXE_FILE_EXTENSION: '' - PYTHON: 'python3' + build: ./scripts/tasks/Taskfile_{{OS}}.yml dotenv: - ./scripts/tasks/.env diff --git a/scripts/tasks/Taskfile_darwin.yml b/scripts/tasks/Taskfile_darwin.yml index 12ec1c984f6..e0bd4737491 100644 --- a/scripts/tasks/Taskfile_darwin.yml +++ b/scripts/tasks/Taskfile_darwin.yml @@ -1,3 +1,13 @@ version: 3 vars: + GOALC_BIN_RELEASE_DIR: './build/goalc' + GK_BIN_RELEASE_DIR: './build/game' + DECOMP_BIN_RELEASE_DIR: './build/decompiler' + MEMDUMP_BIN_RELEASE_DIR: './build/tools' + TYPESEARCH_BIN_RELEASE_DIR: './build/tools' + OFFLINETEST_BIN_RELEASE_DIR: './build' + GOALCTEST_BIN_RELEASE_DIR: './build' + FORMATTER_BIN_RELEASE_DIR: './build/tools' + EXE_FILE_EXTENSION: '' + PYTHON: 'python3' \ No newline at end of file diff --git a/scripts/tasks/Taskfile_linux.yml b/scripts/tasks/Taskfile_linux.yml index 12ec1c984f6..e0bd4737491 100644 --- a/scripts/tasks/Taskfile_linux.yml +++ b/scripts/tasks/Taskfile_linux.yml @@ -1,3 +1,13 @@ version: 3 vars: + GOALC_BIN_RELEASE_DIR: './build/goalc' + GK_BIN_RELEASE_DIR: './build/game' + DECOMP_BIN_RELEASE_DIR: './build/decompiler' + MEMDUMP_BIN_RELEASE_DIR: './build/tools' + TYPESEARCH_BIN_RELEASE_DIR: './build/tools' + OFFLINETEST_BIN_RELEASE_DIR: './build' + GOALCTEST_BIN_RELEASE_DIR: './build' + FORMATTER_BIN_RELEASE_DIR: './build/tools' + EXE_FILE_EXTENSION: '' + PYTHON: 'python3' \ No newline at end of file