feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Add a command to trigger parsing of CMake reply file

Browse Source 
Add a command to trigger the parsing of a given CMake file-api
reply file. This is important to have to help with debugging file-api
issues like QTCREATORBUG-24044.

Change-Id: Iadaa5cf01b9b6ddddf4e6ad669bb05928c6f29a5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Tobias Hunger
2020-06-10 10:58:35 +02:00
parent 8c830f79e7
commit 346b28f5f9
2 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
View File

@@ -30,11 +30,13 @@
#include "cmakeproject.h"
#include "cmakeprojectconstants.h"
#include "cmakeprojectnodes.h"
#include "fileapiparser.h"
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/icore.h>
#include <coreplugin/messagemanager.h>
#include <projectexplorer/buildmanager.h>
#include <projectexplorer/projectexplorer.h>
@@ -46,15 +48,19 @@
#include <utils/parameteraction.h>
#include <QAction>
#include <QFileDialog>
#include <QMessageBox>
using namespace ProjectExplorer;
using namespace CMakeProjectManager::Internal;
CMakeManager::CMakeManager() :
m_runCMakeAction(new QAction(QIcon(), tr("Run CMake"), this)),
m_clearCMakeCacheAction(new QAction(QIcon(), tr("Clear CMake Configuration"), this)),
m_runCMakeActionContextMenu(new QAction(QIcon(), tr("Run CMake"), this)),
m_rescanProjectAction(new QAction(QIcon(), tr("Rescan Project"), this))
CMakeManager::CMakeManager()
: m_runCMakeAction(new QAction(QIcon(), tr("Run CMake"), this))
, m_clearCMakeCacheAction(new QAction(QIcon(), tr("Clear CMake Configuration"), this))
, m_runCMakeActionContextMenu(new QAction(QIcon(), tr("Run CMake"), this))
, m_rescanProjectAction(new QAction(QIcon(), tr("Rescan Project"), this))
, m_parseAndValidateCMakeReplyFileAction(
new QAction(QIcon(), tr("Parse and verify a CMake reply file"), this))
{
Core::ActionContainer *mbuild =
Core::ActionManager::actionContainer(ProjectExplorer::Constants::M_BUILDPROJECT);
@@ -126,6 +132,13 @@ CMakeManager::CMakeManager() :
mbuild->addAction(command, ProjectExplorer::Constants::G_BUILD_BUILD);
connect(m_buildFileAction, &QAction::triggered, this, [this] { buildFile(); });
command = Core::ActionManager::registerAction(m_parseAndValidateCMakeReplyFileAction,
"CMakeProject.Debug.ParseAndVerifyReplyFile");
connect(m_parseAndValidateCMakeReplyFileAction,
&QAction::triggered,
this,
&CMakeManager::parseAndValidateCMakeReplyFile);
connect(SessionManager::instance(), &SessionManager::startupProjectChanged,
this, &CMakeManager::updateCmakeActions);
connect(BuildManager::instance(), &BuildManager::buildStateChanged,
@@ -214,6 +227,29 @@ void CMakeManager::enableBuildFileMenus(Node *node)
}
}
void CMakeManager::parseAndValidateCMakeReplyFile()
{
QString replyFile = QFileDialog::getOpenFileName(Core::ICore::mainWindow(),
tr("Select a CMake reply file"),
QString(),
QString("index*.json"));
if (replyFile.isEmpty())
return;
QString errorMessage;
auto result = FileApiParser::parseData(QFileInfo(replyFile), errorMessage);
const QString message
= errorMessage.isEmpty()
? tr("The reply file \"%1\" and referenced data parsed OK and passed validation.")
.arg(QDir::toNativeSeparators(replyFile))
: tr("The reply file \"%1\" failed to parse or validate with error "
"message:<br><b>\"%2\"</b>")
.arg(QDir::toNativeSeparators(replyFile))
.arg(errorMessage);
QMessageBox::information(Core::ICore::mainWindow(), tr("Parsing Result"), message);
}
void CMakeManager::buildFile(Node *node)
{
if (!node) {