Autodetect clang-cl by using Probe

This allows to build projects without calling "qbs setup-toolchains"
first by simply calling "qbs build qbs.toolchainType:clang-cl"

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

2 files changed, 75 insertions, 2 deletions

diff --git a/share/qbs/imports/qbs/Probes/ClangClBinaryProbe.qbs b/share/qbs/imports/qbs/Probes/ClangClBinaryProbe.qbs
new file mode 100644
index 000000000..f4916a37a
--- /dev/null
+++ b/share/qbs/imports/qbs/Probes/ClangClBinaryProbe.qbs
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 Ivan Komissarov (abbapoh@gmail.com)
+** Contact: http://www.qt.io/licensing
+**
+** This file is part of Qbs.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms and
+** conditions see http://www.qt.io/terms-conditions. For further information
+** use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, The Qt Company gives you certain additional
+** rights.  These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+import qbs.FileInfo
+import qbs.ModUtils
+import qbs.Utilities
+import "path-probe.js" as PathProbeConfigure
+
+BinaryProbe {
+    // output
+    property string vcvarsallPath;
+
+    configure: {
+        var _selectors;
+        var results = PathProbeConfigure.configure(_selectors, names, nameSuffixes, nameFilter,
+                                                   candidateFilter, searchPaths, pathSuffixes,
+                                                   platformSearchPaths, environmentPaths,
+                                                   platformEnvironmentPaths, pathListSeparator);
+        var compilerPath;
+        if (results.found)
+            compilerPath = results.files[0].filePath;
+        var compilers = Utilities.installedClangCls(compilerPath);
+        if (compilers.length >= 1) {
+            var result = {};
+            result.fileName = "clang-cl.exe";
+            result.path = compilers[0].toolchainInstallPath;
+            result.filePath = FileInfo.joinPaths(result.path, result.fileName);
+            result.candidatePaths = result.filePath;
+            result.vcvarsallPath = compilers[0].vcvarsallPath;
+            results.found = true;
+            results.files = [result];
+        }
+
+        found = results.found;
+        allResults = results.files;
+
+        if (allResults.length === 1) {
+            var result = allResults[0];
+            candidatePaths = result.candidatePaths;
+            path = result.path;
+            filePath = result.filePath;
+            fileName = result.fileName;
+            vcvarsallPath = result.vcvarsallPath;
+        }
+    }
+}
diff --git a/share/qbs/modules/cpp/windows-clang-cl.qbs b/share/qbs/modules/cpp/windows-clang-cl.qbs
index d57f5a7ad..a34a67ad2 100644
--- a/share/qbs/modules/cpp/windows-clang-cl.qbs
+++ b/share/qbs/modules/cpp/windows-clang-cl.qbs
@@ -40,7 +40,7 @@ MsvcBaseModule {
                qbs.toolchain && qbs.toolchain.contains('clang-cl')
     priority: 100
 
-    Probes.BinaryProbe {
+    Probes.ClangClBinaryProbe {
         id: clangPathProbe
         condition: !toolchainInstallPath && !_skipAllChecks
         names: ["clang-cl"]
@@ -78,7 +78,7 @@ MsvcBaseModule {
         driverLinkerFlags: "-fuse-ld=" + linkerVariant
     }
 
-    property string vcvarsallPath
+    property string vcvarsallPath : clangPathProbe.found ? clangPathProbe.vcvarsallPath : undefined
 
     compilerName: "clang-cl.exe"
     linkerName: "lld-link.exe"