summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2014-10-09 13:55:51 +0200
committerJoerg Bornemann <joerg.bornemann@digia.com>2014-10-09 13:55:51 +0200
commitc198aed46abfac140514b0d081c79b33b7b7c410 (patch)
tree5452fbf7511d809ab078afd153c33880b6a52447
parent5438d392961cfc6faf95d1a5e3a1e20b134a0c2c (diff)
update jom to v1.0.14
-rw-r--r--win32/bin/changelog.jom.txt12
-rw-r--r--win32/bin/ibjom.cmd2
-rw-r--r--win32/bin/jom.exebin1627648 -> 1685504 bytes
3 files changed, 12 insertions, 2 deletions
diff --git a/win32/bin/changelog.jom.txt b/win32/bin/changelog.jom.txt
index 3126036..47e597a 100644
--- a/win32/bin/changelog.jom.txt
+++ b/win32/bin/changelog.jom.txt
@@ -1,4 +1,14 @@
-This is the changelog for jom 1.0.13, the parallel make tool.
+This is the changelog for jom 1.0.14, the parallel make tool.
+
+Changes since jom 1.0.13
+- Fix exit code forwarding. (QTCREATORBUG-11556)
+- Fix file name macro modifers for $** and $?. (QTCREATORBUG-6932)
+- Fix equal signs in semicolon command syntax. (QTCREATORBUG-7942)
+- Fix error line numbers for inline files. (QTCREATORBUG-8451)
+- Ignore macro assignments in inline files. (QTCREATORBUG-8452)
+- Yield error on unexpected !ENDIF directive.
+- Support wildcards in dependency lines. (QTCREATORBUG-10439)
+- Use IcrediBuild's BuildConsole instead of the XGE interface in ibjom.
Changes since jom 1.0.12
- Fix spurious "Can't start command" error.
diff --git a/win32/bin/ibjom.cmd b/win32/bin/ibjom.cmd
index 358fbe5..d5e4448 100644
--- a/win32/bin/ibjom.cmd
+++ b/win32/bin/ibjom.cmd
@@ -1,3 +1,3 @@
@echo off
if "%IBJOM_NUMBEROFJOBS%" == "" set IBJOM_NUMBEROFJOBS=20
-xgConsole /profile="%~dp0\profile.xml" /command="jom -j%IBJOM_NUMBEROFJOBS% %*"
+BuildConsole /command="jom -j%IBJOM_NUMBEROFJOBS% %*"
diff --git a/win32/bin/jom.exe b/win32/bin/jom.exe
index 300574c..2506b4e 100644
--- a/win32/bin/jom.exe
+++ b/win32/bin/jom.exe
Binary files differ