Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/cmakecache-4.1 into lp:qtcreator-plugin-ubuntu

[Benjamin Zeller]

Refactored CMakePlugin uses a temporary dir as long as the builddir was not created.
We can now get the CMakeCache information directly from the plugin.

Refactored CMakePlugin uses a temporary dir as long as the builddir was not created.
We can now get the CMakeCache information directly from the plugin.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:473
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/58/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5777/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/58/rebuild

review: Needs Fixing (continuous-integration)

[Zoltan Balogh (bzoltan)]

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:474
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/59/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5778/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/qtcreator-ide-ci-amd64/59/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'UbuntuPlugin.pro'
--- UbuntuPlugin.pro	2016-07-20 14:56:52 +0000
+++ UbuntuPlugin.pro	2016-09-05 17:16:02 +0000
@@ -88,7 +88,6 @@
     src/ubuntu/ubuntuabstractguieditordocument.cpp \
     src/ubuntu/ubuntuapparmoreditor.cpp \
     src/ubuntu/ubuntueditorfactory.cpp \
-    src/ubuntu/ubuntucmakecache.cpp \
     src/ubuntu/ubuntutestcontrol.cpp \
     src/ubuntu/ubuntupackageoutputparser.cpp \
     src/ubuntu/ubuntuprojecthelper.cpp \
@@ -156,7 +155,6 @@
     src/ubuntu/ubuntuabstractguieditordocument.h \
     src/ubuntu/ubuntuapparmoreditor.h \
     src/ubuntu/ubuntueditorfactory.h \
-    src/ubuntu/ubuntucmakecache.h \
     src/ubuntu/ubuntutestcontrol.h \
     src/ubuntu/ubuntupackageoutputparser.h \
     src/ubuntu/ubuntuprojecthelper.h \
 
=== modified file 'src/ubuntu/device/container/ubuntulocalrunconfiguration.cpp'
--- src/ubuntu/device/container/ubuntulocalrunconfiguration.cpp	2016-08-29 15:46:17 +0000
+++ src/ubuntu/device/container/ubuntulocalrunconfiguration.cpp	2016-09-05 17:16:02 +0000
@@ -21,7 +21,6 @@
 #include <ubuntu/ubuntuprojecthelper.h>
 #include <ubuntu/ubuntuclickmanifest.h>
 #include <ubuntu/device/remote/ubunturemoterunconfiguration.h>
-#include <ubuntu/ubuntucmakecache.h>
 #include <ubuntu/ubuntuprojecthelper.h>
 #include <ubuntu/ubuntuclicktool.h>
 #include <ubuntu/clicktoolchain.h>
 
=== modified file 'src/ubuntu/device/container/ubuntulocalrunconfigurationfactory.cpp'
--- src/ubuntu/device/container/ubuntulocalrunconfigurationfactory.cpp	2016-07-20 14:56:52 +0000
+++ src/ubuntu/device/container/ubuntulocalrunconfigurationfactory.cpp	2016-09-05 17:16:02 +0000
@@ -20,7 +20,6 @@
 #include <ubuntu/ubuntuprojecthelper.h>
 #include <ubuntu/clicktoolchain.h>
 #include <ubuntu/ubuntuclickmanifest.h>
-#include <ubuntu/ubuntucmakecache.h>
 #include <ubuntu/ubuntushared.h>
 
 #include <ubuntu/device/remote/ubunturemoterunconfiguration.h>
 
=== removed file 'src/ubuntu/ubuntucmakecache.cpp'
--- src/ubuntu/ubuntucmakecache.cpp	2016-07-20 14:56:52 +0000
+++ src/ubuntu/ubuntucmakecache.cpp	1970-01-01 00:00:00 +0000
@@ -1,130 +0,0 @@
-#include "ubuntucmakecache.h"
-
-#include <projectexplorer/session.h>
-#include <projectexplorer/project.h>
-#include <projectexplorer/target.h>
-#include <projectexplorer/buildconfiguration.h>
-#include <cmakeprojectmanager/cmakeprojectconstants.h>
-
-#include <QRegularExpression>
-#include <QDir>
-#include <QDebug>
-
-namespace Ubuntu{
-namespace Internal {
-
-enum {
-    debug = 0
-};
-
-/*!
- * \class UbuntuCMakeCache::UbuntuCMakeCache
- * Automatic updating value cache, this reads all relevant CMakeCache files
- * and stores some for quick querying
- */
-
-UbuntuCMakeCache * UbuntuCMakeCache::m_instance = nullptr;
-
-UbuntuCMakeCache::UbuntuCMakeCache(QObject *parent) :
-    QObject(parent)
-{
-    Q_ASSERT_X(m_instance == nullptr,Q_FUNC_INFO,"There can be only one UbuntuCMakeCache instance");
-    m_instance = this;
-
-    connect(ProjectExplorer::SessionManager::instance(),SIGNAL(aboutToRemoveProject(ProjectExplorer::Project *)),
-            this,SLOT(onAboutToRemoveProject(ProjectExplorer::Project*)));
-}
-
-QVariant UbuntuCMakeCache::getValue(const QString &key, ProjectExplorer::BuildConfiguration *bc, const QVariant defaultValue)
-{
-    UbuntuCMakeCache *inst = instance();
-    if(!inst || !bc)
-        return defaultValue;
-
-    Utils::FileName cacheFile = bc->buildDirectory().appendPath(QStringLiteral("CMakeCache.txt"));
-    QString cacheKey = inst->normalize(cacheFile.toString());
-
-    bool needsRefresh = false;
-    if(!inst->m_map.contains(cacheKey)) {
-        //we need to read it
-        needsRefresh = true;
-    } else {
-        //check if the file has changed since the last read
-        inst->m_map[cacheKey].cacheFile.refresh();
-        if(debug) qDebug()<<"File Last Read "<<inst->m_map[cacheKey].cacheFile.lastModified()
-                         <<"Cache Last Read "<<inst->m_map[cacheKey].lastRead;
-        if(inst->m_map[cacheKey].cacheFile.lastModified() != inst->m_map[cacheKey].lastRead) {
-            needsRefresh = true;
-        }
-    }
-
-    if(needsRefresh)
-        inst->refreshCache(cacheKey, cacheFile);
-
-    if(inst->m_map[cacheKey].values.contains(key))
-        return inst->m_map[cacheKey].values[key];
-
-    return defaultValue;
-}
-
-UbuntuCMakeCache *UbuntuCMakeCache::instance()
-{
-    return m_instance;
-}
-
-void UbuntuCMakeCache::onAboutToRemoveProject(ProjectExplorer::Project *p)
-{
-    if(!p)
-        return;
-
-    //remove all values that belong to the project
-    for (ProjectExplorer::Target *t : p->targets()) {
-        for(ProjectExplorer::BuildConfiguration *bc : t->buildConfigurations()) {
-            Utils::FileName cacheFile = bc->buildDirectory().appendPath(QStringLiteral("CMakeCache.txt"));
-            m_map.remove(normalize(cacheFile.toString()));
-        }
-    }
-}
-
-QString UbuntuCMakeCache::normalize(const QString &path) const
-{
-    return QDir::cleanPath(path);
-}
-
-void UbuntuCMakeCache::refreshCache(const QString &key, const Utils::FileName &fName)
-{
-    if(debug) qDebug()<<"Rebuilding cache for: "<<key;
-    UbuntuCMakeCacheEntry *entry = nullptr;
-    if(m_map.contains(key)) {
-        entry = &m_map[key];
-        entry->lastRead = fName.toFileInfo().lastModified();
-    } else {
-        QFileInfo fInfo = fName.toFileInfo();
-        entry = &m_map.insert(key,UbuntuCMakeCacheEntry{fInfo,fInfo.lastModified(),CMakeCacheValueMap()}).value();
-    }
-
-    QFile cache(fName.toString());
-    if(cache.exists() && cache.open(QIODevice::ReadOnly)) {
-        static const QRegularExpression regExpPType(QLatin1String("^UBUNTU_PROJECT_TYPE:(.*)=\\s*(\\S*)\\s*$"));
-        static const QRegularExpression regExpManifestPath (QLatin1String("^UBUNTU_MANIFEST_PATH:(.*)=\\s*(\\S*)\\s*$"));
-        QTextStream in(&cache);
-        while (!in.atEnd()) {
-            QString contents = in.readLine();
-            QRegularExpressionMatch m = regExpPType.match(contents);
-            if(m.hasMatch()) {
-                entry->values.insert(QStringLiteral("UBUNTU_PROJECT_TYPE"),m.captured(2));
-                continue;
-            }
-            m = regExpManifestPath.match(contents);
-            if(m.hasMatch()) {
-                entry->values.insert(QStringLiteral("UBUNTU_MANIFEST_PATH"),m.captured(2));
-                continue;
-            }
-        }
-
-
-    }
-}
-
-}}
-
 
=== removed file 'src/ubuntu/ubuntucmakecache.h'
--- src/ubuntu/ubuntucmakecache.h	2014-08-20 07:38:07 +0000
+++ src/ubuntu/ubuntucmakecache.h	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-#ifndef UBUNTUCMAKECACHE_H
-#define UBUNTUCMAKECACHE_H
-
-#include <QObject>
-#include <QHash>
-#include <QMap>
-#include <QVariant>
-#include <QDateTime>
-#include <QFileInfo>
-
-#include <utils/fileutils.h>
-
-namespace ProjectExplorer {
-    class Project;
-    class Target;
-    class BuildConfiguration;
-}
-
-namespace Ubuntu{
-namespace Internal {
-
-typedef QMap<QString,QVariant> CMakeCacheValueMap;
-
-struct UbuntuCMakeCacheEntry {
-    QFileInfo cacheFile;
-    QDateTime lastRead;
-    CMakeCacheValueMap values;
-};
-
-typedef QMap<QString,UbuntuCMakeCacheEntry> CMakeCache;
-
-class UbuntuCMakeCache : public QObject
-{
-    Q_OBJECT
-public:
-    explicit UbuntuCMakeCache(QObject *parent = 0);
-
-    static QVariant getValue (const QString &key, ProjectExplorer::BuildConfiguration *bc, const QVariant defaultValue = QVariant());
-    static UbuntuCMakeCache *instance();
-
-private slots:
-    void onAboutToRemoveProject (ProjectExplorer::Project *p);
-
-private:
-    QString normalize (const QString &path) const;
-    void refreshCache (const QString &key, const Utils::FileName &fName);
-
-private:
-    CMakeCache m_map;
-    static UbuntuCMakeCache *m_instance;
-
-};
-
-}}
-
-
-
-#endif // UBUNTUCMAKECACHE_H
 
=== modified file 'src/ubuntu/ubuntupackagingmodel.cpp'
--- src/ubuntu/ubuntupackagingmodel.cpp	2016-07-20 14:56:52 +0000
+++ src/ubuntu/ubuntupackagingmodel.cpp	2016-09-05 17:16:02 +0000
@@ -23,7 +23,6 @@
 #include "ubuntuvalidationresultmodel.h"
 #include "ubuntupackagestep.h"
 #include "ubuntushared.h"
-#include "ubuntucmakecache.h"
 #include "ubuntuprojecthelper.h"
 #include "ubuntufixmanifeststep.h"
 #include "wizards/ubuntufatpackagingwizard.h"
 
=== modified file 'src/ubuntu/ubuntuplugin.cpp'
--- src/ubuntu/ubuntuplugin.cpp	2016-07-20 14:56:52 +0000
+++ src/ubuntu/ubuntuplugin.cpp	2016-09-05 17:16:02 +0000
@@ -29,7 +29,6 @@
 #include "ubuntuqtversion.h"
 #include "ubuntuqmlbuildconfiguration.h"
 #include "ubuntueditorfactory.h"
-#include "ubuntucmakecache.h"
 #include "ubuntutestcontrol.h"
 #include "ubuntupackageoutputparser.h"
 #include "ubuntuprojecthelper.h"
@@ -175,7 +174,6 @@
 
     // Build support
     addAutoReleasedObject(new ClickToolChainFactory);
-    addAutoReleasedObject(new UbuntuCMakeCache);
     addAutoReleasedObject(new UbuntuHtmlBuildConfigurationFactory);
     addAutoReleasedObject(new UbuntuQmlBuildConfigurationFactory);
     addAutoReleasedObject(new UbuntuQmlBuildStepFactory);
 
=== modified file 'src/ubuntu/ubuntuprojecthelper.cpp'
--- src/ubuntu/ubuntuprojecthelper.cpp	2015-06-30 13:34:14 +0000
+++ src/ubuntu/ubuntuprojecthelper.cpp	2016-09-05 17:16:02 +0000
@@ -16,7 +16,6 @@
  * Author: Benjamin Zeller <[e-mail]>
  */
 #include "ubuntuprojecthelper.h"
-#include "ubuntucmakecache.h"
 
 #include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
@@ -24,6 +23,7 @@
 
 #include <cmakeprojectmanager/cmakeproject.h>
 #include <cmakeprojectmanager/cmakeprojectconstants.h>
+#include <cmakeprojectmanager/cmakebuildconfiguration.h>
 
 #include <qmakeprojectmanager/qmakeproject.h>
 #include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>
@@ -33,6 +33,7 @@
 #include <QDebug>
 
 #include <QFile>
+#include <QDir>
 #include <QTextStream>
 #include <QRegularExpression>
 
@@ -124,12 +125,24 @@
 QString UbuntuProjectHelper::getManifestPath(ProjectExplorer::Target *target, const QString &defaultValue)
 {
     if(target && target->project()->id() == CMakeProjectManager::Constants::CMAKEPROJECT_ID ) {
-        QVariant manifestPath = UbuntuCMakeCache::getValue(QStringLiteral("UBUNTU_MANIFEST_PATH"),
-                                                           target->activeBuildConfiguration(),
-                                                           defaultValue);
+
+        CMakeProjectManager::CMakeConfig fullCache = CMakeProjectManager::CMakeProject::activeCmakeCacheForTarget(target);
+
+        QString manifestPath;
+
+        QByteArray fromCache = CMakeProjectManager::CMakeConfigItem::valueOf("UBUNTU_MANIFEST_PATH", fullCache );
+        if (!fromCache.isEmpty()) {
+            manifestPath = QString::fromUtf8(fromCache);
+        } else {
+            manifestPath = defaultValue;
+        }
+
+        if(QDir::isAbsolutePath(manifestPath))
+            return manifestPath;
 
         Utils::FileName projectDir = target->project()->projectDirectory();
-        return projectDir.appendPath(manifestPath.toString()).toString();
+        return projectDir.appendPath(manifestPath).toString();
+
     } else if (target && target->project()->id() == QmakeProjectManager::Constants::QMAKEPROJECT_ID ) {
         QmakeProjectManager::QmakeProject *qmakeProj = static_cast<QmakeProjectManager::QmakeProject *>(target->project());
         QList<QmakeProjectManager::QmakeProFileNode *> nodes = qmakeProj->allProFiles();
 
=== modified file 'src/ubuntu/wizards/ubuntuprojectapplicationwizard.cpp'
--- src/ubuntu/wizards/ubuntuprojectapplicationwizard.cpp	2016-07-20 14:56:52 +0000
+++ src/ubuntu/wizards/ubuntuprojectapplicationwizard.cpp	2016-09-05 17:16:02 +0000
@@ -27,6 +27,7 @@
 #include <utils/qtcassert.h>
 #include <utils/pathchooser.h>
 #include <utils/mimetypes/mimedatabase.h>
+#include <utils/algorithm.h>
 #include <qtsupport/qtkitinformation.h>
 #include <qtsupport/qtsupportconstants.h>
 #include <projectexplorer/kitmanager.h>
@@ -171,39 +172,37 @@
         delete m_targetSetupPage;
 }
 
-bool UbuntuProjectApplicationWizardDialog::writeUserFile(const QString &projectFileName) const
+void UbuntuProjectApplicationWizardDialog::writeUserFile(const QString &projectFileName) const
 {
     if (!m_targetSetupPage)
-        return false;
+        return;
 
     QFileInfo fi = QFileInfo(projectFileName);
     if (!fi.exists())
-        return false;
+        return;
 
     QString filePath = fi.canonicalFilePath();
 
     Utils::MimeDatabase mimeDb;
     const Utils::MimeType mt = mimeDb.mimeTypeForFile(fi);
     if (mt.isValid()) {
-        QList<ProjectExplorer::IProjectManager*> allProjectManagers = ExtensionSystem::PluginManager::getObjects<ProjectExplorer::IProjectManager>();
-        foreach (ProjectExplorer::IProjectManager *manager, allProjectManagers) {
-            if (manager->mimeType() == mt.name()) {
-                QString tmp;
-                if (ProjectExplorer::Project *pro = manager->openProject(filePath, &tmp)) {
-                    if(debug) qDebug()<<"Storing project type settings: "<<pro->id().toSetting();
 
-                    bool success = m_targetSetupPage->setupProject(pro);
-                    if(success) {
-                        pro->saveSettings();
-                    }
-                    delete pro;
-                    return success;
-                }
-                break;
+        QString tmp;
+        QList<ProjectExplorer::IProjectManager *> managerList = ExtensionSystem::PluginManager::getObjects<ProjectExplorer::IProjectManager>();
+        auto manager = Utils::findOrDefault(managerList, Utils::equal(&ProjectExplorer::IProjectManager::mimeType, mt.name()));
+        ProjectExplorer::Project *project = manager ? manager->openProject(filePath, &tmp) : 0;
+        if(project) {
+            if (m_targetSetupPage->setupProject(project)) {
+                if(debug) qDebug()<<"Storing project type settings: "<<project->id().toSetting();
+                project->saveSettings();
             }
+            delete project;
+            project = nullptr;
         }
+
+        return;
     }
-    return false;
+    return;
 }
 
 
 
=== modified file 'src/ubuntu/wizards/ubuntuprojectapplicationwizard.h'
--- src/ubuntu/wizards/ubuntuprojectapplicationwizard.h	2016-07-20 14:56:52 +0000
+++ src/ubuntu/wizards/ubuntuprojectapplicationwizard.h	2016-09-05 17:16:02 +0000
@@ -76,7 +76,7 @@
     void addTargetSetupPage(int id = -1);
 
     QList<Core::Id> selectedKits() const;
-    bool writeUserFile(const QString &projectFileName) const;
+    void writeUserFile(const QString &projectFileName) const;
 private slots:
     void generateProfileName(const QString &projectName, const QString &path);
 private: