coin: Remove dead code that used to build host Qt in a cross-build

We don't build a host Qt during a cross-compilation build for a few years now. Instead we reuse the prebuilt host from the platform dependencies. This was left over to allow gradual porting to the new way of using platform dependencies, which is now long done. Remove the code to ease maintenance. Amends 684fea131433dcbb6d24feaf261404d1d9cf69b4 Pick-to: 6.8 Change-Id: I9988da6f33f9d9b98d304316317d39c3dfb7c633 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2024-10-02 17:58:55 +02:00 · 2024-10-02 17:58:55 +02:00 · bb3ce6989e
commit bb3ce6989e
parent a6302d8e5e
2 changed files with 0 additions and 157 deletions
--- a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml
+++ b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml
@ -22,79 +22,6 @@ instructions:
    directory: "{{.BuildDir}}/build"
  - type: MakeDirectory
    directory: target
-  - type: Group
-    instructions:
-      - type: MakeDirectory
-        directory: host
-      - type: SetBuildDirectory
-        directory: "{{.SourceDir}}/build/host"
-      - type: ChangeDirectory
-        directory: "{{.BuildDir}}"
-
-      - type: EnvironmentVariable
-        variableName: COIN_CONFIGURE_ARGS
-        variableValue: "{{.Env.NON_QTBASE_CONFIGURE_ARGS}}"
-      - type: EnvironmentVariable
-        variableName: COIN_CMAKE_ARGS
-        variableValue: "{{.Env.NON_QTBASE_CMAKE_ARGS}} {{.Env.COMMON_NON_QTBASE_CMAKE_ARGS}}"
-      - type: EnvironmentVariable
-        variableName: CONFIGURE_ENV_PREFIX
-        variableValue: "{{.Env.ENV_PREFIX}}"
-      - !include "{{qt/qtbase}}/prepare_install_dir_suffix_host.yaml"
-      - !include "{{qt/qtbase}}/call_configure_module.yaml"
-
-      - type: ExecuteCommand
-        command: "{{.Env.CONFIGURE_ENV_PREFIX}} cmake --build . --parallel -v"
-        maxTimeInSeconds: "{{.Env.CMAKE_BUILD_TIMEOUT}}"
-        maxTimeBetweenOutput: "{{.Env.CMAKE_BUILD_OUTPUT_TIMEOUT}}"
-        userMessageOnFailure: >
-          Failed to build sources.
-      - type: EnvironmentVariable
-        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: and
-              conditions:
-                - condition: property
-                  property: target.os
-                  not_equals_value: QNX
-                - 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: and
-              conditions:
-                - condition: property
-                  property: target.os
-                  not_equals_value: QNX
-                - condition: property
-                  property: target.osVersion
-                  not_in_values: [WebAssembly, Android_ANY]
-      - !include "{{qt/qtbase}}/call_host_install.yaml"
-      - type: EnvironmentVariable
-        variableName: DESTDIR
-        variableValue: "{{.InstallRoot}}"
-      - !include "{{qt/qtbase}}/call_host_install.yaml"
-    enable_if:
-      condition: property
-      property: platformDependency
-      equals_value: null
  - type: EnvironmentVariable
    variableName: DESTDIR
    variableValue: ""
--- a/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml
+++ b/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml
@ -8,79 +8,6 @@ instructions:
    directory: "{{.BuildDir}}/build"
  - type: MakeDirectory
    directory: target
-  - type: Group
-    instructions:
-      - type: MakeDirectory
-        directory: host
-      - type: SetBuildDirectory
-        directory: "{{.SourceDir}}/build/host"
-      - type: ChangeDirectory
-        directory: "{{.BuildDir}}"
-
-      - type: EnvironmentVariable
-        variableName: COIN_CONFIGURE_ARGS
-        variableValue: "{{.Env.CONFIGURE_ARGS}}"
-      - type: EnvironmentVariable
-        variableName: COIN_CMAKE_ARGS
-        # Use unix separators even on Windows, to avoid escaping issues the in configure script.
-        variableValue: "{{.Env.CMAKE_ARGS}} {{.Env.COMMON_CMAKE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{unixPathSeparators .InstallDir}}/host"
-      - type: EnvironmentVariable
-        variableName: CONFIGURE_ENV_PREFIX
-        variableValue: "{{.Env.ENV_PREFIX}}"
-      - !include "{{qt/qtbase}}/call_configure_qtbase.yaml"
-
-      - type: ExecuteCommand
-        command: "{{.Env.CONFIGURE_ENV_PREFIX}} cmake --build . --parallel -v"
-        maxTimeInSeconds: 6000
-        maxTimeBetweenOutput: 4800
-        userMessageOnFailure: >
-          Failed to build sources.
-      - type: EnvironmentVariable
-        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: and
-              conditions:
-                - condition: property
-                  property: target.os
-                  not_equals_value: QNX
-                - 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: and
-              conditions:
-                - condition: property
-                  property: target.os
-                  not_equals_value: QNX
-                - condition: property
-                  property: target.osVersion
-                  not_in_values: [WebAssembly, Android_ANY]
-      - !include "{{qt/qtbase}}/call_host_install.yaml"
-      - type: EnvironmentVariable
-        variableName: DESTDIR
-        variableValue: "{{.InstallRoot}}"
-      - !include "{{qt/qtbase}}/call_host_install.yaml"
-    enable_if:
-      condition: property
-      property: platformDependency
-      equals_value: null
  - type: EnvironmentVariable
    variableName: DESTDIR
    variableValue: ""
@ -92,17 +19,6 @@ instructions:
  - type: AppendToEnvironmentVariable
    variableName: TARGET_CMAKE_ARGS
    variableValue: " -DQT_HOST_PATH={{.AgentWorkingDir}}/install"
-    disable_if:
-      condition: property
-      property: platformDependency
-      equals_value: null
-  - type: AppendToEnvironmentVariable
-    variableName: TARGET_CMAKE_ARGS
-    variableValue: " -DQT_HOST_PATH={{.InstallDir}}/host"
-    enable_if:
-      condition: property
-      property: platformDependency
-      equals_value: null

  - type: EnvironmentVariable
    variableName: COIN_CONFIGURE_ARGS