Move most of the BuildConfiguration specific functions

Note: I didn't fix all the connects and there are a few missing things. This compiles, more work is coming.
2009-11-25 18:50:20 +01:00
parent 7949d93a1a
commit a312206306
39 changed files with 714 additions and 695 deletions
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -29,19 +29,132 @@

 #include "cmakebuildconfiguration.h"
 #include "cmakeproject.h"
+#include <projectexplorer/projectexplorerconstants.h>

 using namespace CMakeProjectManager;
 using namespace Internal;

 CMakeBuildConfiguration::CMakeBuildConfiguration(CMakeProject *pro)
-    : BuildConfiguration(pro)
+    : BuildConfiguration(pro), m_toolChain(0)
 {

 }

 CMakeBuildConfiguration::CMakeBuildConfiguration(BuildConfiguration *source)
-    : BuildConfiguration(source)
+    : BuildConfiguration(source), m_toolChain(0)
 {

 }

+CMakeBuildConfiguration::~CMakeBuildConfiguration()
+{
+    delete m_toolChain;
+}
+
+ProjectExplorer::Environment CMakeBuildConfiguration::baseEnvironment() const
+{
+    ProjectExplorer::Environment env = useSystemEnvironment() ?
+                                       ProjectExplorer::Environment(QProcess::systemEnvironment()) :
+                                       ProjectExplorer::Environment();
+    return env;
+}
+
+ProjectExplorer::Environment CMakeBuildConfiguration::environment() const
+{
+    ProjectExplorer::Environment env = baseEnvironment();
+    env.modify(userEnvironmentChanges());
+    return env;
+}
+
+void CMakeBuildConfiguration::setUseSystemEnvironment(bool b)
+{
+    if (b == useSystemEnvironment())
+        return;
+    setValue("clearSystemEnvironment", !b);
+    emit environmentChanged();
+}
+
+bool CMakeBuildConfiguration::useSystemEnvironment() const
+{
+    bool b = !(value("clearSystemEnvironment").isValid() &&
+               value("clearSystemEnvironment").toBool());
+    return b;
+}
+
+QList<ProjectExplorer::EnvironmentItem> CMakeBuildConfiguration::userEnvironmentChanges() const
+{
+    return ProjectExplorer::EnvironmentItem::fromStringList(value("userEnvironmentChanges").toStringList());
+}
+
+void CMakeBuildConfiguration::setUserEnvironmentChanges(const QList<ProjectExplorer::EnvironmentItem> &diff)
+{
+    QStringList list = ProjectExplorer::EnvironmentItem::toStringList(diff);
+    if (list == value("userEnvironmentChanges"))
+        return;
+    setValue("userEnvironmentChanges", list);
+    emit environmentChanged();
+}
+
+QString CMakeBuildConfiguration::buildDirectory() const
+{
+    QString buildDirectory = value("buildDirectory").toString();
+    if (buildDirectory.isEmpty())
+        buildDirectory = static_cast<CMakeProject *>(project())->sourceDirectory() + "/qtcreator-build";
+    return buildDirectory;
+}
+
+QString CMakeBuildConfiguration::buildParser() const
+{
+    // TODO this is actually slightly wrong, but do i care?
+    // this should call toolchain(configuration)
+    if (!m_toolChain)
+        return QString::null;
+    if (m_toolChain->type() == ProjectExplorer::ToolChain::GCC
+        //|| m_toolChain->type() == ProjectExplorer::ToolChain::LinuxICC
+        || m_toolChain->type() == ProjectExplorer::ToolChain::MinGW) {
+        return ProjectExplorer::Constants::BUILD_PARSER_GCC;
+    } else if (m_toolChain->type() == ProjectExplorer::ToolChain::MSVC
+               || m_toolChain->type() == ProjectExplorer::ToolChain::WINCE) {
+        return ProjectExplorer::Constants::BUILD_PARSER_MSVC;
+    }
+    return QString::null;
+}
+
+ProjectExplorer::ToolChain::ToolChainType CMakeBuildConfiguration::toolChainType() const
+{
+    if (m_toolChain)
+        return m_toolChain->type();
+    return ProjectExplorer::ToolChain::UNKNOWN;
+}
+
+ProjectExplorer::ToolChain *CMakeBuildConfiguration::toolChain() const
+{
+    return m_toolChain;
+}
+
+void CMakeBuildConfiguration::updateToolChain(const QString &compiler)
+{
+    //qDebug()<<"CodeBlocks Compilername"<<compiler
+    ProjectExplorer::ToolChain *newToolChain = 0;
+    if (compiler == "gcc") {
+#ifdef Q_OS_WIN
+        newToolChain = ProjectExplorer::ToolChain::createMinGWToolChain("gcc", QString());
+#else
+        newToolChain = ProjectExplorer::ToolChain::createGccToolChain("gcc");
+#endif
+    } else if (compiler == "msvc8") {
+        newToolChain = ProjectExplorer::ToolChain::createMSVCToolChain(value("msvcVersion").toString(), false);
+    } else {
+    }
+
+    if (ProjectExplorer::ToolChain::equals(newToolChain, m_toolChain)) {
+        delete newToolChain;
+        newToolChain = 0;
+    } else {
+        delete m_toolChain;
+        m_toolChain = newToolChain;
+    }
+}
+
+
+