diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2022-03-31 09:40:43 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2022-05-06 11:41:19 +0300 |
| commit | b0582875f59c83f36daf57dd75c982034b9572c1 (patch) | |
| tree | 633304cacf715ff97057ba5c92072e620e504ec0 | |
| parent | 54a1327bd1fdaafa36c2c2324beafb0fad338f47 (diff) | |
COIN: Build IFW with 64bit MSVC2019
Task-number: QTIFW-2544
Change-Id: I0db216634bb15fae352f4fc2a1118e32a47e712f
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| -rw-r--r-- | coin/instructions/common_environment.yaml | 6 | ||||
| -rw-r--r-- | coin/instructions/make_instructions.yaml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index 3aa4c9769..7b6a06402 100644 --- a/coin/instructions/common_environment.yaml +++ b/coin/instructions/common_environment.yaml @@ -76,7 +76,7 @@ instructions: - type: PrependToEnvironmentVariable variableName: INCLUDE - variableValue: "C:\\Utils\\bzip2-1.0.8;C:\\Utils\\zlib-1.2.12;C:\\Utils\\xz-5.2.5\\src\\liblzma\\api;" + variableValue: "C:\\Utils\\bzip2-1.0.8-x64;C:\\Utils\\zlib-1.2.12-x64;C:\\Utils\\xz-5.2.5-x64\\src\\liblzma\\api;" enable_if: condition: property property: host.os @@ -84,11 +84,11 @@ instructions: - type: PrependToEnvironmentVariable variableName: LIB - variableValue: "C:\\Utils\\bzip2-1.0.8;C:\\Utils\\zlib-1.2.12;C:\\Utils\\xz-5.2.5\\windows\\vs2015\\ReleaseMT\\Win32\\liblzma;" + variableValue: "C:\\Utils\\bzip2-1.0.8-x64;C:\\Utils\\zlib-1.2.12-x64;C:\\Utils\\xz-5.2.5-x64\\windows\\vs2019\\ReleaseMT\\x64\\liblzma;" enable_if: condition: property property: target.compiler - equals_value: MSVC2015 + equals_value: MSVC2019 - type: Group instructions: diff --git a/coin/instructions/make_instructions.yaml b/coin/instructions/make_instructions.yaml index 55920ca18..c1a18dbcb 100644 --- a/coin/instructions/make_instructions.yaml +++ b/coin/instructions/make_instructions.yaml @@ -130,7 +130,7 @@ instructions: - type: ChangeDirectory directory: "{{.SourceDir}}" - type: ExecuteCommand - command: "{{.Env.PYTHON3_PATH}}\\python {{.SourceDir}}\\coin\\create_ifw_installer.py --src-dir {{.SourceDir}} --bld-dir {{.SourceDir}} --target-dir C:\\{{.SourceDir}}\\IfwInstaller --target-name QtInstallerFramework-windows-x86-4.4.0" + command: "{{.Env.PYTHON3_PATH}}\\python {{.SourceDir}}\\coin\\create_ifw_installer.py --src-dir {{.SourceDir}} --bld-dir {{.SourceDir}} --target-dir C:\\{{.SourceDir}}\\IfwInstaller --target-name QtInstallerFramework-windows-x64-4.4.0" maxTimeInSeconds: 1200 maxTimeBetweenOutput: 1200 userMessageOnFailure: "Failed to create ifw installer." @@ -151,8 +151,8 @@ instructions: equals_value: Windows - type: Rename - sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-windows-x86-4.4.0.exe" - targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-windows-x86-4.4.0.exe" + sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-windows-x64-4.4.0.exe" + targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-windows-x64-4.4.0.exe" userMessageOnFailure: "Failed to copy installer." enable_if: condition: property |