diff options
| author | BogDan Vatra <bogdan@kde.org> | 2020-01-07 11:08:25 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2020-01-07 14:52:51 +0000 |
| commit | de28c042fa3522919cb7a8bc88ffd4be98390253 (patch) | |
| tree | 00308701ec8010b28b404b4f7242671a4edb3757 | |
| parent | 872c115f8b6fb213d787bf886709e564eecb37a8 (diff) | |
Fix version parsing
Latest debian java 8 adds some extra characters at the end of the version
("javac 1.8.0_242-ea"), which confuses the existing regex.
Change-Id: I96acb978d95bdb22c71da4593fe5fae4d417e5f3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | share/qbs/modules/java/utils.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/modules/java/utils.js b/share/qbs/modules/java/utils.js index ae0c1356b..0e11b7d3e 100644 --- a/share/qbs/modules/java/utils.js +++ b/share/qbs/modules/java/utils.js @@ -136,7 +136,7 @@ function findJdkVersion(compilerFilePath) { var p = new Process(); try { p.exec(compilerFilePath, ["-version"]); - var re = /^javac (([0-9]+(?:\.[0-9]+){0,2})(_([0-9]+))?)$/m; + var re = /^javac (([0-9]+(?:\.[0-9]+){0,2})(_([0-9]+))?)(.*)?$/m; var match = p.readStdErr().trim().match(re); if (!match) match = p.readStdOut().trim().match(re); |