From a14305e225b10f42c9ecdf44e47f1df29071fd26 Mon Sep 17 00:00:00 2001 From: Mamadou Babaei Date: Tue, 30 Jul 2024 17:43:43 +0200 Subject: [PATCH] fix the windows cmd.exe issues with rename/copy and always use move when invoking the pack target --- Handbook/GNUmakefile | 12 ++++++++++-- Handbook/README.md | 5 +++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Handbook/GNUmakefile b/Handbook/GNUmakefile index 62ccfc15..050d5624 100644 --- a/Handbook/GNUmakefile +++ b/Handbook/GNUmakefile @@ -473,7 +473,11 @@ _pack: @echo "Creating the pack directory '$(SG_DOCUMENTATION_PACK_DIR)'..." @mkdir -p "$(SG_DOCUMENTATION_PACK_DIR)" @echo "Moving '$(SG_DOCUMENTATION_HTML_DIR)' to '$(SG_HANDBOOK_PACKED_HTML_DIR)'..." +ifeq ($(SG_BUILD_PLATFORM),$(SG_BUILD_PLATFORM_LINUX)) @mv $(SG_DOCUMENTATION_HTML_DIR) $(SG_HANDBOOK_PACKED_HTML_DIR) +else # ($(SG_BUILD_PLATFORM),$(SG_BUILD_PLATFORM_LINUX)) + @powershell -Command "Move-Item '$(SG_DOCUMENTATION_HTML_DIR)' '$(SG_HANDBOOK_PACKED_HTML_DIR)'" +endif # ($(SG_BUILD_PLATFORM),$(SG_BUILD_PLATFORM_LINUX)) @echo "Compressing '$(SG_HANDBOOK_PACKED_HTML_DIR)' to '$(SG_HANDBOOK_PACKED_HTML_FILE)'..." ifeq ($(SG_BUILD_PLATFORM),$(SG_BUILD_PLATFORM_LINUX)) @cd $(SG_DOCUMENTATION_PACK_DIR) \ @@ -482,8 +486,12 @@ else # ($(SG_BUILD_PLATFORM),$(SG_BUILD_PLATFORM_LINUX)) @cd $(SG_DOCUMENTATION_PACK_DIR) \ && powershell Compress-Archive $(SG_HANDBOOK_ESCAPED_NAME) $(SG_HANDBOOK_PACKED_HTML_FILE) endif # ($(SG_BUILD_PLATFORM),$(SG_BUILD_PLATFORM_LINUX)) - @echo "Copying '$(SG_DOCUMENTATION_PDF_FILE)' to '$(SG_HANDBOOK_PACKED_PDF_FILE)'..." - @cp -v $(SG_DOCUMENTATION_PDF_FILE) $(SG_HANDBOOK_PACKED_PDF_FILE) + @echo "Moving '$(SG_DOCUMENTATION_PDF_FILE)' to '$(SG_HANDBOOK_PACKED_PDF_FILE)'..." +ifeq ($(SG_BUILD_PLATFORM),$(SG_BUILD_PLATFORM_LINUX)) + @mv $(SG_DOCUMENTATION_PDF_FILE) $(SG_HANDBOOK_PACKED_PDF_FILE) +else # ($(SG_BUILD_PLATFORM),$(SG_BUILD_PLATFORM_LINUX)) + @powershell -Command "Move-Item '$(SG_DOCUMENTATION_PDF_FILE)' '$(SG_HANDBOOK_PACKED_PDF_FILE)'" +endif # ($(SG_BUILD_PLATFORM),$(SG_BUILD_PLATFORM_LINUX)) .PHONY: _deploy _deploy: diff --git a/Handbook/README.md b/Handbook/README.md index bc1211a3..f17c0e49 100644 --- a/Handbook/README.md +++ b/Handbook/README.md @@ -6,11 +6,12 @@ - cygpath (Windows only) provided by [Git for Windows](https://gitforwindows.org/). - GNU Make. - Git. -- PowerShell (Windows only) or `zip` command (Linux only). +- PowerShell (Windows only) required only by the `pack` make target. - Python3 along with venv and pip. For Windows, a version of [WinPython](https://winpython.github.io/) is already shipped with this repo, so it's not an external requirement. -- Rsync and OpenSSH ([cwRsync](https://itefix.net/cwrsync) provides these for Windows). +- Rsync and OpenSSH ([cwRsync](https://itefix.net/cwrsync) provides these for Windows) required only by the `deploy` make target. - The Rust Toolchain and the Cargo package manager. - Other common Unix utilities such as `awk`, `cp`, `cut`, `date`, `find`, `grep`, `hostname`, `mkdir`, `mktemp`, `mv`, `scp`, `sed`, `ssh`, `sort`, `tr`, and `uname` provided by most distors. On Windows these are mostly provided by [Git for Windows](https://gitforwindows.org/). +- `zip` command (Linux only) required only by the `pack` make target. ### Microsoft Windows Prerequisites Installation Notes