Use install from libexec for QNX on Windows

It moved to libexec at some point in 6.5. Pick-to: 6.5 6.6 Change-Id: I1e80c0dd1dc253c08bf509aeb605b863a5d67e47 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Alexandru Croitor <[email protected]> Reviewed-by: Simo Fält <[email protected]>
qt · Aug 17, 2023 · c627900 · c627900
1 parent 44b4e57
commit c627900
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 30 deletions.
diff --git a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml
@@ -61,9 +61,14 @@ instructions:
  - condition: property
  property: host.os
  equals_value: Windows
- - condition: property
- property: target.osVersion
- not_in_values: [WebAssembly, Android_ANY]
+ - 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"
@@ -73,9 +78,14 @@ instructions:
  - condition: property
  property: host.os
  equals_value: Windows
- - condition: property
- property: target.osVersion
- not_in_values: [WebAssembly, Android_ANY]
+ - 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
@@ -123,9 +133,14 @@ instructions:
  - condition: property
  property: host.os
  equals_value: Windows
- - condition: property
- property: target.osVersion
- not_in_values: [WebAssembly, Android_ANY]
+ - 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}}target{{.Env.CI_PATH_SEP}}bin"
@@ -135,9 +150,14 @@ instructions:
  - condition: property
  property: host.os
  equals_value: Windows
- - condition: property
- property: target.osVersion
- not_in_values: [WebAssembly, Android_ANY]
+ - 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_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
@@ -47,9 +47,14 @@ instructions:
  - condition: property
  property: host.os
  equals_value: Windows
- - condition: property
- property: target.osVersion
- not_in_values: [WebAssembly, Android_ANY]
+ - 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"
@@ -59,9 +64,14 @@ instructions:
  - condition: property
  property: host.os
  equals_value: Windows
- - condition: property
- property: target.osVersion
- not_in_values: [WebAssembly, Android_ANY]
+ - 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
@@ -124,9 +134,14 @@ instructions:
  - condition: property
  property: host.os
  equals_value: Windows
- - condition: property
- property: target.osVersion
- not_in_values: [WebAssembly, Android_ANY]
+ - 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: "{{.Env.COIN_CMAKE_BUILD_DIR}}{{.Env.CI_PATH_SEP}}bin"
@@ -136,9 +151,14 @@ instructions:
  - condition: property
  property: host.os
  equals_value: Windows
- - condition: property
- property: target.osVersion
- not_in_values: [WebAssembly, Android_ANY]
+ - 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_target_install.yaml"
  - type: EnvironmentVariable
  variableName: DESTDIR

diff --git a/coin/instructions/cmake_qtbase_build_instructions.yaml b/coin/instructions/cmake_qtbase_build_instructions.yaml
@@ -41,9 +41,14 @@ instructions:
  - condition: property
  property: host.os
  equals_value: Windows
- - condition: property
- property: target.osVersion
- not_in_values: [WebAssembly, Android_ANY]
+ - 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: "{{.Env.COIN_CMAKE_BUILD_DIR}}{{.Env.CI_PATH_SEP}}bin"
@@ -53,9 +58,14 @@ instructions:
  - condition: property
  property: host.os
  equals_value: Windows
- - condition: property
- property: target.osVersion
- not_in_values: [WebAssembly, Android_ANY]
+ - 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