Remove double negations
As now the configuration syntax supports enable_if, we can get rid of double negations. Change-Id: I5b8b695d4f7a72cd1a836b9b427096fb4e3b85a7 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
This commit is contained in:
parent
bf0ee8c4e8
commit
d59fadb2da
@ -8,10 +8,10 @@ windows_specific_instrucitons:
|
|||||||
- &export_target_architecture_and_sdk
|
- &export_target_architecture_and_sdk
|
||||||
# Export TARGET_ARCHITECTURE and WINDOWS_SDK_VERSION for MSVC cross compilation
|
# Export TARGET_ARCHITECTURE and WINDOWS_SDK_VERSION for MSVC cross compilation
|
||||||
type: Group
|
type: Group
|
||||||
disable_if:
|
enable_if:
|
||||||
condition: property
|
condition: property
|
||||||
property: host.os
|
property: host.os
|
||||||
not_equals_value: Windows
|
equals_value: Windows
|
||||||
instructions:
|
instructions:
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: TARGET_ARCHITECTURE
|
variableName: TARGET_ARCHITECTURE
|
||||||
@ -23,31 +23,31 @@ windows_specific_instrucitons:
|
|||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: TARGET_ARCHITECTURE
|
variableName: TARGET_ARCHITECTURE
|
||||||
variableValue: amd64_x86
|
variableValue: amd64_x86
|
||||||
disable_if:
|
enable_if:
|
||||||
condition: and
|
condition: and
|
||||||
conditions:
|
conditions:
|
||||||
- condition: property
|
- condition: property
|
||||||
property: target.arch
|
property: target.arch
|
||||||
not_equals_property: X86
|
equals_property: X86
|
||||||
- condition: property
|
- condition: property
|
||||||
property: host.arch
|
property: host.arch
|
||||||
not_equals_property: X86_64
|
equals_property: X86_64
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
# HACK. Overwrite TARGET_ARCHITECTURE as we do not use standard MSVC cross
|
# HACK. Overwrite TARGET_ARCHITECTURE as we do not use standard MSVC cross
|
||||||
# compilation targets here. The target architecture will be detected by Qt.
|
# compilation targets here. The target architecture will be detected by Qt.
|
||||||
variableName: TARGET_ARCHITECTURE
|
variableName: TARGET_ARCHITECTURE
|
||||||
variableValue: x86
|
variableValue: x86
|
||||||
disable_if:
|
enable_if:
|
||||||
condition: property
|
condition: property
|
||||||
property: target.os
|
property: target.os
|
||||||
not_in_values: ["WINRT", "WINPHONE", "WINCE"]
|
in_values: ["WINRT", "WINPHONE", "WINCE"]
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: WINDOWS_SDK_VERSION
|
variableName: WINDOWS_SDK_VERSION
|
||||||
variableValue: "10.0.14393.0"
|
variableValue: "10.0.14393.0"
|
||||||
disable_if:
|
enable_if:
|
||||||
condition: property
|
condition: property
|
||||||
property: target.os
|
property: target.os
|
||||||
not_equals_value: WINRT
|
equals_value: WINRT
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: WINDOWS_SDK_VERSION
|
variableName: WINDOWS_SDK_VERSION
|
||||||
variableValue: ""
|
variableValue: ""
|
||||||
@ -62,10 +62,10 @@ windows_specific_instrucitons:
|
|||||||
# TODO cleanup, that step could be removed if we have same installation paths or we read the path from registry
|
# TODO cleanup, that step could be removed if we have same installation paths or we read the path from registry
|
||||||
# or we use %ProgramFiles(x86)%.
|
# or we use %ProgramFiles(x86)%.
|
||||||
type: Group
|
type: Group
|
||||||
disable_if:
|
enable_if:
|
||||||
condition: property
|
condition: property
|
||||||
property: host.os
|
property: host.os
|
||||||
not_equals_value: Windows
|
equals_value: Windows
|
||||||
instructions:
|
instructions:
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: PROGRAM_FILES_PATH
|
variableName: PROGRAM_FILES_PATH
|
||||||
@ -87,52 +87,52 @@ windows_specific_instrucitons:
|
|||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: VC_SCRIPT
|
variableName: VC_SCRIPT
|
||||||
variableValue: "%VS90COMNTOOLS%\\vsvars32.bat"
|
variableValue: "%VS90COMNTOOLS%\\vsvars32.bat"
|
||||||
disable_if:
|
enable_if:
|
||||||
condition: property
|
condition: property
|
||||||
property: host.compiler
|
property: host.compiler
|
||||||
not_equals_value: MSVC2008
|
equals_value: MSVC2008
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: VC_SCRIPT
|
variableName: VC_SCRIPT
|
||||||
variableValue: "%VS100COMNTOOLS%\\vsvars32.bat"
|
variableValue: "%VS100COMNTOOLS%\\vsvars32.bat"
|
||||||
disable_if:
|
enable_if:
|
||||||
condition: property
|
condition: property
|
||||||
property: host.compiler
|
property: host.compiler
|
||||||
not_equals_value: MSVC2010
|
equals_value: MSVC2010
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: VC_SCRIPT
|
variableName: VC_SCRIPT
|
||||||
variableValue: "{{.Env.PROGRAM_FILES_PATH}}\\Microsoft Visual Studio 11.0\\VC\\vcvarsall.bat"
|
variableValue: "{{.Env.PROGRAM_FILES_PATH}}\\Microsoft Visual Studio 11.0\\VC\\vcvarsall.bat"
|
||||||
disable_if:
|
enable_if:
|
||||||
condition: property
|
condition: property
|
||||||
property: host.compiler
|
property: host.compiler
|
||||||
not_equals_value: MSVC2012
|
equals_value: MSVC2012
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: VC_SCRIPT
|
variableName: VC_SCRIPT
|
||||||
variableValue: "{{.Env.PROGRAM_FILES_PATH}}\\Microsoft Visual Studio 12.0\\VC\\vcvarsall.bat"
|
variableValue: "{{.Env.PROGRAM_FILES_PATH}}\\Microsoft Visual Studio 12.0\\VC\\vcvarsall.bat"
|
||||||
disable_if:
|
enable_if:
|
||||||
condition: property
|
condition: property
|
||||||
property: host.compiler
|
property: host.compiler
|
||||||
not_equals_value: MSVC2013
|
equals_value: MSVC2013
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: VC_SCRIPT
|
variableName: VC_SCRIPT
|
||||||
variableValue: "{{.Env.PROGRAM_FILES_PATH}}\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat"
|
variableValue: "{{.Env.PROGRAM_FILES_PATH}}\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat"
|
||||||
disable_if:
|
enable_if:
|
||||||
condition: property
|
condition: property
|
||||||
property: host.compiler
|
property: host.compiler
|
||||||
not_equals_value: MSVC2015
|
equals_value: MSVC2015
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: VC_SCRIPT
|
variableName: VC_SCRIPT
|
||||||
variableValue: "{{.Env.PROGRAM_FILES_PATH}}\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvarsall.bat"
|
variableValue: "{{.Env.PROGRAM_FILES_PATH}}\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvarsall.bat"
|
||||||
disable_if:
|
enable_if:
|
||||||
condition: property
|
condition: property
|
||||||
property: host.compiler
|
property: host.compiler
|
||||||
not_equals_value: MSVC2017
|
equals_value: MSVC2017
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: VC_SCRIPT
|
variableName: VC_SCRIPT
|
||||||
variableValue: "{{.Env.PROGRAM_FILES_PATH}}\\Microsoft Visual Studio\\2019\\Professional\\VC\\Auxiliary\\Build\\vcvarsall.bat"
|
variableValue: "{{.Env.PROGRAM_FILES_PATH}}\\Microsoft Visual Studio\\2019\\Professional\\VC\\Auxiliary\\Build\\vcvarsall.bat"
|
||||||
disable_if:
|
enable_if:
|
||||||
condition: property
|
condition: property
|
||||||
property: host.compiler
|
property: host.compiler
|
||||||
not_equals_value: MSVC2019
|
equals_value: MSVC2019
|
||||||
|
|
||||||
build_instructions:
|
build_instructions:
|
||||||
- type: MakeDirectory
|
- type: MakeDirectory
|
||||||
@ -150,17 +150,17 @@ build_instructions:
|
|||||||
fileMode: 420
|
fileMode: 420
|
||||||
maxTimeInSeconds: 20
|
maxTimeInSeconds: 20
|
||||||
maxTimeBetweenOutput: 20
|
maxTimeBetweenOutput: 20
|
||||||
disable_if:
|
enable_if:
|
||||||
condition: property
|
condition: property
|
||||||
property: host.os
|
property: host.os
|
||||||
not_equals_value: Windows
|
equals_value: Windows
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: ENV_PREFIX
|
variableName: ENV_PREFIX
|
||||||
variableValue: "c:\\users\\qt\\prefix.bat"
|
variableValue: "c:\\users\\qt\\prefix.bat"
|
||||||
disable_if:
|
enable_if:
|
||||||
condition: property
|
condition: property
|
||||||
property: host.os
|
property: host.os
|
||||||
not_equals_value: Windows
|
equals_value: Windows
|
||||||
- type: EnvironmentVariable
|
- type: EnvironmentVariable
|
||||||
variableName: ENV_PREFIX
|
variableName: ENV_PREFIX
|
||||||
variableValue: ""
|
variableValue: ""
|
||||||
@ -179,10 +179,10 @@ build_instructions:
|
|||||||
variableValue: "{{.InstallRoot}}"
|
variableValue: "{{.InstallRoot}}"
|
||||||
- type: ExecuteCommand # TODO: remove me, just debuging
|
- type: ExecuteCommand # TODO: remove me, just debuging
|
||||||
command: cmd.exe /c type {{.BuildDir}}\\CMakeCache.txt
|
command: cmd.exe /c type {{.BuildDir}}\\CMakeCache.txt
|
||||||
disable_if:
|
enable_if:
|
||||||
condition: property
|
condition: property
|
||||||
property: host.os
|
property: host.os
|
||||||
not_equals_value: Windows
|
equals_value: Windows
|
||||||
maxTimeInSeconds: 60
|
maxTimeInSeconds: 60
|
||||||
userMessageOnFailure: Could not print the file cmake config file. This should not be possible.
|
userMessageOnFailure: Could not print the file cmake config file. This should not be possible.
|
||||||
- type: ExecuteCommand
|
- type: ExecuteCommand
|
||||||
@ -192,10 +192,10 @@ build_instructions:
|
|||||||
userMessageOnFailure: >
|
userMessageOnFailure: >
|
||||||
Failed to build sources. In the current state bug can be everywhere. Contact Liang first.
|
Failed to build sources. In the current state bug can be everywhere. Contact Liang first.
|
||||||
- type: SignPackage
|
- type: SignPackage
|
||||||
disable_if:
|
enable_if:
|
||||||
condition: property
|
condition: property
|
||||||
property: host.os
|
property: host.os
|
||||||
not_equals_value: Windows
|
equals_value: Windows
|
||||||
directory: "{{.InstallRoot}}/{{.AgentWorkingDir}}"
|
directory: "{{.InstallRoot}}/{{.AgentWorkingDir}}"
|
||||||
maxTimeInSeconds: 1200
|
maxTimeInSeconds: 1200
|
||||||
maxTimeBetweenOutput: 1200
|
maxTimeBetweenOutput: 1200
|
||||||
|
Loading…
x
Reference in New Issue
Block a user