Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cppcheck: version bump, add z3.

Browse Source
This commit is contained in:
4fury-c3440d8
2020-10-09 03:43:53 +03:00
parent 49ca3bba62
commit 226159bd5b
7 changed files with 275 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programming/tool/cppcheck/actions.py
+12 -7
View File
@@ -9,27 +9,32 @@ from pisi.actionsapi import cmaketools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
j = "-DHAVE_RULES=ON \
j = "-DUSE_Z3=ON \
-DHAVE_RULES=ON \
-DBUILD_GUI=ON \
-DWITH_QCHART=ON \
-DENABLE_CHECK_INTERNAL=ON -L \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_TESTS=OFF \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF \
-DENABLE_CHECK_INTERNAL=ON \
-DWITH_QCHART=ON -L \
"
def setup():
shelltools.makedirs("build")
shelltools.cd("build")
cmaketools.configure("-DUSE_Z3=OFF -DBUILD_TESTS=OFF %s" % j, sourceDir = '..')
cmaketools.configure(j, sourceDir = '..')
def build():
shelltools.cd("build")
cmaketools.make()
#def check():
# cmaketools.make("test")
def check():
pass
def install():
shelltools.cd("build")
cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("../AUTHORS", "../COPYING", "../readme*")
pisitools.dodoc("../AUTHORS", "../COPYING", "philosophy.md", "../readme.md")
programming/tool/cppcheck/files/htmlreport_py3.patch
+30
View File
@@ -0,0 +1,30 @@
diff --git a/htmlreport/cppcheck-htmlreport b/htmlreport/cppcheck-htmlreport
index 97a3af50d..b45cebf31 100755
--- a/htmlreport/cppcheck-htmlreport
+++ b/htmlreport/cppcheck-htmlreport
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
from __future__ import unicode_literals
diff --git a/htmlreport/setup.py b/htmlreport/setup.py
index e741ece55..ac790fbeb 100755
--- a/htmlreport/setup.py
+++ b/htmlreport/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
from setuptools import setup
diff --git a/htmlreport/test_htmlreport.py b/htmlreport/test_htmlreport.py
index 6553f625e..b3aef10e4 100755
--- a/htmlreport/test_htmlreport.py
+++ b/htmlreport/test_htmlreport.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""Test cppcheck-htmlreport."""
import os
programming/tool/cppcheck/files/qm_install_path.patch
+14 -10
View File
@@ -1,6 +1,8 @@
--- 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 @@
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 9cd93a21f..d07094a00 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -40,7 +40,7 @@ if (BUILD_GUI)
endif()
install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
@@ -9,11 +11,13 @@
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;
diff --git a/gui/translationhandler.cpp b/gui/translationhandler.cpp
index d12fb7057..626f8641a 100644
--- a/gui/translationhandler.cpp
+++ b/gui/translationhandler.cpp
@@ -113,15 +113,16 @@ bool TranslationHandler::setLanguage(const QString &code)
QString datadir = getDataDir();
- QString translationFile;
- if (QFile::exists(datadir + "/lang/" + mTranslations[index].mFilename + ".qm"))
@@ -30,8 +34,8 @@
- else
- translationFile = appPath + "/" + mTranslations[index].mFilename + ".qm";
+// else
+// translationFile = appPath + "/" + mTranslations[index].mFilename + ".qm";
+ QString translationFile("/usr/share/Cppcheck/lang/" + mTranslations[index].mFilename + ".qm");
+// 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
programming/tool/cppcheck/files/use_system_tinyxml.patch
+90
View File
@@ -0,0 +1,90 @@
diff -up cppcheck-2.2/cli/CMakeLists.txt.orig cppcheck-2.2/cli/CMakeLists.txt
--- cppcheck-2.2/cli/CMakeLists.txt.orig 2020-10-03 11:05:53.000000000 +0200
+++ cppcheck-2.2/cli/CMakeLists.txt 2020-10-04 06:47:29.867450500 +0200
@@ -1,5 +1,4 @@
include_directories(${PROJECT_SOURCE_DIR}/lib/)
-include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml/)
include_directories(${PROJECT_SOURCE_DIR}/externals/simplecpp/)
file(GLOB hdrs "*.h")
@@ -8,7 +7,7 @@ file(GLOB mainfile "main.cpp")
list(REMOVE_ITEM srcs ${mainfile})
add_library(cli_objs OBJECT ${hdrs} ${srcs})
-add_executable(cppcheck ${hdrs} ${mainfile} $<TARGET_OBJECTS:cli_objs> $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:tinyxml_objs> $<TARGET_OBJECTS:simplecpp_objs>)
+add_executable(cppcheck ${hdrs} ${mainfile} $<TARGET_OBJECTS:cli_objs> $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:simplecpp_objs>)
if (HAVE_RULES)
target_link_libraries(cppcheck ${PCRE_LIBRARY})
endif()
@@ -18,6 +17,7 @@ endif()
if (WIN32 AND NOT BORLAND)
target_link_libraries(cppcheck Shlwapi.lib)
endif()
+target_link_libraries(cppcheck tinyxml2)
install(TARGETS cppcheck
RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
diff -up cppcheck-2.2/CMakeLists.txt.orig cppcheck-2.2/CMakeLists.txt
--- cppcheck-2.2/CMakeLists.txt.orig 2020-10-03 11:05:53.000000000 +0200
+++ cppcheck-2.2/CMakeLists.txt 2020-10-04 06:48:18.324566600 +0200
@@ -23,7 +23,6 @@ if (BUILD_TESTS)
enable_testing()
endif()
-add_subdirectory(externals/tinyxml)
add_subdirectory(externals/simplecpp)
add_subdirectory(lib) # CppCheck Library
add_subdirectory(cli) # Client application
diff -up cppcheck-2.2/gui/CMakeLists.txt.orig cppcheck-2.2/gui/CMakeLists.txt
--- cppcheck-2.2/gui/CMakeLists.txt.orig 2020-10-03 11:05:53.000000000 +0200
+++ cppcheck-2.2/gui/CMakeLists.txt 2020-10-04 07:36:13.199769100 +0200
@@ -10,7 +10,6 @@ if (BUILD_GUI)
endif()
include_directories(${PROJECT_SOURCE_DIR}/lib/)
- include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml/)
file(GLOB hdrs "*.h")
file(GLOB srcs "*.cpp")
@@ -20,14 +19,14 @@ if (BUILD_GUI)
QT5_ADD_RESOURCES(resources "gui.qrc")
QT5_ADD_TRANSLATION(qms ${tss})
- add_executable(cppcheck-gui ${hdrs} ${srcs} ${uis_hdrs} ${resources} ${qms} $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:tinyxml_objs> $<TARGET_OBJECTS:simplecpp_objs>)
+ add_executable(cppcheck-gui ${hdrs} ${srcs} ${uis_hdrs} ${resources} ${qms} $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:simplecpp_objs>)
if (HAVE_RULES)
target_link_libraries(cppcheck-gui ${PCRE_LIBRARY})
endif()
if (USE_Z3)
target_link_libraries(cppcheck-gui ${Z3_LIBRARIES})
endif()
- target_link_libraries(cppcheck-gui Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Help)
+ target_link_libraries(cppcheck-gui tinyxml2 Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Help)
if(WITH_QCHART)
target_compile_definitions (cppcheck-gui PRIVATE HAVE_QCHART )
target_link_libraries(cppcheck-gui Qt5::Charts)
diff -up cppcheck-2.2/test/CMakeLists.txt.orig cppcheck-2.2/test/CMakeLists.txt
--- cppcheck-2.2/test/CMakeLists.txt.orig 2020-10-03 11:05:53.000000000 +0200
+++ cppcheck-2.2/test/CMakeLists.txt 2020-10-04 06:55:33.660775300 +0200
@@ -13,19 +13,19 @@ if (BUILD_TESTS)
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -j ${CTEST_PARALLEL_LEVEL} -C ${CMAKE_CFG_INTDIR} --timeout 90)
include_directories(${PROJECT_SOURCE_DIR}/lib/ ${PROJECT_SOURCE_DIR}/cli/)
- include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml)
include_directories(${PROJECT_SOURCE_DIR}/externals/simplecpp/)
file(GLOB hdrs "*.h")
file(GLOB srcs "*.cpp")
- add_executable(testrunner ${hdrs} ${srcs} $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:cli_objs> $<TARGET_OBJECTS:tinyxml_objs> $<TARGET_OBJECTS:simplecpp_objs>)
+ add_executable(testrunner ${hdrs} ${srcs} $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:cli_objs> $<TARGET_OBJECTS:simplecpp_objs>)
if (HAVE_RULES)
target_link_libraries(testrunner ${PCRE_LIBRARY})
endif()
if (USE_Z3)
target_link_libraries(testrunner ${Z3_LIBRARIES})
endif()
+ target_link_libraries(testrunner tinyxml2)
if (NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
target_precompile_headers(testrunner PRIVATE precompiled.h)
programming/tool/cppcheck/pspec.xml
+19 -5
View File
@@ -16,32 +16,39 @@
<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="e59758410408fa0679df06e8c3f3dd4e8c930d00" type="targz">
https://github.com/danmar/cppcheck/archive/2.1.tar.gz
<Archive sha1sum="936bd156097ba73381d62d171d60ab4c328322d9" type="tarbz2">
https://sourceforge.net/projects/cppcheck/files/cppcheck/2.2/cppcheck-2.2.tar.bz2
</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>python3</Dependency>
<!-- <Dependency>z3-devel</Dependency> -->
<Dependency>z3-devel</Dependency>
<Dependency>zlib-devel</Dependency>
<Dependency>docbook-xsl</Dependency>
<Dependency>qt5-linguist</Dependency>
<Dependency>libxslt-devel</Dependency>
<Dependency>libpcre-devel</Dependency>
<Dependency>python3-devel</Dependency>
<Dependency>qt5-base-devel</Dependency>
<Dependency>tinyxml2-devel</Dependency>
<Dependency>qt5-charts-devel</Dependency>
<Dependency>python3-setuptools</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">htmlreport_py3.patch</Patch>
<Patch level="1">qm_install_path.patch</Patch>
<Patch level="1">use_system_tinyxml.patch</Patch>
</Patches>
</Source>
<Package>
<Name>cppcheck</Name>
<RuntimeDependencies>
<!-- <Dependency>z3</Dependency> -->
<Dependency>z3</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>libpcre</Dependency>
<Dependency>python3</Dependency>
<Dependency>tinyxml2</Dependency>
<Dependency>qt5-base</Dependency>
<Dependency>qt5-charts</Dependency>
<Dependency>python3-Pygments</Dependency>
@@ -51,12 +58,19 @@
<Path fileType="data">/usr/share</Path>
<Path fileType="data">/usr/share/Cppcheck</Path>
<Path fileType="localedata">/usr/share/Cppcheck/lang</Path>
<!-- <Path fileType="man">/usr/share/man</Path> -->
<Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<History>
<Update release="4">
<Date>2020-10-06</Date>
<Version>2.2</Version>
<Comment>Ver. bump</Comment>
<Name>fury</Name>
<Email>wascheme@tuta.io</Email>
</Update>
<Update release="3">
<Date>2020-06-27</Date>
<Version>2.1</Version>