diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2015-06-16 19:06:05 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2015-06-17 08:39:31 +0000 |
| commit | fb085b59e9cc493f25f8738b805de5659193821e (patch) | |
| tree | b1e20a3e0eccdf46309e4e06f31e855a204c1889 /share/qbs/modules/java/JavaModule.qbs | |
| parent | f36ff0f3a8be2ddc86e3773be6cd7e7649a7ced3 (diff) | |
| download | qbs-fb085b59e9cc493f25f8738b805de5659193821e.tar.gz | |
Add 'm' flag to javac compiler version regex.
The compiler version is not always on the first line.
Change-Id: I3fe3f2b2ed7be3e719ae41ae61eb4306af4563ac
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'share/qbs/modules/java/JavaModule.qbs')
| -rw-r--r-- | share/qbs/modules/java/JavaModule.qbs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/share/qbs/modules/java/JavaModule.qbs b/share/qbs/modules/java/JavaModule.qbs index c1b1b18af..e911597a2 100644 --- a/share/qbs/modules/java/JavaModule.qbs +++ b/share/qbs/modules/java/JavaModule.qbs @@ -78,7 +78,8 @@ Module { var p = new Process(); try { p.exec(compilerFilePath, ["-version"]); - var match = p.readStdErr().trim().match(/^javac (([0-9]+(?:\.[0-9]+){2,2})_([0-9]+))$/); + var re = /^javac (([0-9]+(?:\.[0-9]+){2,2})_([0-9]+))$/m; + var match = p.readStdErr().trim().match(re); if (match !== null) return match; } finally { |