summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2016-11-22 10:45:09 +0100
committerSimon Hausmann <simon.hausmann@qt.io>2017-02-03 05:46:51 +0000
commit32b5e271a8998d25130c1cca4de7df93de9911e4 (patch)
tree5d100ff93b25d37955d399ddc98f10bc58d0ea08
parent713188e4af7d99e4b04b5270b13fbb3b786d4edc (diff)
Update jom to 1.1.2
The most important changes that affect the CI are: - Fixed bogus path in error message for failed targets. - Fixed error "JobClient destroyed while still acquiring." that could be yielded for failed builds. - Fixed /k option (QTCREATORBUG-17131). - Added the special .NOTPARALLEL target that disables parallel build for the containing makefile. (This one is needed to build QtWebEngine in debug-and-release properly.) - Introduced the JOMFLAGS environment variable. This is a MAKEFLAGS pendant. JOMFLAGS is useful to set up separate flags for nmake and jom. Change-Id: Icb2462d06b000a3fe29e1e9290b294cb1e900409 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--coin/provisioning/common/jom.ps16
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/provisioning/common/jom.ps1 b/coin/provisioning/common/jom.ps1
index ef012b64..c1e2cbf7 100644
--- a/coin/provisioning/common/jom.ps1
+++ b/coin/provisioning/common/jom.ps1
@@ -1,9 +1,9 @@
. "$PSScriptRoot\helpers.ps1"
-$zip = "c:\users\qt\downloads\jom_1_1_0.zip"
+$zip = "c:\users\qt\downloads\jom_1_1_2.zip"
-Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_0.zip -OutFile $zip
-Verify-Checksum $zip "C4149FE706B25738B4C4E54C73E180B9CAB55832"
+Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_2.zip -OutFile $zip
+Verify-Checksum $zip "80EE5678E714DE99DDAF5F7593AB04DB1C7928E4"
Extract-Zip $zip C:\Utils\Jom
[Environment]::SetEnvironmentVariable("CI_JOM_PATH", "C:\Utils\Jom", "Machine")