summaryrefslogtreecommitdiffstats
path: root/win32/bin
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@nokia.com>2012-04-26 13:37:10 +0200
committerRobert Loehning <robert.loehning@nokia.com>2012-04-26 13:37:10 +0200
commit400e8a09a8759a775467458d970f04f614734368 (patch)
tree24b6c23cdb5b6374667d2ac18404ba47dbd08fc0 /win32/bin
parentc492776166a257ca804c8d094101d70a304469db (diff)
Updated jom
Diffstat (limited to 'win32/bin')
-rw-r--r--win32/bin/changelog.jom.txt44
-rw-r--r--win32/bin/ibjom.cmd4
-rw-r--r--win32/bin/jom.exebin1423872 -> 1495040 bytes
3 files changed, 46 insertions, 2 deletions
diff --git a/win32/bin/changelog.jom.txt b/win32/bin/changelog.jom.txt
index c2fa86d..5ff52c7 100644
--- a/win32/bin/changelog.jom.txt
+++ b/win32/bin/changelog.jom.txt
@@ -1,4 +1,46 @@
-This is the changelog for jom 1.0.6, the parallel make tool.
+This is the changelog for jom 1.0.11, the parallel make tool.
+
+Changes since jom 1.0.10
+- Fix exit code for /k command line switch. (QTCREATORBUG-6987)
+- Fix spurious 0x0d characters in process output. (QTCREATORBUG-6986)
+- Fix process output ordering and printing of large amounts of output
+ in recursive jom scenarios.
+- Improved performance by caching file time stamps.
+
+Changes since jom 1.0.9
+- Fix regression that caused jom to fail on Windows XP.
+
+Changes since jom 1.0.8
+- The GNU Make option -w is now supported to print the current working
+ directory before and after other processing.
+- Fix crash when specifying a target for an empty makefile.
+ (QTCREATORBUG-6552)
+- Fix lookup for targets in the Makefile's directory. (QTCREATORBUG-6546)
+- Fix handling of environment variables. (QTCREATORBUG-6578)
+- Specifying an exit code with the '-' command modifier was fixed.
+- Fix command modifiers in inference rules. (QTCREATORBUG-6742)
+- Fix parsing of the "ignore exit code" command modifier.
+- Fix (very rare) deadlock and zombie processes.
+- The preprocessor directive !include <file> now looks up files in the
+ include directories correctly. (QTCREATORBUG-6869)
+
+Changes since jom 1.0.7
+- Fix spawning of child processes that expect a valid stdin handle.
+ E.g. xcopy couldn't be called anymore.
+- CMakeList.txt was fixed (thanks to Ryan Pavlik).
+
+Changes since jom 1.0.6
+- Fix blank lines in output. (QTCREATORBUG-3974)
+- Small performance improvement due to compilation with
+ QT_USE_FAST_CONCATENATION and QT_USE_FAST_OPERATOR_PLUS.
+- Ctrl-C handling has been revisited. Much simpler and more correct.
+ Before the compiler jobs didn't get a Ctrl-C but were terminated.
+- Special .SYNC dependents implemented. See README for a small description.
+ (QTCREATORBUG-3257)
+- Handle quoted dollar signs in inline files correctly. (QTCREATORBUG-2875)
+- Respect the MAKEFLAGS environment variable. (QTCREATORBUG-5028)
+- Complete detection of cmd builtins. This fixes annoying warnings when building
+ with IncrediBuild.
Changes since jom 1.0.5
- Fix mean monster spawn issue.
diff --git a/win32/bin/ibjom.cmd b/win32/bin/ibjom.cmd
index c97467d..358fbe5 100644
--- a/win32/bin/ibjom.cmd
+++ b/win32/bin/ibjom.cmd
@@ -1 +1,3 @@
-@xgConsole /profile=%~dp0\profile.xml /command="jom -j 10 %*"
+@echo off
+if "%IBJOM_NUMBEROFJOBS%" == "" set IBJOM_NUMBEROFJOBS=20
+xgConsole /profile="%~dp0\profile.xml" /command="jom -j%IBJOM_NUMBEROFJOBS% %*"
diff --git a/win32/bin/jom.exe b/win32/bin/jom.exe
index 2796c02..e9db32e 100644
--- a/win32/bin/jom.exe
+++ b/win32/bin/jom.exe
Binary files differ