1 files changed, 131 insertions, 10 deletions

diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp
index d1b473e0a..f041568a9 100644
--- a/src/app/qbs-setup-toolchains/probe.cpp
+++ b/src/app/qbs-setup-toolchains/probe.cpp
@@ -54,8 +54,20 @@
 #include <tools/toolchains.h>
 
 #include <QtCore/qdir.h>
+#include <QtCore/qoperatingsystemversion.h>
 #include <QtCore/qtextstream.h>
 
+#ifdef Q_OS_WIN
+// We need defines for Windows 8.
+#undef _WIN32_WINNT
+#define _WIN32_WINNT _WIN32_WINNT_WIN8
+
+#include <qt_windows.h>
+#include <ShlObj.h>
+#else
+#include <qplatformdefs.h>
+#endif // Q_OS_WIN
+
 using namespace qbs;
 using Internal::HostOsInfo;
 using Internal::Tr;
@@ -63,6 +75,11 @@ using Internal::Tr;
 static QTextStream qStdout(stdout);
 static QTextStream qStderr(stderr);
 
+QStringList systemSearchPaths()
+{
+    return QString::fromLocal8Bit(qgetenv("PATH")).split(HostOsInfo::pathListSeparator());
+}
+
 QString findExecutable(const QString &fileName)
 {
     QString fullFileName = fileName;
@@ -70,8 +87,7 @@ QString findExecutable(const QString &fileName)
             && !fileName.endsWith(QLatin1String(".exe"), Qt::CaseInsensitive)) {
         fullFileName += QLatin1String(".exe");
     }
-    const QString path = QString::fromLocal8Bit(qgetenv("PATH"));
-    const auto ppaths = path.split(HostOsInfo::pathListSeparator());
+    const auto ppaths = systemSearchPaths();
     for (const QString &ppath : ppaths) {
         const QString fullPath = ppath + QLatin1Char('/') + fullFileName;
         if (QFileInfo::exists(fullPath))
@@ -109,16 +125,13 @@ void probe(Settings *settings)
     if (HostOsInfo::isWindowsHost()) {
         msvcProbe(settings, profiles);
         clangClProbe(settings, profiles);
-    } else {
-        gccProbe(settings, profiles, QStringLiteral("gcc"));
-        gccProbe(settings, profiles, QStringLiteral("clang"));
-
-        if (HostOsInfo::isMacosHost()) {
-            xcodeProbe(settings, profiles);
-        }
+    } else if (HostOsInfo::isMacosHost()) {
+        xcodeProbe(settings, profiles);
     }
 
-    mingwProbe(settings, profiles);
+    gccProbe(settings, profiles, QStringLiteral("gcc"));
+    gccProbe(settings, profiles, QStringLiteral("clang"));
+
     iarProbe(settings, profiles);
     keilProbe(settings, profiles);
     sdccProbe(settings, profiles);
@@ -180,3 +193,111 @@ int extractVersion(const QByteArray &macroDump, const QByteArray &keyToken)
             .toInt();
     return version;
 }
+
+static QString resolveSymlinks(const QString &filePath)
+{
+    QFileInfo fi(filePath);
+    int links = 16;
+    while (links-- && fi.isSymLink())
+        fi.setFile(fi.dir(), fi.symLinkTarget());
+    if (links <= 0)
+        return {};
+    return fi.filePath();
+}
+
+// Copied from qfilesystemengine_win.cpp.
+#ifdef Q_OS_WIN
+
+// File ID for Windows up to version 7.
+static inline QByteArray fileIdWin7(HANDLE handle)
+{
+    BY_HANDLE_FILE_INFORMATION info;
+    if (GetFileInformationByHandle(handle, &info)) {
+        char buffer[sizeof "01234567:0123456701234567\0"];
+        qsnprintf(buffer, sizeof(buffer), "%lx:%08lx%08lx",
+                  info.dwVolumeSerialNumber,
+                  info.nFileIndexHigh,
+                  info.nFileIndexLow);
+        return QByteArray(buffer);
+    }
+    return {};
+}
+
+// File ID for Windows starting from version 8.
+static QByteArray fileIdWin8(HANDLE handle)
+{
+    QByteArray result;
+    FILE_ID_INFO infoEx = {};
+    if (::GetFileInformationByHandleEx(
+                handle,
+                static_cast<FILE_INFO_BY_HANDLE_CLASS>(18), // FileIdInfo in Windows 8
+                &infoEx, sizeof(FILE_ID_INFO))) {
+        result = QByteArray::number(infoEx.VolumeSerialNumber, 16);
+        result += ':';
+        // Note: MinGW-64's definition of FILE_ID_128 differs from the MSVC one.
+        result += QByteArray(reinterpret_cast<const char *>(&infoEx.FileId),
+                             int(sizeof(infoEx.FileId))).toHex();
+    }
+    return result;
+}
+
+static QByteArray fileIdWin(HANDLE fHandle)
+{
+    return QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows8
+            ? fileIdWin8(HANDLE(fHandle))
+            : fileIdWin7(HANDLE(fHandle));
+}
+
+static QByteArray fileId(const QString &filePath)
+{
+    QByteArray result;
+    const HANDLE handle = ::CreateFile(
+                reinterpret_cast<const wchar_t*>(filePath.utf16()), 0,
+                FILE_SHARE_READ, nullptr, OPEN_EXISTING,
+                FILE_FLAG_BACKUP_SEMANTICS, nullptr);
+    if (handle != INVALID_HANDLE_VALUE) {
+        result = fileIdWin(handle);
+        ::CloseHandle(handle);
+    }
+    return result;
+}
+
+static qint64 fileSize(const QString &filePath)
+{
+    return QFileInfo(filePath).size();
+}
+
+#else
+
+static QByteArray fileId(const QString &filePath)
+{
+    QByteArray result;
+    if (Q_UNLIKELY(filePath.isEmpty()))
+        return {};
+    QT_STATBUF statResult = {};
+    if (QT_STAT(filePath.toLocal8Bit().constData(), &statResult))
+        return {};
+    result = QByteArray::number(quint64(statResult.st_dev), 16);
+    result += ':';
+    result += QByteArray::number(quint64(statResult.st_ino));
+    return result;
+}
+
+#endif // Q_OS_WIN
+
+bool isSameExecutable(const QString &filePath1, const QString &filePath2)
+{
+    if (filePath1 == filePath2)
+        return true;
+    if (resolveSymlinks(filePath1) == resolveSymlinks(filePath2))
+        return true;
+    if (fileId(filePath1) == fileId(filePath2))
+        return true;
+
+#ifdef Q_OS_WIN
+    if (fileSize(filePath1) == fileSize(filePath2))
+        return true;
+#endif
+
+    return false;
+}