From f9d8882a51a7d175f80c9457db11921d49cea86d Mon Sep 17 00:00:00 2001 From: Frederic Lefebvre Date: Thu, 21 Aug 2025 16:35:44 +0200 Subject: [PATCH] Provisioning: Do not hardcode dynamic libclang version in file names libclang-v100-dyn.sh had the libclang version 10.0 hard coded in the file name for the Windows scripts. All local provisioning scripts calling the latter also had the same version hard coded in their respective filenames. libclang-v100-dyn.sh also sets the version to be downloaded in a local variable There is a mismatch between file names and actually installed version when the download version is modified. Remote version from common installer and related local scripts. Change-Id: I81773ff5a834b6f396ce17af93c6510991de129a Reviewed-by: Axel Spoerl --- .../common/windows/{libclang-v100-dyn.ps1 => libclang-dyn.ps1} | 0 coin/provisioning/qtci-windows-10-x86_64/08-libclang-dyn.ps1 | 2 ++ .../qtci-windows-10-x86_64/08-libclang-v100-dyn.ps1 | 2 -- .../qtci-windows-10_21H2-x86_64/08-libclang-dyn.ps1 | 2 ++ .../qtci-windows-10_21H2-x86_64/08-libclang-v100-dyn.ps1 | 2 -- .../qtci-windows-10_22H2-x86_64/08-libclang-dyn.ps1 | 2 ++ .../qtci-windows-10_22H2-x86_64/08-libclang-v100-dyn.ps1 | 2 -- .../qtci-windows-11_21H2-x86_64/08-libclang-dyn.ps1 | 2 ++ .../qtci-windows-11_21H2-x86_64/08-libclang-v100-dyn.ps1 | 2 -- .../qtci-windows-11_22H2-x86_64/08-libclang-dyn.ps1 | 2 ++ .../qtci-windows-11_22H2-x86_64/08-libclang-v100-dyn.ps1 | 2 -- .../qtci-windows-11_23H2-x86_64/08-libclang-dyn.ps1 | 2 ++ .../qtci-windows-11_23H2-x86_64/08-libclang-v100-dyn.ps1 | 2 -- .../qtci-windows-11_24H2-x86_64/08-libclang-dyn.ps1 | 2 ++ 14 files changed, 14 insertions(+), 12 deletions(-) rename coin/provisioning/common/windows/{libclang-v100-dyn.ps1 => libclang-dyn.ps1} (100%) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/08-libclang-dyn.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/08-libclang-v100-dyn.ps1 create mode 100644 coin/provisioning/qtci-windows-10_21H2-x86_64/08-libclang-dyn.ps1 delete mode 100644 coin/provisioning/qtci-windows-10_21H2-x86_64/08-libclang-v100-dyn.ps1 create mode 100644 coin/provisioning/qtci-windows-10_22H2-x86_64/08-libclang-dyn.ps1 delete mode 100644 coin/provisioning/qtci-windows-10_22H2-x86_64/08-libclang-v100-dyn.ps1 create mode 100644 coin/provisioning/qtci-windows-11_21H2-x86_64/08-libclang-dyn.ps1 delete mode 100644 coin/provisioning/qtci-windows-11_21H2-x86_64/08-libclang-v100-dyn.ps1 create mode 100644 coin/provisioning/qtci-windows-11_22H2-x86_64/08-libclang-dyn.ps1 delete mode 100644 coin/provisioning/qtci-windows-11_22H2-x86_64/08-libclang-v100-dyn.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-x86_64/08-libclang-dyn.ps1 delete mode 100644 coin/provisioning/qtci-windows-11_23H2-x86_64/08-libclang-v100-dyn.ps1 create mode 100644 coin/provisioning/qtci-windows-11_24H2-x86_64/08-libclang-dyn.ps1 diff --git a/coin/provisioning/common/windows/libclang-v100-dyn.ps1 b/coin/provisioning/common/windows/libclang-dyn.ps1 similarity index 100% rename from coin/provisioning/common/windows/libclang-v100-dyn.ps1 rename to coin/provisioning/common/windows/libclang-dyn.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-libclang-dyn.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-libclang-dyn.ps1 new file mode 100644 index 00000000..1a69afb6 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/08-libclang-dyn.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\libclang-dyn.ps1" 64 vs2019 +. "$PSScriptRoot\..\common\windows\libclang-dyn.ps1" 32 vs2019 diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-libclang-v100-dyn.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-libclang-v100-dyn.ps1 deleted file mode 100644 index 82b91257..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/08-libclang-v100-dyn.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 64 vs2019 -. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 32 vs2019 diff --git a/coin/provisioning/qtci-windows-10_21H2-x86_64/08-libclang-dyn.ps1 b/coin/provisioning/qtci-windows-10_21H2-x86_64/08-libclang-dyn.ps1 new file mode 100644 index 00000000..1a69afb6 --- /dev/null +++ b/coin/provisioning/qtci-windows-10_21H2-x86_64/08-libclang-dyn.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\libclang-dyn.ps1" 64 vs2019 +. "$PSScriptRoot\..\common\windows\libclang-dyn.ps1" 32 vs2019 diff --git a/coin/provisioning/qtci-windows-10_21H2-x86_64/08-libclang-v100-dyn.ps1 b/coin/provisioning/qtci-windows-10_21H2-x86_64/08-libclang-v100-dyn.ps1 deleted file mode 100644 index 82b91257..00000000 --- a/coin/provisioning/qtci-windows-10_21H2-x86_64/08-libclang-v100-dyn.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 64 vs2019 -. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 32 vs2019 diff --git a/coin/provisioning/qtci-windows-10_22H2-x86_64/08-libclang-dyn.ps1 b/coin/provisioning/qtci-windows-10_22H2-x86_64/08-libclang-dyn.ps1 new file mode 100644 index 00000000..1a69afb6 --- /dev/null +++ b/coin/provisioning/qtci-windows-10_22H2-x86_64/08-libclang-dyn.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\libclang-dyn.ps1" 64 vs2019 +. "$PSScriptRoot\..\common\windows\libclang-dyn.ps1" 32 vs2019 diff --git a/coin/provisioning/qtci-windows-10_22H2-x86_64/08-libclang-v100-dyn.ps1 b/coin/provisioning/qtci-windows-10_22H2-x86_64/08-libclang-v100-dyn.ps1 deleted file mode 100644 index 82b91257..00000000 --- a/coin/provisioning/qtci-windows-10_22H2-x86_64/08-libclang-v100-dyn.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 64 vs2019 -. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 32 vs2019 diff --git a/coin/provisioning/qtci-windows-11_21H2-x86_64/08-libclang-dyn.ps1 b/coin/provisioning/qtci-windows-11_21H2-x86_64/08-libclang-dyn.ps1 new file mode 100644 index 00000000..1a69afb6 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_21H2-x86_64/08-libclang-dyn.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\libclang-dyn.ps1" 64 vs2019 +. "$PSScriptRoot\..\common\windows\libclang-dyn.ps1" 32 vs2019 diff --git a/coin/provisioning/qtci-windows-11_21H2-x86_64/08-libclang-v100-dyn.ps1 b/coin/provisioning/qtci-windows-11_21H2-x86_64/08-libclang-v100-dyn.ps1 deleted file mode 100644 index 82b91257..00000000 --- a/coin/provisioning/qtci-windows-11_21H2-x86_64/08-libclang-v100-dyn.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 64 vs2019 -. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 32 vs2019 diff --git a/coin/provisioning/qtci-windows-11_22H2-x86_64/08-libclang-dyn.ps1 b/coin/provisioning/qtci-windows-11_22H2-x86_64/08-libclang-dyn.ps1 new file mode 100644 index 00000000..1a69afb6 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-x86_64/08-libclang-dyn.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\libclang-dyn.ps1" 64 vs2019 +. "$PSScriptRoot\..\common\windows\libclang-dyn.ps1" 32 vs2019 diff --git a/coin/provisioning/qtci-windows-11_22H2-x86_64/08-libclang-v100-dyn.ps1 b/coin/provisioning/qtci-windows-11_22H2-x86_64/08-libclang-v100-dyn.ps1 deleted file mode 100644 index 82b91257..00000000 --- a/coin/provisioning/qtci-windows-11_22H2-x86_64/08-libclang-v100-dyn.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 64 vs2019 -. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 32 vs2019 diff --git a/coin/provisioning/qtci-windows-11_23H2-x86_64/08-libclang-dyn.ps1 b/coin/provisioning/qtci-windows-11_23H2-x86_64/08-libclang-dyn.ps1 new file mode 100644 index 00000000..1a69afb6 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-x86_64/08-libclang-dyn.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\libclang-dyn.ps1" 64 vs2019 +. "$PSScriptRoot\..\common\windows\libclang-dyn.ps1" 32 vs2019 diff --git a/coin/provisioning/qtci-windows-11_23H2-x86_64/08-libclang-v100-dyn.ps1 b/coin/provisioning/qtci-windows-11_23H2-x86_64/08-libclang-v100-dyn.ps1 deleted file mode 100644 index 82b91257..00000000 --- a/coin/provisioning/qtci-windows-11_23H2-x86_64/08-libclang-v100-dyn.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 64 vs2019 -. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 32 vs2019 diff --git a/coin/provisioning/qtci-windows-11_24H2-x86_64/08-libclang-dyn.ps1 b/coin/provisioning/qtci-windows-11_24H2-x86_64/08-libclang-dyn.ps1 new file mode 100644 index 00000000..1a69afb6 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_24H2-x86_64/08-libclang-dyn.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\libclang-dyn.ps1" 64 vs2019 +. "$PSScriptRoot\..\common\windows\libclang-dyn.ps1" 32 vs2019