From 0a5d41cbea73fb72767db8f8ae6eeb842b0bf3e4 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@nokia.com>
Date: Mon, 16 Jan 2012 13:38:16 +0100
Subject: [PATCH] Move findInstalledJom to a more suitable place
Jom does not replace mingw32-make but nmake
Change-Id: Id9849cfb7313f08f7dc1ca9b67997b6589e7942b
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
---
.../projectexplorer/abstractmsvctoolchain.cpp | 17 +++++++++++++++++
.../projectexplorer/abstractmsvctoolchain.h | 1 +
src/plugins/projectexplorer/gcctoolchain.cpp | 17 -----------------
src/plugins/projectexplorer/gcctoolchain.h | 1 -
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/plugins/projectexplorer/abstractmsvctoolchain.cpp b/src/plugins/projectexplorer/abstractmsvctoolchain.cpp
index 264af9cb037..5a094a1b745 100644
--- a/src/plugins/projectexplorer/abstractmsvctoolchain.cpp
+++ b/src/plugins/projectexplorer/abstractmsvctoolchain.cpp
@@ -258,6 +258,23 @@ bool AbstractMsvcToolChain::generateEnvironmentSettings(Utils::Environment &env,
return true;
}
+QString AbstractMsvcToolChain::findInstalledJom()
+{
+ if (Abi::hostAbi().os() != Abi::WindowsOS) {
+ qWarning() << "Jom can only be used on Windows";
+ return QString();
+ }
+
+ // We want jom! Try to find it.
+ const QString jom = QLatin1String("jom.exe");
+ const QFileInfo installedJom = QFileInfo(QCoreApplication::applicationDirPath()
+ + QLatin1Char('/') + jom);
+ if (installedJom.isFile() && installedJom.isExecutable())
+ return installedJom.absoluteFilePath();
+ else
+ return jom;
+}
+
} // namespace Internal
} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/abstractmsvctoolchain.h b/src/plugins/projectexplorer/abstractmsvctoolchain.h
index 1c346a13a6d..26908a8b83a 100644
--- a/src/plugins/projectexplorer/abstractmsvctoolchain.h
+++ b/src/plugins/projectexplorer/abstractmsvctoolchain.h
@@ -64,6 +64,7 @@ public:
bool canClone() const;
QString varsBat() const { return m_vcvarsBat; }
+ static QString findInstalledJom();
protected:
virtual Utils::Environment readEnvironmentSetting(Utils::Environment& env) const = 0;
virtual QByteArray msvcPredefinedMacros(const Utils::Environment& env) const;
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index e54a093e28a..2439ec0b492 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -874,23 +874,6 @@ QString MingwToolChain::makeCommand() const
return QLatin1String("mingw32-make.exe");
}
-QString MingwToolChain::findInstalledJom()
-{
- if (Abi::hostAbi().os() != Abi::WindowsOS) {
- qWarning() << "Jom can only be used on Windows";
- return QString();
- }
-
- // We want jom! Try to find it.
- const QString jom = QLatin1String("jom.exe");
- const QFileInfo installedJom = QFileInfo(QCoreApplication::applicationDirPath()
- + QLatin1Char('/') + jom);
- if (installedJom.isFile() && installedJom.isExecutable())
- return installedJom.absoluteFilePath();
- else
- return jom;
-}
-
ToolChain *MingwToolChain::clone() const
{
return new MingwToolChain(*this);
diff --git a/src/plugins/projectexplorer/gcctoolchain.h b/src/plugins/projectexplorer/gcctoolchain.h
index 8aee14a93ad..8ab8111e5c2 100644
--- a/src/plugins/projectexplorer/gcctoolchain.h
+++ b/src/plugins/projectexplorer/gcctoolchain.h
@@ -145,7 +145,6 @@ public:
QString typeName() const;
Utils::FileName mkspec() const;
QString makeCommand() const;
- static QString findInstalledJom();
ToolChain *clone() const;
--
GitLab