Add executableSuffix to the FileInfo service

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

10 files changed, 28 insertions, 13 deletions

diff --git a/doc/reference/jsextensions/jsextension-fileinfo.qdoc b/doc/reference/jsextensions/jsextension-fileinfo.qdoc
index cb0eb7c43..d58c1a9e9 100644
--- a/doc/reference/jsextensions/jsextension-fileinfo.qdoc
+++ b/doc/reference/jsextensions/jsextension-fileinfo.qdoc
@@ -164,4 +164,11 @@
     \endcode
     Returns the host operating system path separator.
     \funsince 1.22
+
+    \section2 executableSuffix
+    \code
+        FileInfo.executableSuffix(): string
+    \endcode
+    Returns the host operating system executable suffix.
+    \funsince 1.23
 */
diff --git a/share/qbs/imports/qbs/Probes/ConanfileProbe.qbs b/share/qbs/imports/qbs/Probes/ConanfileProbe.qbs
index 32fbcace2..097b1b6f1 100644
--- a/share/qbs/imports/qbs/Probes/ConanfileProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/ConanfileProbe.qbs
@@ -31,7 +31,6 @@
 import qbs.Process
 import qbs.File
 import qbs.FileInfo
-import qbs.Host
 import qbs.TextFile
 import qbs.Utilities
 
@@ -40,7 +39,7 @@ Probe {
     property stringList additionalArguments: []
     property path conanfilePath
     property path packageReference
-    property path executable: "conan" + (Host.os().contains("windows") ? ".exe": "")
+    property path executable: "conan" + FileInfo.executableSuffix()
     property stringList generators: ["json"]
     property var options
     property var settings
diff --git a/share/qbs/module-providers/Qt/setup-qt.js b/share/qbs/module-providers/Qt/setup-qt.js
index a8fbf9dae..db3ff67b8 100644
--- a/share/qbs/module-providers/Qt/setup-qt.js
+++ b/share/qbs/module-providers/Qt/setup-qt.js
@@ -48,7 +48,7 @@ var Utilities = require("qbs.Utilities");
 
 function splitNonEmpty(s, c) { return s.split(c).filter(function(e) { return e; }); }
 function toNative(p) { return FileInfo.toNativeSeparators(p); }
-function exeSuffix(qbs) { return Host.os().contains("windows") ? ".exe" : ""; }
+function exeSuffix(qbs) { return FileInfo.executableSuffix(); }
 
 function getQmakeFilePaths(qmakeFilePaths, qbs) {
     if (qmakeFilePaths && qmakeFilePaths.length > 0)
diff --git a/share/qbs/module-providers/Qt/templates/qmlcache.qbs b/share/qbs/module-providers/Qt/templates/qmlcache.qbs
index 9a5956884..7047884c0 100644
--- a/share/qbs/module-providers/Qt/templates/qmlcache.qbs
+++ b/share/qbs/module-providers/Qt/templates/qmlcache.qbs
@@ -1,6 +1,5 @@
 import qbs.File
 import qbs.FileInfo
-import qbs.Host
 import qbs.Process
 import qbs.Utilities
 
@@ -11,7 +10,7 @@ Module {
             throw "qmlcachegen unsupported for this target";
     }
     property string qmlCacheGenPath: FileInfo.joinPaths(Qt.core.qmlLibExecPath, "qmlcachegen")
-                                     + (Host.os().contains("windows") ? ".exe" : "")
+                                     + FileInfo.executableSuffix()
     property bool supportsAllArchitectures: Utilities.versionCompare(Qt.core.version, "5.11") >= 0
     property string installDir
 
diff --git a/share/qbs/module-providers/Qt/templates/quick.js b/share/qbs/module-providers/Qt/templates/quick.js
index e677143ea..d7e58984f 100644
--- a/share/qbs/module-providers/Qt/templates/quick.js
+++ b/share/qbs/module-providers/Qt/templates/quick.js
@@ -37,7 +37,7 @@ function scanQrc(product, qrcFilePath) {
     var result = [];
     var process = new Process();
     try {
-        var rcc = FileInfo.joinPaths(Rcc.fullPath(product) + product.cpp.executableSuffix);
+        var rcc = FileInfo.joinPaths(Rcc.fullPath(product) + FileInfo.executableSuffix());
         var exitCode = process.exec(rcc, ["--list", qrcFilePath], true);
         for (;;) {
             var line = process.readLine();
diff --git a/share/qbs/module-providers/Qt/templates/quick.qbs b/share/qbs/module-providers/Qt/templates/quick.qbs
index 276246d6d..27f49cbd6 100644
--- a/share/qbs/module-providers/Qt/templates/quick.qbs
+++ b/share/qbs/module-providers/Qt/templates/quick.qbs
@@ -75,7 +75,7 @@ QtModule {
                                                              : Qt.core.binPath
     property string compilerBaseName: (_compilerIsQmlCacheGen ? "qmlcachegen" : "qtquickcompiler")
     property string compilerFilePath: FileInfo.joinPaths(_compilerBaseDir,
-                                        compilerBaseName + product.cpp.executableSuffix)
+                                        compilerBaseName + FileInfo.executableSuffix())
 
     property bool compilerAvailable: File.exists(compilerFilePath);
     property bool useCompiler: compilerAvailable && !_compilerIsQmlCacheGen
diff --git a/share/qbs/module-providers/qbspkgconfig.qbs b/share/qbs/module-providers/qbspkgconfig.qbs
index fc162320c..2af3c42e4 100644
--- a/share/qbs/module-providers/qbspkgconfig.qbs
+++ b/share/qbs/module-providers/qbspkgconfig.qbs
@@ -40,7 +40,6 @@
 import qbs.Environment
 import qbs.File
 import qbs.FileInfo
-import qbs.Host
 import qbs.ModUtils
 import qbs.PkgConfig
 import qbs.Process
@@ -62,7 +61,7 @@ ModuleProvider {
 
     relativeSearchPaths: {
 
-        function exeSuffix(qbs) { return Host.os().contains("windows") ? ".exe" : ""; }
+        function exeSuffix(qbs) { return FileInfo.executableSuffix(); }
 
         // we need Probes in Providers...
         function getPkgConfigExecutable(qbs) {
diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs
index 038de8617..bd1eaa242 100644
--- a/share/qbs/modules/cpp/CppModule.qbs
+++ b/share/qbs/modules/cpp/CppModule.qbs
@@ -29,7 +29,7 @@
 ****************************************************************************/
 
 // base for Cpp modules
-import qbs.Host
+import qbs.FileInfo
 import qbs.ModUtils
 import qbs.Utilities
 import qbs.WindowsUtils
@@ -217,7 +217,7 @@ Module {
 
     property stringList knownArchitectures: []
     property var toolchainDetails
-    property string compilerExtension: Host.os().contains("windows") ? ".exe" : ""
+    property string compilerExtension: FileInfo.executableSuffix()
 
     property string linkerMode: "automatic"
     PropertyOptions {
diff --git a/share/qbs/modules/typescript/TypeScriptModule.qbs b/share/qbs/modules/typescript/TypeScriptModule.qbs
index c8ca270e0..76df529c2 100644
--- a/share/qbs/modules/typescript/TypeScriptModule.qbs
+++ b/share/qbs/modules/typescript/TypeScriptModule.qbs
@@ -30,7 +30,6 @@
 
 import qbs.File
 import qbs.FileInfo
-import qbs.Host
 import qbs.ModUtils
 import qbs.Probes
 import qbs.Process
@@ -130,7 +129,7 @@ Module {
 
         var preValidator = new ModUtils.PropertyValidator("nodejs");
         preValidator.addCustomValidator("interpreterFileName", nodejs.interpreterFileName, function (value) {
-            return value === "node" + (Host.os().contains("windows") ? ".exe" : "");
+            return value === "node" + FileInfo.executableSuffix();
         }, interpreterMessage);
         preValidator.addCustomValidator("interpreterFilePath", nodejs.interpreterFilePath, function (value) {
             return value.endsWith(nodejs.interpreterFileName);
diff --git a/src/lib/corelib/jsextensions/fileinfoextension.cpp b/src/lib/corelib/jsextensions/fileinfoextension.cpp
index a69dbc621..a4986d12c 100644
--- a/src/lib/corelib/jsextensions/fileinfoextension.cpp
+++ b/src/lib/corelib/jsextensions/fileinfoextension.cpp
@@ -86,6 +86,7 @@ public:
     static QScriptValue js_joinPaths(QScriptContext *context, QScriptEngine *engine);
     static QScriptValue js_pathListSeparator(QScriptContext *context, QScriptEngine *engine);
     static QScriptValue js_pathSeparator(QScriptContext *context, QScriptEngine *engine);
+    static QScriptValue js_executableSuffix(QScriptContext *context, QScriptEngine *engine);
 };
 
 QScriptValue FileInfoExtension::js_ctor(QScriptContext *context, QScriptEngine *engine)
@@ -297,6 +298,15 @@ QScriptValue FileInfoExtension::js_pathSeparator(QScriptContext *context, QScrip
     return QString(HostOsInfo::pathSeparator());
 }
 
+QScriptValue FileInfoExtension::js_executableSuffix(QScriptContext *context, QScriptEngine *engine)
+{
+    Q_UNUSED(context);
+    Q_UNUSED(engine);
+    static QString executableSuffix = HostOsInfo::isWindowsHost() ?
+                                          QLatin1String(QBS_HOST_EXE_SUFFIX) : QString();
+    return executableSuffix;
+}
+
 } // namespace Internal
 } // namespace qbs
 
@@ -342,6 +352,8 @@ void initializeJsExtensionFileInfo(QScriptValue extensionObject)
                             engine->newFunction(FileInfoExtension::js_pathListSeparator));
     fileInfoObj.setProperty(QStringLiteral("pathSeparator"),
                             engine->newFunction(FileInfoExtension::js_pathSeparator));
+    fileInfoObj.setProperty(QStringLiteral("executableSuffix"),
+                            engine->newFunction(FileInfoExtension::js_executableSuffix));
     extensionObject.setProperty(QStringLiteral("FileInfo"), fileInfoObj);
 }