diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-11-16 15:59:30 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-11-16 15:59:35 +0100 |
| commit | e8a6698d7c2866013b43ed7ef46f22af20fe38db (patch) | |
| tree | 953442de5770e555007ff050ffba72da3bd554f5 | |
| parent | 9830dc3656170ce72efaf78830f9515bb5d9008e (diff) | |
| parent | 649cfe6b78968833ebe007eae779edaaff4dfa39 (diff) | |
Merge remote-tracking branch 'origin/4.2'
Change-Id: Id651d5206e615b38dcb3d2acf1e5c6460bf7bc58
| -rw-r--r-- | win32/bin/changelog.jom.txt | 19 | ||||
| -rw-r--r-- | win32/bin/ibjom.bat (renamed from win32/bin/ibjom.cmd) | 2 | ||||
| -rw-r--r-- | win32/bin/jom.exe | bin | 2575872 -> 2655232 bytes | |||
| -rw-r--r-- | win32/bin/xgejom.bat | 6 | ||||
| -rw-r--r-- | win32/bin/xgejom.xml (renamed from win32/bin/profile.xml) | 1 | ||||
| -rw-r--r-- | win32/lib/qtcreatorcdbext64/qtcreatorcdbext.dll | bin | 700928 -> 786944 bytes |
6 files changed, 27 insertions, 1 deletions
diff --git a/win32/bin/changelog.jom.txt b/win32/bin/changelog.jom.txt index a5d44a9..0a6163c 100644 --- a/win32/bin/changelog.jom.txt +++ b/win32/bin/changelog.jom.txt @@ -1,4 +1,21 @@ -This is the changelog for jom 1.0.16, the parallel make tool. +This is the changelog for jom 1.1.1, the parallel make tool. + +Changes since jom 1.1.0 +- Added the special .NOTPARALLEL target that disables parallel build for the + containing makefile. +- Fixed glitches in !include directives. Includes like <"foo.mk"> were not + possible. Includes like "foo.mk" did not recursively search through parent + makefiles directories. +- Introduced the JOMFLAGS environment variable. This is a MAKEFLAGS pendant. + JOMFLAGS is useful to set up separate flags for nmake and jom. +- Renamed ibjom.cmd to ibjom.bat for consistency. +- Added xgejom.bat, a wrapper for the IncrediBuild XGE interface. +- Fixed wildcard handling for subdirectories (QTCREATORBUG-16499). +- Implemented the "build all targets" option (QTCREATORBUG-16500). + +Changes since jom 1.0.16 +- Restrict the number of parallel jobs in recursively called instances + similar to GNU make's jobserver (QTCREATORBUG-10846). Changes since jom 1.0.15 - Fix occasional hang on exit (QTCREATORBUG-14600). diff --git a/win32/bin/ibjom.cmd b/win32/bin/ibjom.bat index d5e4448..297f6f7 100644 --- a/win32/bin/ibjom.cmd +++ b/win32/bin/ibjom.bat @@ -1,3 +1,5 @@ @echo off +setlocal if "%IBJOM_NUMBEROFJOBS%" == "" set IBJOM_NUMBEROFJOBS=20 BuildConsole /command="jom -j%IBJOM_NUMBEROFJOBS% %*" +endlocal diff --git a/win32/bin/jom.exe b/win32/bin/jom.exe Binary files differindex 98540c5..e5e2686 100644 --- a/win32/bin/jom.exe +++ b/win32/bin/jom.exe diff --git a/win32/bin/xgejom.bat b/win32/bin/xgejom.bat new file mode 100644 index 0000000..4a8f625 --- /dev/null +++ b/win32/bin/xgejom.bat @@ -0,0 +1,6 @@ +@echo off +setlocal +if "%IBJOM_NUMBEROFJOBS%" == "" set IBJOM_NUMBEROFJOBS=60 +set NINJAFLAGS=-j60 +xgConsole /profile="%~dp0\xgejom.xml" /command="jom -j%IBJOM_NUMBEROFJOBS% %*" +endlocal diff --git a/win32/bin/profile.xml b/win32/bin/xgejom.xml index fdd3fc2..c561a14 100644 --- a/win32/bin/profile.xml +++ b/win32/bin/xgejom.xml @@ -2,6 +2,7 @@ <Profile FormatVersion="1"> <Tools> <Tool Filename="jom" AllowIntercept="true" /> + <Tool Filename="ninja" AllowIntercept="true" /> <Tool Filename="cl" AllowRemote="true" VCCompiler="true" DeriveCaptionFrom="lastparam"/> <Tool Filename="moc" AllowRemote="true" DeriveCaptionFrom="lastparam"/> <Tool Filename="uic" AllowRemote="true" DeriveCaptionFrom="lastparam"/> diff --git a/win32/lib/qtcreatorcdbext64/qtcreatorcdbext.dll b/win32/lib/qtcreatorcdbext64/qtcreatorcdbext.dll Binary files differindex cd7fa1a..959a843 100644 --- a/win32/lib/qtcreatorcdbext64/qtcreatorcdbext.dll +++ b/win32/lib/qtcreatorcdbext64/qtcreatorcdbext.dll |