GUI: add clang-tidy
This commit is contained in:
Daniel Marjamäki
parent
7468b40a5e
commit
c2bb9890e9
|
|
@ -25,6 +25,9 @@
|
|||
#include "threadresult.h"
|
||||
#include "cppcheck.h"
|
||||
|
||||
static const char CLANG[] = "clang";
|
||||
static const char CLANGTIDY[] = "clang-tidy";
|
||||
|
||||
CheckThread::CheckThread(ThreadResult &result) :
|
||||
mState(Ready),
|
||||
mResult(result),
|
||||
|
|
@ -110,26 +113,35 @@ void CheckThread::runAddons(const QString &addonPath, const ImportProject::FileS
|
|||
QString dumpFile;
|
||||
|
||||
foreach (const QString addon, mAddons) {
|
||||
if (addon == "clang") {
|
||||
if (addon == CLANG || addon == CLANGTIDY) {
|
||||
if (!fileSettings)
|
||||
continue;
|
||||
QString cmd("clang --analyze");
|
||||
|
||||
QString args;
|
||||
for (std::list<std::string>::const_iterator I = fileSettings->includePaths.begin(); I != fileSettings->includePaths.end(); ++I)
|
||||
cmd += " -I" + QString::fromStdString(*I);
|
||||
args += " -I" + QString::fromStdString(*I);
|
||||
for (std::list<std::string>::const_iterator i = fileSettings->systemIncludePaths.begin(); i != fileSettings->systemIncludePaths.end(); ++i)
|
||||
cmd += " -isystem " + QString::fromStdString(*i);
|
||||
args += " -isystem " + QString::fromStdString(*i);
|
||||
foreach (QString D, QString::fromStdString(fileSettings->defines).split(";")) {
|
||||
cmd += " -D" + D;
|
||||
args += " -D" + D;
|
||||
}
|
||||
if (!fileSettings->standard.empty())
|
||||
cmd += " -std=" + QString::fromStdString(fileSettings->standard);
|
||||
cmd += ' ' + fileName;
|
||||
args += " -std=" + QString::fromStdString(fileSettings->standard);
|
||||
|
||||
QString cmd;
|
||||
if (addon == CLANG)
|
||||
cmd = addon + " --analyze" + args + ' ' + fileName;
|
||||
else
|
||||
cmd = addon + " -checks=*,-clang*,-llvm* " + fileName + " -- " + args;
|
||||
qDebug() << cmd;
|
||||
|
||||
QProcess process;
|
||||
process.start(cmd);
|
||||
process.waitForFinished(600*1000);
|
||||
parseClangErrors(process.readAllStandardError());
|
||||
if (addon == CLANG)
|
||||
parseClangErrors(process.readAllStandardError());
|
||||
else
|
||||
parseClangErrors(process.readAllStandardOutput());
|
||||
} else {
|
||||
QString a;
|
||||
if (QFileInfo(addonPath + '/' + addon + ".py").exists())
|
||||
|
|
@ -225,8 +237,16 @@ void CheckThread::parseClangErrors(QString err)
|
|||
const std::string filename = r.cap(1).toStdString();
|
||||
const int lineNumber = r.cap(2).toInt();
|
||||
Severity::SeverityType severity = (r.cap(3) == "warning") ? Severity::warning : Severity::error;
|
||||
const std::string message = r.cap(4).toStdString();
|
||||
const std::string id = "clang";
|
||||
std::string message, id;
|
||||
QRegExp r2("(.*)\\[([a-zA-Z0-9\\-_\\.]+)\\]");
|
||||
if (r2.exactMatch(r.cap(4))) {
|
||||
message = r2.cap(1).toStdString();
|
||||
id = r2.cap(2).toStdString();
|
||||
} else {
|
||||
message = r.cap(4).toStdString();
|
||||
id = CLANG;
|
||||
}
|
||||
|
||||
std::list<ErrorLogger::ErrorMessage::FileLocation> callstack;
|
||||
callstack.push_back(ErrorLogger::ErrorMessage::FileLocation(filename, lineNumber));
|
||||
ErrorLogger::ErrorMessage errmsg(callstack, filename, severity, message, id, false);
|
||||
|
|
|
|||
|
|
@ -132,6 +132,8 @@ void ProjectFileDialog::saveSettings() const
|
|||
|
||||
void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
|
||||
{
|
||||
mUI.mToolClang->setChecked(projectFile->getAddons().contains("clang"));
|
||||
mUI.mToolClangTidy->setChecked(projectFile->getAddons().contains("clang-tidy"));
|
||||
setRootPath(projectFile->getRootPath());
|
||||
setBuildDir(projectFile->getBuildDir());
|
||||
setIncludepaths(projectFile->getIncludeDirs());
|
||||
|
|
@ -145,7 +147,6 @@ void ProjectFileDialog::loadFromProjectFile(const ProjectFile *projectFile)
|
|||
mUI.mAddonY2038->setChecked(projectFile->getAddons().contains("y2038"));
|
||||
mUI.mAddonCert->setChecked(projectFile->getAddons().contains("cert"));
|
||||
mUI.mAddonMisra->setChecked(projectFile->getAddons().contains("misra"));
|
||||
mUI.mClang->setChecked(projectFile->getAddons().contains("clang"));
|
||||
updatePathsAndDefines();
|
||||
}
|
||||
|
||||
|
|
@ -161,6 +162,10 @@ void ProjectFileDialog::saveToProjectFile(ProjectFile *projectFile) const
|
|||
projectFile->setLibraries(getLibraries());
|
||||
projectFile->setSuppressions(getSuppressions());
|
||||
QStringList list;
|
||||
if (mUI.mToolClang->isChecked())
|
||||
list << "clang";
|
||||
if (mUI.mToolClangTidy->isChecked())
|
||||
list << "clang-tidy";
|
||||
if (mUI.mAddonThreadSafety->isChecked())
|
||||
list << "threadsafety";
|
||||
if (mUI.mAddonY2038->isChecked())
|
||||
|
|
@ -169,8 +174,6 @@ void ProjectFileDialog::saveToProjectFile(ProjectFile *projectFile) const
|
|||
list << "cert";
|
||||
if (mUI.mAddonMisra->isChecked())
|
||||
list << "misra";
|
||||
if (mUI.mClang->isChecked())
|
||||
list << "clang";
|
||||
projectFile->setAddons(list);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -19,93 +19,48 @@
|
|||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="mTabProject">
|
||||
<widget class="QWidget" name="mTabTools">
|
||||
<attribute name="title">
|
||||
<string>Project</string>
|
||||
<string>Tools</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_7">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_12">
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_4">
|
||||
<item>
|
||||
<widget class="QLabel" name="mLabelProjectRoot">
|
||||
<property name="text">
|
||||
<string>&Root:</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>mEditProjectRoot</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="mEditProjectRoot"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<item>
|
||||
<widget class="QLabel" name="mLabelBuildDir">
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>In the build dir, cppcheck stores data about each translation unit.</p><p>With a build dir you get whole program analysis.</p><p>Unchanged files will be analyzed much faster; Cppcheck skip the analysis of these files and reuse their old data.</p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Cppcheck build dir (whole program analysis, faster analysis for unchanged files)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<item>
|
||||
<widget class="QLineEdit" name="mEditBuildDir"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="mBtnBrowseBuildDir">
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="mLayoutLibraries">
|
||||
<item>
|
||||
<widget class="QLabel" name="mLabelLibraries">
|
||||
<property name="text">
|
||||
<string>Libraries:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="mLabelLibrariesNote">
|
||||
<widget class="QLabel" name="label_3">
|
||||
<property name="text">
|
||||
<string>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
<string>It is common best practice to use several tools.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer_9">
|
||||
<widget class="QCheckBox" name="mToolClang">
|
||||
<property name="text">
|
||||
<string>Clang</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="mToolClangTidy">
|
||||
<property name="text">
|
||||
<string>Clang-tidy</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer_7">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>96</height>
|
||||
<height>310</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="mTabOther">
|
||||
<widget class="QWidget" name="mTabPathsAndDefines">
|
||||
<attribute name="title">
|
||||
<string>Paths and Defines</string>
|
||||
</attribute>
|
||||
|
|
@ -356,6 +311,92 @@
|
|||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="mTabProject">
|
||||
<attribute name="title">
|
||||
<string>Project</string>
|
||||
</attribute>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_7">
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_4">
|
||||
<item>
|
||||
<widget class="QLabel" name="mLabelProjectRoot">
|
||||
<property name="text">
|
||||
<string>&Root:</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>mEditProjectRoot</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="mEditProjectRoot"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<item>
|
||||
<widget class="QLabel" name="mLabelBuildDir">
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>In the build dir, cppcheck stores data about each translation unit.</p><p>With a build dir you get whole program analysis.</p><p>Unchanged files will be analyzed much faster; Cppcheck skip the analysis of these files and reuse their old data.</p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Cppcheck build dir (whole program analysis, faster analysis for unchanged files)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<item>
|
||||
<widget class="QLineEdit" name="mEditBuildDir"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="mBtnBrowseBuildDir">
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="mLayoutLibraries">
|
||||
<item>
|
||||
<widget class="QLabel" name="mLabelLibraries">
|
||||
<property name="text">
|
||||
<string>Libraries:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="mLabelLibrariesNote">
|
||||
<property name="text">
|
||||
<string>Note: Put your own custom .cfg files in the same folder as the project file. You should see them above.</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer_9">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>96</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="mTabExclude">
|
||||
<attribute name="title">
|
||||
<string>Exclude</string>
|
||||
|
|
@ -415,7 +456,7 @@
|
|||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="tabSuppressions">
|
||||
<widget class="QWidget" name="mTabSuppressions">
|
||||
<attribute name="title">
|
||||
<string>Suppressions</string>
|
||||
</attribute>
|
||||
|
|
@ -463,7 +504,7 @@
|
|||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="tab">
|
||||
<widget class="QWidget" name="mTabAddons">
|
||||
<attribute name="title">
|
||||
<string>Addons</string>
|
||||
</attribute>
|
||||
|
|
@ -503,20 +544,6 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string>Other</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="mClang">
|
||||
<property name="text">
|
||||
<string>clang (experimental)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer_5">
|
||||
<property name="orientation">
|
||||
|
|
|
|||
Loading…
Reference in New Issue