Fix javac version detection

It seems, that javac -version can return "12" instead of "12.0.0"

Change-Id: I804cbadb410dc11f566fda122f3082a8607ebb36
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 14 insertions, 1 deletions

diff --git a/share/qbs/modules/java/utils.js b/share/qbs/modules/java/utils.js
index 52c0e880a..ae0c1356b 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]+){2,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);
@@ -147,6 +147,19 @@ function findJdkVersion(compilerFilePath) {
     }
 }
 
+function splitVersionString(compilerVersion) {
+    if (!compilerVersion)
+        return [];
+
+    var result = compilerVersion.split(/[\._]/).map(function(item) {
+        return parseInt(item, 10);
+    });
+    // special case, if javac -version returned "12" instead of "12.0.0"
+    if (result.length === 1)
+        result.push(0, 0);
+    return result;
+}
+
 function supportsGeneratedNativeHeaderFiles(product) {
     var compilerVersionMajor = ModUtils.moduleProperty(product, "compilerVersionMajor");
     if (compilerVersionMajor === 1) {