diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2016-11-21 18:15:26 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-11-23 10:34:36 +0000 |
| commit | 3cd8944d9c4dbfbb0228ed01310bceb1b58fc261 (patch) | |
| tree | 0469b69d59011863e7c43d2cba32ea4a3e80c3f9 | |
| parent | 649cfe6b78968833ebe007eae779edaaff4dfa39 (diff) | |
Update jom to v1.1.2v4.2.1v4.2.0-rc1v4.2.0
Change-Id: I7628ddba0ebef4222a9729b14cbdbc1094813ba6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
| -rw-r--r-- | win32/bin/changelog.jom.txt | 11 | ||||
| -rw-r--r-- | win32/bin/ibjom.bat | 4 | ||||
| -rw-r--r-- | win32/bin/jom.exe | bin | 2655232 -> 2654208 bytes | |||
| -rw-r--r-- | win32/bin/xgejom.bat | 4 |
4 files changed, 14 insertions, 5 deletions
diff --git a/win32/bin/changelog.jom.txt b/win32/bin/changelog.jom.txt index 0a6163c..e333847 100644 --- a/win32/bin/changelog.jom.txt +++ b/win32/bin/changelog.jom.txt @@ -1,4 +1,13 @@ -This is the changelog for jom 1.1.1, the parallel make tool. +This is the changelog for jom 1.1.2, the parallel make tool. + +Changes since jom 1.1.1 +- Fixed exit code propagation in xgejom.bat and ibjom.bat (QTCREATORBUG-16619). +- Updated the CMake build system to use Qt5. +- 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). +- Fixed sub-jom detection for chocolatey shims (QTCREATORBUG-15494). Changes since jom 1.1.0 - Added the special .NOTPARALLEL target that disables parallel build for the diff --git a/win32/bin/ibjom.bat b/win32/bin/ibjom.bat index 297f6f7..cc8843d 100644 --- a/win32/bin/ibjom.bat +++ b/win32/bin/ibjom.bat @@ -1,5 +1,5 @@ @echo off -setlocal +setlocal enabledelayedexpansion if "%IBJOM_NUMBEROFJOBS%" == "" set IBJOM_NUMBEROFJOBS=20 -BuildConsole /command="jom -j%IBJOM_NUMBEROFJOBS% %*" +BuildConsole /command="jom -j%IBJOM_NUMBEROFJOBS% %*" || exit /b !ERRORLEVEL! endlocal diff --git a/win32/bin/jom.exe b/win32/bin/jom.exe Binary files differindex e5e2686..acb7902 100644 --- a/win32/bin/jom.exe +++ b/win32/bin/jom.exe diff --git a/win32/bin/xgejom.bat b/win32/bin/xgejom.bat index 4a8f625..80a9054 100644 --- a/win32/bin/xgejom.bat +++ b/win32/bin/xgejom.bat @@ -1,6 +1,6 @@ @echo off -setlocal +setlocal enabledelayedexpansion if "%IBJOM_NUMBEROFJOBS%" == "" set IBJOM_NUMBEROFJOBS=60 set NINJAFLAGS=-j60 -xgConsole /profile="%~dp0\xgejom.xml" /command="jom -j%IBJOM_NUMBEROFJOBS% %*" +xgConsole /profile="%~dp0\xgejom.xml" /command="jom -j%IBJOM_NUMBEROFJOBS% %*" || exit /b !ERRORLEVEL! endlocal |