diff --git a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml index a62ab0f48e5..23833cd3fa6 100644 --- 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: "" diff --git a/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml b/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml index 84dc535b618..e85dada42e8 100644 --- 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