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>

cmake/QtWrapperScriptHelpers.cmake

@@ -50,10 +50,10 @@ function(qt_internal_create_wrapper_scripts)
     set(__qt_cmake_extra "-G\"${CMAKE_GENERATOR}\"")
     if(generate_unix)
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake.in"
-            "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake-private" @ONLY
+            "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/qt-cmake-private" @ONLY
             NEWLINE_STYLE LF)
-        qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-cmake-private"
+        qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/qt-cmake-private"
-               DESTINATION "${INSTALL_BINDIR}")
+               DESTINATION "${INSTALL_LIBEXECDIR}")
     endif()
     if(generate_non_unix)
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-cmake.bat.in"
@@ -76,10 +76,10 @@ function(qt_internal_create_wrapper_scripts)
         __relative_path_to_cmake_scripts_dir)
     if(generate_unix)
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-configure-module.in"
-            "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-configure-module" @ONLY
+            "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/qt-configure-module" @ONLY
             NEWLINE_STYLE LF)
-        qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/qt-configure-module"
+        qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/qt-configure-module"
-            DESTINATION "${INSTALL_BINDIR}")
+            DESTINATION "${INSTALL_LIBEXECDIR}")
     endif()
     if(generate_non_unix)
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/qt-configure-module.bat.in"
@@ -140,7 +140,7 @@ function(qt_internal_create_wrapper_scripts)
             "${QT_BUILD_DIR}/${__qt_cmake_standalone_test_bin_path}"
             NEWLINE_STYLE LF)
         qt_install(PROGRAMS "${QT_BUILD_DIR}/${__qt_cmake_standalone_test_bin_path}"
-                   DESTINATION "${INSTALL_BINDIR}")
+                   DESTINATION "${INSTALL_LIBEXECDIR}")
     endif()
     if(generate_non_unix)
         set(__qt_cmake_standalone_test_os_prelude "@echo off")
@@ -167,9 +167,9 @@ function(qt_internal_create_wrapper_scripts)
         set(__qt_configured_configs "${CMAKE_BUILD_TYPE}")
     endif()
     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/${__qt_cmake_install_script_name}.in"
-                   "${QT_BUILD_DIR}/${INSTALL_BINDIR}/${__qt_cmake_install_script_name}" @ONLY)
+                   "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/${__qt_cmake_install_script_name}" @ONLY)
-    qt_install(FILES "${QT_BUILD_DIR}/${INSTALL_BINDIR}/${__qt_cmake_install_script_name}"
+    qt_install(FILES "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/${__qt_cmake_install_script_name}"
-               DESTINATION "${INSTALL_BINDIR}")
+               DESTINATION "${INSTALL_LIBEXECDIR}")
 
     qt_internal_create_qt_configure_tests_wrapper_script()
     qt_internal_install_android_helper_scripts()
@@ -213,11 +213,11 @@ function(qt_internal_create_qt_configure_tests_wrapper_script)
     endif()
     if(generate_non_unix)
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/libexec/${script_name}.bat.in"
-            "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/${script_name}.bat" @ONLY
+            "${QT_BUILD_DIR}/${INSTALL_BINDIR}/${script_name}.bat" @ONLY
             NEWLINE_STYLE CRLF)
 
-        qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_LIBEXECDIR}/${script_name}.bat"
+        qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/${script_name}.bat"
-                   DESTINATION "${INSTALL_LIBEXECDIR}")
+                   DESTINATION "${INSTALL_BINDIR}")
     endif()
 endfunction()
 

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.

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.

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
+        variableName: COIN_CMAKE_INSTALL_DIR
-        variableValue: "{{.InstallDir}}/host"
+        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
+    variableName: COIN_CMAKE_INSTALL_DIR
-    variableValue: "{{.InstallDir}}/target"
+    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

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

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

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

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

tests/auto/cmake/CMakeLists.txt

@@ -275,10 +275,11 @@ if(QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX)
 elseif(QT6_INSTALL_PREFIX)
     set(qt_install_prefix "${QT6_INSTALL_PREFIX}")
 endif()
-if(INSTALL_BINDIR)
+
-    set(qt_install_bin_dir "${INSTALL_BINDIR}")
+if(INSTALL_LIBEXECDIR)
-elseif(QT6_INSTALL_BINS)
+    set(qt_install_libexec_dir "${INSTALL_LIBEXECDIR}")
-    set(qt_install_bin_dir "${QT6_INSTALL_BINS}")
+elseif(QT6_INSTALL_LIBEXECS)
+    set(qt_install_libexec_dir "${QT6_INSTALL_LIBEXECS}")
 endif()
 
 # Test building and installing a few dummy Qt modules and plugins.
@@ -289,7 +290,7 @@ if(is_qt_build_platform)
             BINARY "${CMAKE_COMMAND}"
             BINARY_ARGS
             "-DQT_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}/mockplugins"
-            -P "${qt_install_prefix}/${qt_install_bin_dir}/qt-cmake-private-install.cmake"
+            -P "${qt_install_prefix}/${qt_install_libexec_dir}/qt-cmake-private-install.cmake"
         )
     endif()
     _qt_internal_test_expect_pass(mockplugins ${mockplugins_test_args})