Move Some of the Private CMake Helper Scripts from `bin/` to `libexec/`

After this change, private CMake scripts are mostly live in
`libexec/`, except the `qt-cmake` which will stay in `bin/`.
This doesn't affect the Windows configuration.

- `qt-cmake` stays in `bin/`
- `qt-configure-module` moves into `libexec/`
- `qt-cmake-private` moves into `libexec/`
- `qt-cmake-private-install.cmake` moves into `libexec/`
- `qt-cmake-standalone-test` moves into `libexec/`
- `qt-internal-configure-test` moves into `libexec/`

In cases where `QT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS` is set to
ON, e.g., ANDROID, WASM, both Batch and Bash files will be generated
and placed in `bin/` and `libexec/` accordingly; in both cases,
qt-cmake and qt-cmake.bat will be in `bin/` anyway.

[ChangeLog][CMake] The private Qt CMake scripts, i.e.,
qt-configure-module, qt-cmake-private, qt-cmake-private-install.cmake,
qt-cmake-standalone-test and qt-internal-configure-test were moved
into $prefix/libexec on Unix platforms.

Fixes: QTBUG-107621
Change-Id: Ic4f4ec85f64d2ede0e208bca928959e30be906a6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

7 files changed, 188 insertions, 14 deletions

diff --git a/coin/instructions/call_host_install.yaml b/coin/instructions/call_host_install.yaml
index 4762763a1e..1d2bac610e 100644
--- a/coin/instructions/call_host_install.yaml
+++ b/coin/instructions/call_host_install.yaml
@@ -1,9 +1,24 @@
 type: Group
 instructions:
   - type: ExecuteCommand
-    command: "{{.Env.ENV_PREFIX}} cmake -DQT_BUILD_DIR={{.BuildDir}} -P {{.Env.COIN_CMAKE_INSTALL_SCRIPT_PATH}}/bin/qt-cmake-private-install.cmake"
+    command: "{{.Env.ENV_PREFIX}} cmake -DQT_BUILD_DIR={{.BuildDir}} -P {{.Env.COIN_CMAKE_BUILD_LIBEXEC_DIR}}{{.Env.CI_PATH_SEP}}qt-cmake-private-install.cmake"
     executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
     maxTimeInSeconds: 6000
     maxTimeBetweenOutput: 1200
+    enable_if:
+      condition: runtime
+      env_var: TESTED_MODULE_COIN
+      equals_value: qtbase
+    userMessageOnFailure: >
+      Failed to install package.
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake -DQT_BUILD_DIR={{.BuildDir}} -P {{.Env.COIN_CMAKE_INSTALL_LIBEXEC_DIR}}{{.Env.CI_PATH_SEP}}qt-cmake-private-install.cmake"
+    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    disable_if:
+      condition: runtime
+      env_var: TESTED_MODULE_COIN
+      equals_value: qtbase
     userMessageOnFailure: >
       Failed to install package.
diff --git a/coin/instructions/call_target_install.yaml b/coin/instructions/call_target_install.yaml
index 0f45240101..6684ec1062 100644
--- a/coin/instructions/call_target_install.yaml
+++ b/coin/instructions/call_target_install.yaml
@@ -1,9 +1,24 @@
 type: Group
 instructions:
   - type: ExecuteCommand
-    command: "{{.Env.TARGET_ENV_PREFIX}} cmake -DQT_BUILD_DIR={{.BuildDir}} -P {{.Env.COIN_CMAKE_INSTALL_SCRIPT_PATH}}/bin/qt-cmake-private-install.cmake"
+    command: "{{.Env.TARGET_ENV_PREFIX}} cmake -DQT_BUILD_DIR={{.BuildDir}} -P {{.Env.COIN_CMAKE_BUILD_LIBEXEC_DIR}}{{.Env.CI_PATH_SEP}}qt-cmake-private-install.cmake"
     executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
     maxTimeInSeconds: 6000
     maxTimeBetweenOutput: 1200
+    enable_if:
+      condition: runtime
+      env_var: TESTED_MODULE_COIN
+      equals_value: qtbase
+    userMessageOnFailure: >
+      Failed to install package.
+  - type: ExecuteCommand
+    command: "{{.Env.TARGET_ENV_PREFIX}} cmake -DQT_BUILD_DIR={{.BuildDir}} -P {{.Env.COIN_CMAKE_INSTALL_LIBEXEC_DIR}}{{.Env.CI_PATH_SEP}}qt-cmake-private-install.cmake"
+    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    disable_if:
+      condition: runtime
+      env_var: TESTED_MODULE_COIN
+      equals_value: qtbase
     userMessageOnFailure: >
       Failed to install package.
diff --git a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml
index 2cf98b5ea2..4541088285 100644
--- a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml
+++ b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml
@@ -50,8 +50,32 @@ instructions:
         userMessageOnFailure: >
           Failed to build sources.
       - type: EnvironmentVariable
-        variableName: COIN_CMAKE_INSTALL_SCRIPT_PATH
-        variableValue: "{{.InstallDir}}/host"
+        variableName: COIN_CMAKE_INSTALL_DIR
+        variableValue: "{{.InstallDir}}{{.Env.CI_PATH_SEP}}host"
+      - type: EnvironmentVariable
+        variableName: COIN_CMAKE_INSTALL_LIBEXEC_DIR
+        variableValue: "{{.Env.COIN_CMAKE_INSTALL_DIR}}{{.Env.CI_PATH_SEP}}libexec"
+        disable_if:
+          condition: and
+          conditions:
+            - condition: property
+              property: host.os
+              equals_value: Windows
+            - condition: property
+              property: target.osVersion
+              not_in_values: [WebAssembly, Android_ANY]
+      - type: EnvironmentVariable
+        variableName: COIN_CMAKE_INSTALL_LIBEXEC_DIR
+        variableValue: "{{.InstallDir}}{{.Env.CI_PATH_SEP}}host{{.Env.CI_PATH_SEP}}bin"
+        enable_if:
+          condition: and
+          conditions:
+            - condition: property
+              property: host.os
+              equals_value: Windows
+            - condition: property
+              property: target.osVersion
+              not_in_values: [WebAssembly, Android_ANY]
       - !include "{{qt/qtbase}}/call_host_install.yaml"
       - type: EnvironmentVariable
         variableName: DESTDIR
@@ -88,8 +112,32 @@ instructions:
     userMessageOnFailure: >
       Failed to build sources.
   - type: EnvironmentVariable
-    variableName: COIN_CMAKE_INSTALL_SCRIPT_PATH
-    variableValue: "{{.InstallDir}}/target"
+    variableName: COIN_CMAKE_INSTALL_DIR
+    variableValue: "{{.InstallDir}}{{.Env.CI_PATH_SEP}}target"
+  - type: EnvironmentVariable
+    variableName: COIN_CMAKE_INSTALL_LIBEXEC_DIR
+    variableValue: "{{.Env.COIN_CMAKE_INSTALL_DIR}}{{.Env.CI_PATH_SEP}}libexec"
+    disable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Windows
+        - condition: property
+          property: target.osVersion
+          not_in_values: [WebAssembly, Android_ANY]
+  - type: EnvironmentVariable
+    variableName: COIN_CMAKE_INSTALL_LIBEXEC_DIR
+    variableValue: "{{.InstallDir}}{{.Env.CI_PATH_SEP}}target{{.Env.CI_PATH_SEP}}bin"
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Windows
+        - condition: property
+          property: target.osVersion
+          not_in_values: [WebAssembly, Android_ANY]
   - !include "{{qt/qtbase}}/call_target_install.yaml"
   - type: EnvironmentVariable
     variableName: DESTDIR
diff --git a/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml b/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml
index 9850f3c60a..4a1ed61328 100644
--- a/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml
+++ b/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml
@@ -36,8 +36,32 @@ instructions:
         userMessageOnFailure: >
           Failed to build sources.
       - type: EnvironmentVariable
-        variableName: COIN_CMAKE_INSTALL_SCRIPT_PATH
+        variableName: COIN_CMAKE_BUILD_DIR
         variableValue: "{{.BuildDir}}"
+      - type: EnvironmentVariable
+        variableName: COIN_CMAKE_BUILD_LIBEXEC_DIR
+        variableValue: "{{.BuildDir}}{{.Env.CI_PATH_SEP}}libexec"
+        disable_if:
+          condition: and
+          conditions:
+            - condition: property
+              property: host.os
+              equals_value: Windows
+            - condition: property
+              property: target.osVersion
+              not_in_values: [WebAssembly, Android_ANY]
+      - type: EnvironmentVariable
+        variableName: COIN_CMAKE_BUILD_LIBEXEC_DIR
+        variableValue: "{{.BuildDir}}{{.Env.CI_PATH_SEP}}bin"
+        enable_if:
+          condition: and
+          conditions:
+            - condition: property
+              property: host.os
+              equals_value: Windows
+            - condition: property
+              property: target.osVersion
+              not_in_values: [WebAssembly, Android_ANY]
       - !include "{{qt/qtbase}}/call_host_install.yaml"
       - type: EnvironmentVariable
         variableName: DESTDIR
@@ -89,8 +113,32 @@ instructions:
     userMessageOnFailure: >
       Failed to build sources.
   - type: EnvironmentVariable
-    variableName: COIN_CMAKE_INSTALL_SCRIPT_PATH
+    variableName: COIN_CMAKE_BUILD_DIR
     variableValue: "{{.BuildDir}}"
+  - type: EnvironmentVariable
+    variableName: COIN_CMAKE_BUILD_LIBEXEC_DIR
+    variableValue: "{{.Env.COIN_CMAKE_BUILD_DIR}}{{.Env.CI_PATH_SEP}}libexec"
+    disable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Windows
+        - condition: property
+          property: target.osVersion
+          not_in_values: [WebAssembly, Android_ANY]
+  - type: EnvironmentVariable
+    variableName: COIN_CMAKE_BUILD_LIBEXEC_DIR
+    variableValue: "{{.Env.COIN_CMAKE_BUILD_DIR}}{{.Env.CI_PATH_SEP}}bin"
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Windows
+        - condition: property
+          property: target.osVersion
+          not_in_values: [WebAssembly, Android_ANY]
   - !include "{{qt/qtbase}}/call_target_install.yaml"
   - type: EnvironmentVariable
     variableName: DESTDIR
diff --git a/coin/instructions/cmake_module_build_instructions.yaml b/coin/instructions/cmake_module_build_instructions.yaml
index 80dc075eb5..f83d8711e8 100644
--- a/coin/instructions/cmake_module_build_instructions.yaml
+++ b/coin/instructions/cmake_module_build_instructions.yaml
@@ -43,8 +43,32 @@ instructions:
     userMessageOnFailure: >
       Failed to build sources.
   - type: EnvironmentVariable
-    variableName: COIN_CMAKE_INSTALL_SCRIPT_PATH
+    variableName: COIN_CMAKE_INSTALL_DIR
     variableValue: "{{.InstallDir}}"
+  - type: EnvironmentVariable
+    variableName: COIN_CMAKE_INSTALL_LIBEXEC_DIR
+    variableValue: "{{.Env.COIN_CMAKE_INSTALL_DIR}}{{.Env.CI_PATH_SEP}}libexec"
+    disable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Windows
+        - condition: property
+          property: target.osVersion
+          not_in_values: [WebAssembly, Android_ANY]
+  - type: EnvironmentVariable
+    variableName: COIN_CMAKE_INSTALL_LIBEXEC_DIR
+    variableValue: "{{.Env.COIN_CMAKE_INSTALL_DIR}}{{.Env.CI_PATH_SEP}}bin"
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Windows
+        - condition: property
+          property: target.osVersion
+          not_in_values: [WebAssembly, Android_ANY]
   - !include "{{qt/qtbase}}/call_host_install.yaml"
   - type: EnvironmentVariable
     variableName: DESTDIR
diff --git a/coin/instructions/cmake_qtbase_build_instructions.yaml b/coin/instructions/cmake_qtbase_build_instructions.yaml
index a17077408e..31766865a7 100644
--- a/coin/instructions/cmake_qtbase_build_instructions.yaml
+++ b/coin/instructions/cmake_qtbase_build_instructions.yaml
@@ -30,8 +30,32 @@ instructions:
     userMessageOnFailure: >
       Failed to build sources.
   - type: EnvironmentVariable
-    variableName: COIN_CMAKE_INSTALL_SCRIPT_PATH
+    variableName: COIN_CMAKE_BUILD_DIR
     variableValue: "{{.BuildDir}}"
+  - type: EnvironmentVariable
+    variableName: COIN_CMAKE_BUILD_LIBEXEC_DIR
+    variableValue: "{{.Env.COIN_CMAKE_BUILD_DIR}}{{.Env.CI_PATH_SEP}}libexec"
+    disable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Windows
+        - condition: property
+          property: target.osVersion
+          not_in_values: [WebAssembly, Android_ANY]
+  - type: EnvironmentVariable
+    variableName: COIN_CMAKE_BUILD_LIBEXEC_DIR
+    variableValue: "{{.Env.COIN_CMAKE_BUILD_DIR}}{{.Env.CI_PATH_SEP}}bin"
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Windows
+        - condition: property
+          property: target.osVersion
+          not_in_values: [WebAssembly, Android_ANY]
   - !include "{{qt/qtbase}}/call_host_install.yaml"
   - type: EnvironmentVariable
     variableName: DESTDIR
diff --git a/coin/instructions/prepare_configure_module_executable.yaml b/coin/instructions/prepare_configure_module_executable.yaml
index 055870e8a6..47a0e76aa2 100644
--- a/coin/instructions/prepare_configure_module_executable.yaml
+++ b/coin/instructions/prepare_configure_module_executable.yaml
@@ -12,14 +12,14 @@ instructions:
     instructions:
       - type: EnvironmentVariable
         variableName: CONFIGURE_EXECUTABLE
-        variableValue: "{{.InstallDir}}{{.Env.INSTALL_DIR_SUFFIX}}/bin/qt-configure-module"
+        variableValue: "{{.InstallDir}}{{.Env.INSTALL_DIR_SUFFIX}}{{.Env.CI_PATH_SEP}}libexec{{.Env.CI_PATH_SEP}}qt-configure-module"
         disable_if:
           condition: property
           property: host.os
           equals_value: Windows
       - type: EnvironmentVariable
         variableName: CONFIGURE_EXECUTABLE
-        variableValue: "{{.InstallDir}}{{.Env.INSTALL_DIR_SUFFIX}}\\bin\\qt-configure-module.bat"
+        variableValue: "{{.InstallDir}}{{.Env.INSTALL_DIR_SUFFIX}}{{.Env.CI_PATH_SEP}}bin{{.Env.CI_PATH_SEP}}qt-configure-module.bat"
         enable_if:
           condition: property
           property: host.os
@@ -32,14 +32,14 @@ instructions:
     instructions:
       - type: EnvironmentVariable
         variableName: CONFIGURE_EXECUTABLE
-        variableValue: "{{.InstallDir}}{{.Env.INSTALL_DIR_SUFFIX}}/bin/qt-cmake-private"
+        variableValue: "{{.InstallDir}}{{.Env.INSTALL_DIR_SUFFIX}}{{.Env.CI_PATH_SEP}}libexec{{.Env.CI_PATH_SEP}}qt-cmake-private"
         disable_if:
           condition: property
           property: host.os
           equals_value: Windows
       - type: EnvironmentVariable
         variableName: CONFIGURE_EXECUTABLE
-        variableValue: "{{.InstallDir}}{{.Env.INSTALL_DIR_SUFFIX}}\\bin\\qt-cmake-private.bat"
+        variableValue: "{{.InstallDir}}{{.Env.INSTALL_DIR_SUFFIX}}{{.Env.CI_PATH_SEP}}bin{{.Env.CI_PATH_SEP}}qt-cmake-private.bat"
         enable_if:
           condition: property
           property: host.os