Merge pull request #8642 from 4fury/master
cppcheck: version bump with gui.
This commit is contained in:
Kamil ATLI
GitHub
@@ -4,21 +4,32 @@
|
||||
# Licensed under the GNU General Public License, version 3.
|
||||
# See the file https://www.gnu.org/licenses/gpl-3.0.txt
|
||||
|
||||
from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import shelltools
|
||||
from pisi.actionsapi import cmaketools
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import get
|
||||
|
||||
t = 'FILESDIR=/usr/share/cppcheck CFGDIR=/usr/share/cppcheck/cfg'
|
||||
j = "-DHAVE_RULES=ON \
|
||||
-DBUILD_GUI=ON \
|
||||
-DWITH_QCHART=ON \
|
||||
-DENABLE_CHECK_INTERNAL=ON -L \
|
||||
"
|
||||
|
||||
def setup():
|
||||
shelltools.makedirs("build")
|
||||
shelltools.cd("build")
|
||||
cmaketools.configure("-DUSE_Z3=OFF -DBUILD_TESTS=OFF %s" % j, sourceDir = '..')
|
||||
|
||||
def build():
|
||||
pisitools.cxxflags.add("-DNDEBUG -Wall -Wno-sign-compare -Wno-unused-function")
|
||||
autotools.make("MATCHCOMPILER=yes %s HAVE_RULES=yes" % t)
|
||||
shelltools.cd("build")
|
||||
cmaketools.make()
|
||||
|
||||
def check():
|
||||
autotools.make("check %s" % t)
|
||||
#def check():
|
||||
# cmaketools.make("test")
|
||||
|
||||
def install():
|
||||
autotools.rawInstall("DESTDIR=%s %s" % (get.installDIR(), t))
|
||||
shelltools.cd("build")
|
||||
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
|
||||
|
||||
pisitools.dodoc("AUTHORS", "COPYING", "readme*")
|
||||
pisitools.dodoc("../AUTHORS", "../COPYING", "../readme*")
|
||||
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
--- a/gui/CMakeLists.txt 2020-05-10 12:31:19.000000000 +0300
|
||||
+++ b/gui/CMakeLists.txt 2020-05-28 16:22:24.704402614 +0300
|
||||
@@ -37,7 +37,7 @@
|
||||
endif()
|
||||
|
||||
install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
|
||||
- install(FILES ${qms} DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
|
||||
+ install(FILES ${qms} DESTINATION share/${PROJECT_NAME}/lang COMPONENT applications)
|
||||
|
||||
install(FILES cppcheck-gui.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
|
||||
|
||||
--- a/gui/translationhandler.cpp 2020-05-28 16:29:27.334549404 +0300
|
||||
+++ b/gui/translationhandler.cpp 2020-05-28 16:27:15.183706532 +0300
|
||||
@@ -116,15 +116,16 @@
|
||||
if (datadir.isEmpty())
|
||||
datadir = appPath;
|
||||
|
||||
- QString translationFile;
|
||||
- if (QFile::exists(datadir + "/lang/" + mTranslations[index].mFilename + ".qm"))
|
||||
- translationFile = datadir + "/lang/" + mTranslations[index].mFilename + ".qm";
|
||||
+// QString translationFile;
|
||||
+// if (QFile::exists(datadir + "/lang/" + mTranslations[index].mFilename + ".qm"))
|
||||
+// translationFile = datadir + "/lang/" + mTranslations[index].mFilename + ".qm";
|
||||
|
||||
- else if (QFile::exists(datadir + "/" + mTranslations[index].mFilename + ".qm"))
|
||||
- translationFile = datadir + "/" + mTranslations[index].mFilename + ".qm";
|
||||
+// else if (QFile::exists(datadir + "/" + mTranslations[index].mFilename + ".qm"))
|
||||
+// translationFile = datadir + "/" + mTranslations[index].mFilename + ".qm";
|
||||
|
||||
- else
|
||||
- translationFile = appPath + "/" + mTranslations[index].mFilename + ".qm";
|
||||
+// else
|
||||
+// translationFile = appPath + "/" + mTranslations[index].mFilename + ".qm";
|
||||
+ QString translationFile("/usr/share/Cppcheck/lang/" + mTranslations[index].mFilename + ".qm");
|
||||
|
||||
if (!mTranslator->load(translationFile) && !failure) {
|
||||
//If it failed, lets check if the default file exists
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>cppcheck</Name>
|
||||
@@ -15,25 +15,69 @@
|
||||
<Description>
|
||||
Cppcheck is a static analysis tool for C/C++ code. It provides unique code analysis to detect bugs and focuses on detecting undefined behaviour and dangerous coding constructs. The goal is to detect only real errors in the code (i.e. have very few false positives).
|
||||
</Description>
|
||||
<Archive sha1sum="852d69a60b6caf023a3420943ebdc29e99fd0349" type="targz">https://github.com/danmar/cppcheck/archive/1.90.tar.gz</Archive>
|
||||
<Archive sha1sum="e59758410408fa0679df06e8c3f3dd4e8c930d00" type="targz">
|
||||
https://github.com/danmar/cppcheck/archive/2.1.tar.gz
|
||||
</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>cmake</Dependency>
|
||||
<Dependency>python3</Dependency>
|
||||
<!-- <Dependency>z3-devel</Dependency> -->
|
||||
<Dependency>zlib-devel</Dependency>
|
||||
<Dependency>qt5-linguist</Dependency>
|
||||
<Dependency>libpcre-devel</Dependency>
|
||||
<Dependency>qt5-base-devel</Dependency>
|
||||
<Dependency>tinyxml2-devel</Dependency>
|
||||
<Dependency>qt5-charts-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch level="1">qm_install_path.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>cppcheck</Name>
|
||||
<RuntimeDependencies>
|
||||
<!-- <Dependency>z3</Dependency> -->
|
||||
<Dependency>libgcc</Dependency>
|
||||
<Dependency>libpcre</Dependency>
|
||||
<Dependency>python3</Dependency>
|
||||
<Dependency>python3-Pygments</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
<Path fileType="data">/usr/share/cppcheck</Path>
|
||||
<Path fileType="executable">/usr/bin/cppcheck</Path>
|
||||
<Path fileType="data">/usr/share</Path>
|
||||
<!-- <Path fileType="man">/usr/share/man</Path> -->
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<IsA>app:gui</IsA>
|
||||
<Name>cppcheck-gui</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">cppcheck</Dependency>
|
||||
<!-- <Dependency>z3</Dependency> -->
|
||||
<Dependency>libgcc</Dependency>
|
||||
<Dependency>libpcre</Dependency>
|
||||
<Dependency>qt5-base</Dependency>
|
||||
<Dependency>qt5-charts</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="executable">/usr/bin/cppcheck-gui</Path>
|
||||
<Path fileType="data">/usr/share/applications</Path>
|
||||
<Path fileType="data">/usr/share/icons</Path>
|
||||
<Path fileType="localedata">/usr/share/Cppcheck/lang</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="3">
|
||||
<Date>2020-06-27</Date>
|
||||
<Version>2.1</Version>
|
||||
<Comment>Ver. bump</Comment>
|
||||
<Name>fury</Name>
|
||||
<Email>wascheme@tuta.io</Email>
|
||||
</Update>
|
||||
<Update release="2">
|
||||
<Date>2020-04-16</Date>
|
||||
<Version>1.90</Version>
|
||||
|
||||
Reference in New Issue
Block a user