From 68aee8409f1f2933dccc411b906d39ec5480bd14 Mon Sep 17 00:00:00 2001 From: Hunter B Date: Tue, 9 Jun 2026 23:24:13 -0700 Subject: [PATCH] chore: move HarmonyOS clang wrappers to scripts/ohos/ --- .gitignore | 2 -- docs/HarmonyOS.md | 14 +++++++------- ohos-clang.ps1 => scripts/ohos/ohos-clang.ps1 | 0 ohos-clang.sh => scripts/ohos/ohos-clang.sh | 0 ohos-clangxx.ps1 => scripts/ohos/ohos-clangxx.ps1 | 0 ohos-clangxx.sh => scripts/ohos/ohos-clangxx.sh | 0 6 files changed, 7 insertions(+), 9 deletions(-) rename ohos-clang.ps1 => scripts/ohos/ohos-clang.ps1 (100%) rename ohos-clang.sh => scripts/ohos/ohos-clang.sh (100%) rename ohos-clangxx.ps1 => scripts/ohos/ohos-clangxx.ps1 (100%) rename ohos-clangxx.sh => scripts/ohos/ohos-clangxx.sh (100%) diff --git a/.gitignore b/.gitignore index 3670235f..f577bb64 100644 --- a/.gitignore +++ b/.gitignore @@ -50,8 +50,6 @@ docs/*.pdf # Local dev scripts and temp files *.sh *.cmd -!ohos-clang.sh -!ohos-clangxx.sh !scripts/** !.github/scripts/** test.txt diff --git a/docs/HarmonyOS.md b/docs/HarmonyOS.md index 2c84eb88..a267eb08 100644 --- a/docs/HarmonyOS.md +++ b/docs/HarmonyOS.md @@ -46,28 +46,28 @@ CMake toolchain variables for `aarch64-unknown-linux-ohos`. ## Compiler Wrappers -For ad-hoc compiler calls, use the root wrappers. They read the same +For ad-hoc compiler calls, use the wrappers in `scripts/ohos/`. They read the same `OHOS_NATIVE_SDK` variable and do not contain local paths. Windows PowerShell: ```powershell -.\ohos-clang.ps1 --version -.\ohos-clangxx.ps1 --version +.\scripts\ohos\ohos-clang.ps1 --version +.\scripts\ohos\ohos-clangxx.ps1 --version ``` Linux or macOS: ```bash -sh ./ohos-clang.sh --version -sh ./ohos-clangxx.sh --version +sh ./scripts/ohos/ohos-clang.sh --version +sh ./scripts/ohos/ohos-clangxx.sh --version ``` -If you want to run the POSIX wrappers directly as `./ohos-clang.sh`, make them +If you want to run the POSIX wrappers directly as `./scripts/ohos/ohos-clang.sh`, make them executable first: ```bash -chmod +x ./ohos-clang.sh ./ohos-clangxx.sh +chmod +x ./scripts/ohos/ohos-clang.sh ./scripts/ohos/ohos-clangxx.sh ``` ## Cargo Config diff --git a/ohos-clang.ps1 b/scripts/ohos/ohos-clang.ps1 similarity index 100% rename from ohos-clang.ps1 rename to scripts/ohos/ohos-clang.ps1 diff --git a/ohos-clang.sh b/scripts/ohos/ohos-clang.sh similarity index 100% rename from ohos-clang.sh rename to scripts/ohos/ohos-clang.sh diff --git a/ohos-clangxx.ps1 b/scripts/ohos/ohos-clangxx.ps1 similarity index 100% rename from ohos-clangxx.ps1 rename to scripts/ohos/ohos-clangxx.ps1 diff --git a/ohos-clangxx.sh b/scripts/ohos/ohos-clangxx.sh similarity index 100% rename from ohos-clangxx.sh rename to scripts/ohos/ohos-clangxx.sh