From 5f15219d58c807131d9484a792cea87c0aafd32c Mon Sep 17 00:00:00 2001 From: David Schulz Date: Mon, 7 Nov 2016 09:25:21 +0100 Subject: Update CDB extension Change-Id: If9c7c88ee2668d0dfb0ae4a12f588d28f0d8a807 Reviewed-by: Christian Stenger --- win32/lib/qtcreatorcdbext64/qtcreatorcdbext.dll | Bin 700928 -> 786944 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/win32/lib/qtcreatorcdbext64/qtcreatorcdbext.dll b/win32/lib/qtcreatorcdbext64/qtcreatorcdbext.dll index cd7fa1a..959a843 100644 Binary files a/win32/lib/qtcreatorcdbext64/qtcreatorcdbext.dll and b/win32/lib/qtcreatorcdbext64/qtcreatorcdbext.dll differ -- cgit v1.2.3 From 649cfe6b78968833ebe007eae779edaaff4dfa39 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 10 Nov 2016 16:51:50 +0100 Subject: Update jom to v1.1.1 Change-Id: Ib1462f6ca2159c3f5a864ad4998f96298df600cc Reviewed-by: Robert Loehning Reviewed-by: Eike Ziller --- win32/bin/changelog.jom.txt | 19 ++++++++++++++++++- win32/bin/ibjom.bat | 5 +++++ win32/bin/ibjom.cmd | 3 --- win32/bin/jom.exe | Bin 2575872 -> 2655232 bytes win32/bin/profile.xml | 12 ------------ win32/bin/xgejom.bat | 6 ++++++ win32/bin/xgejom.xml | 13 +++++++++++++ 7 files changed, 42 insertions(+), 16 deletions(-) create mode 100644 win32/bin/ibjom.bat delete mode 100644 win32/bin/ibjom.cmd delete mode 100644 win32/bin/profile.xml create mode 100644 win32/bin/xgejom.bat create mode 100644 win32/bin/xgejom.xml 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.bat b/win32/bin/ibjom.bat new file mode 100644 index 0000000..297f6f7 --- /dev/null +++ b/win32/bin/ibjom.bat @@ -0,0 +1,5 @@ +@echo off +setlocal +if "%IBJOM_NUMBEROFJOBS%" == "" set IBJOM_NUMBEROFJOBS=20 +BuildConsole /command="jom -j%IBJOM_NUMBEROFJOBS% %*" +endlocal diff --git a/win32/bin/ibjom.cmd b/win32/bin/ibjom.cmd deleted file mode 100644 index d5e4448..0000000 --- a/win32/bin/ibjom.cmd +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -if "%IBJOM_NUMBEROFJOBS%" == "" set IBJOM_NUMBEROFJOBS=20 -BuildConsole /command="jom -j%IBJOM_NUMBEROFJOBS% %*" diff --git a/win32/bin/jom.exe b/win32/bin/jom.exe index 98540c5..e5e2686 100644 Binary files a/win32/bin/jom.exe and b/win32/bin/jom.exe differ diff --git a/win32/bin/profile.xml b/win32/bin/profile.xml deleted file mode 100644 index fdd3fc2..0000000 --- a/win32/bin/profile.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - 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/xgejom.xml b/win32/bin/xgejom.xml new file mode 100644 index 0000000..c561a14 --- /dev/null +++ b/win32/bin/xgejom.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + -- cgit v1.2.3