[gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/files/, dev-util/cppcheck/
commit: c0af2a5acc11391ce319e15a935db033af2a6b42
Author: Sam James gentoo org>
AuthorDate: Mon Mar 14 12:12:14 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 14 12:12:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0af2a5a
dev-util/cppcheck: drop 2.4.1, 2.6.2
Signed-off-by: Sam James gentoo.org>
dev-util/cppcheck/Manifest | 2 -
dev-util/cppcheck/cppcheck-2.4.1.ebuild| 86 -
dev-util/cppcheck/cppcheck-2.6.2.ebuild| 107 -
.../cppcheck/files/cppcheck-2.4.1-limits.patch | 12 ---
4 files changed, 207 deletions(-)
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index c3816799c806..db9bba83e871 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,3 +1 @@
-DIST cppcheck-2.4.1.tar.gz 3761646 BLAKE2B
4c791088621f989e2529c92de38a73676fc3394e8cac72822596f7a75594283d0983693d693aa903a3ffb80bc0e1e20e71b55db5682d4d01c135ed77b2fc2e3c
SHA512
8fb1ed5faa0071fc69405b7eb5b41e9f94b77d097158ea0d4f5e4da8a5087b9d1ab7bf37f8dc73d00096d3d2494aeb431af8029f0d4f1e2085f5b9b72bdc2d09
-DIST cppcheck-2.6.2.tar.gz 3880239 BLAKE2B
63abba752ed0e4bef1bf7be4eb3f1a0dfcd1bab286db41e7fd787969674f59354f1c2a0b4477bb1d0cc7ca71306bc6a3375cebade1c60416a21010f7b313d20c
SHA512
f1b1b0d6d46712147984bf907519eaaef04b41f02979d371d836aa8668fbdaa0f18b503a76d809abcedf9a0e7b7666be910714ca411d289aa921d0204585f47f
DIST cppcheck-2.6.3.tar.gz 3880340 BLAKE2B
ef83538a0aa867dd0c0bd6165b41921335256ed0372a4990ad85151ab5e87a79bde7958be43887f07a4bbf372b9992339b75ddeae7ed8ea767b83c028dfc56db
SHA512
e59b4b4659c2b4fa2c16dcb548f7ee3027555dddc289ef8b54fe186af0396b6f7caa23d91bf1142ece62908b56fe9f5ba013191817322815681994093310fb37
diff --git a/dev-util/cppcheck/cppcheck-2.4.1.ebuild
b/dev-util/cppcheck/cppcheck-2.4.1.ebuild
deleted file mode 100644
index d7892faae5db..
--- a/dev-util/cppcheck/cppcheck-2.4.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 cmake
-
-DESCRIPTION="Static analyzer of C/C++ code"
-HOMEPAGE="https://github.com/danmar/cppcheck";
-SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 sparc x86"
-IUSE="htmlreport pcre qt5 +z3"
-
-RDEPEND="
- htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
- pcre? ( dev-libs/libpcre )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qthelp
- dev-qt/qtprintsupport:5
- )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- virtual/pkgconfig
- qt5? ( dev-qt/linguist-tools:5 )
- z3? ( sci-mathematics/z3 )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.4.1-limits.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DHAVE_RULES="$(usex pcre)"
- -DBUILD_GUI="$(usex qt5)"
- -DUSE_Z3="$(usex z3)"
- -DFILESDIR="${EPREFIX}/usr/share/${PN}/"
- -DENABLE_OSS_FUZZ=OFF
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- if use htmlreport ; then
- pushd htmlreport || die
- distutils-r1_src_compile
- popd || die
- fi
-}
-
-src_install() {
- # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
- emake install DESTDIR="${ED}" \
- FILESDIR="${EPREFIX}/usr/share/${PN}/"
-
- insinto "/usr/share/${PN}/cfg"
- doins cfg/*.cfg
- if use qt5 ; then
- dobin "${WORKDIR}/${P}_build/bin/${PN}-gui"
- dodoc gui/{projectfile.txt,gui.${PN}}
- fi
- if use htmlreport ; then
- pushd htmlreport || die
- distutils-r1_src_install
- popd || die
- find "${D}" -name "*.egg-info" -delete || die
- else
- rm "${ED}/usr/bin/cppcheck-htmlreport" || die
- fi
-
- dodoc -r tools/triage
-}
diff --git a/dev-util/cppcheck/cppcheck-2.6.2.ebuild
b/dev-util/cppcheck/cppcheck-2.6.2.ebuild
deleted file mode 100644
index a934618d7ad9..
--- a/dev-util/cppcheck/cppcheck-2.6.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=manual
-inherit distutils-r1 cmake
-
-DESCRIPTION="Static analyzer of C/C++ code"
-HOMEPAGE="https://github.com/danmar/cppcheck";
-SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
[gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/files/, dev-util/cppcheck/
commit: 21f316252605af6c72e5e0dec40923cab974448b
Author: David Seifert gentoo org>
AuthorDate: Mon Nov 22 15:52:04 2021 +
Commit: David Seifert gentoo org>
CommitDate: Mon Nov 22 15:52:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21f31625
dev-util/cppcheck: drop 1.88, 2.2
Signed-off-by: David Seifert gentoo.org>
dev-util/cppcheck/Manifest | 2 -
dev-util/cppcheck/cppcheck-1.88.ebuild | 115 -
dev-util/cppcheck/cppcheck-2.2.ebuild | 81 ---
.../cppcheck/files/cppcheck-1.88-ldflags.patch | 17 ---
.../cppcheck/files/cppcheck-1.88-tinyxml2.patch| 101 --
5 files changed, 316 deletions(-)
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index c78e131f4306..5de50914c64f 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,3 +1 @@
-DIST cppcheck-1.88.tar.gz 2364053 BLAKE2B
b688974ff83019422cc5b2ec575d9838bdff4ada17d71fb3d436f07eea50429490c222659163b845667d98c0ec186b3288464827894e379fd017dd0c3fea645f
SHA512
fa4ede0665546341af0ba3dae09a00b6efae09ec7838c616c580be01ff6902594d61168a059539779be0c78e1708d2bd9c8e7987dd0bb67dc8fa332a10d1de6a
-DIST cppcheck-2.2.tar.gz 3561406 BLAKE2B
e436de4bec5412a18f013c8557a966c28c14edcd07fbb80eb53a897848d15f32afc180798ea1a074742f896b15d4020755c104b87dc8f82252121b58a92b92dc
SHA512
d766187a69d6aa839e072e3c0ed44009621ca8492504257288ca2f49774f705a1ebcf2957f0801ac6eab2ffbdd845e9237f1213f85c6d0fcdbf16b1e7c690327
DIST cppcheck-2.4.1.tar.gz 3761646 BLAKE2B
4c791088621f989e2529c92de38a73676fc3394e8cac72822596f7a75594283d0983693d693aa903a3ffb80bc0e1e20e71b55db5682d4d01c135ed77b2fc2e3c
SHA512
8fb1ed5faa0071fc69405b7eb5b41e9f94b77d097158ea0d4f5e4da8a5087b9d1ab7bf37f8dc73d00096d3d2494aeb431af8029f0d4f1e2085f5b9b72bdc2d09
diff --git a/dev-util/cppcheck/cppcheck-1.88.ebuild
b/dev-util/cppcheck/cppcheck-1.88.ebuild
deleted file mode 100644
index 09857bcc74b6..
--- a/dev-util/cppcheck/cppcheck-1.88.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-inherit distutils-r1 qmake-utils toolchain-funcs
-
-DESCRIPTION="Static analyzer of C/C++ code"
-HOMEPAGE="https://github.com/danmar/cppcheck";
-SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 sparc x86"
-IUSE="htmlreport pcre qt5"
-
-RDEPEND="
- dev-libs/tinyxml2:=
- htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
- pcre? ( dev-libs/libpcre )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.88-tinyxml2.patch
- "${FILESDIR}"/${PN}-1.88-ldflags.patch
-)
-
-src_prepare() {
- default
-
- rm -r externals/tinyxml || die
-}
-
-src_configure() {
- tc-export CXX PKG_CONFIG
- export LIBS="$(${PKG_CONFIG} --libs tinyxml2)"
-
- emake dmake
- ./dmake || die
-
- if use pcre ; then
- sed -e '/HAVE_RULES=/s:=no:=yes:' \
- -i Makefile || die
- fi
-
- if use qt5 ; then
- pushd gui || die
- eqmake5
- popd || die
- fi
-}
-
-src_compile() {
- emake ${PN} man \
- CFGDIR="${EROOT}/usr/share/${PN}/cfg" \
-
DB2MAN="${EROOT}/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
-
- if use qt5 ; then
- pushd gui || die
- emake
- popd || die
- fi
-
- if use htmlreport ; then
- pushd htmlreport || die
- distutils-r1_src_compile
- popd || die
- fi
-}
-
-src_test() {
- # safe final version
- mv -v ${PN}{,.final} || die
- mv -v lib/library.o{,.final} || die
- mv -v cli/cppcheckexecutor.o{,.final} || die
- #trigger recompile with CFGDIR inside ${S}
- emake check CFGDIR="${S}/cfg"
- # restore
- mv -v ${PN}{.final,} || die
- mv -v lib/library.o{.final,} || die
- mv -v cli/cppcheckexecutor.o{.final,} || die
-}
-
-src_install() {
- # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
- emake install DESTDIR="${ED}"
-
- insinto "/usr/share/${PN}/cfg"
- doins cfg/*.cfg
- if use qt5 ; then
- dobin gui/${PN}-gui
- dodoc gui/{projectfile.txt,gui.${PN}}
- fi
- if use htmlreport ; then
- pushd htmlreport || die
- distutils-r1_src_install
- popd || die
- find "${D}"
[gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/files/, dev-util/cppcheck/
commit: 1e662a08ea623df0e7c241baf04f3e6ae9d9bef8
Author: Matthias Maier gentoo org>
AuthorDate: Fri Dec 4 05:03:59 2020 +
Commit: Matthias Maier gentoo org>
CommitDate: Fri Dec 4 05:37:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e662a08
dev-util/cppcheck: drop old
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Matthias Maier gentoo.org>
dev-util/cppcheck/Manifest | 2 -
dev-util/cppcheck/cppcheck-1.86.ebuild | 113 -
dev-util/cppcheck/cppcheck-1.87.ebuild | 113 -
dev-util/cppcheck/cppcheck-.ebuild | 112
.../cppcheck/files/cppcheck-1.75-tinyxml2.patch| 55 --
.../cppcheck/files/cppcheck-1.85-ldflags.patch | 24 -
.../cppcheck/files/cppcheck--tinyxml2.patch| 56 --
7 files changed, 475 deletions(-)
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 383ff755b28..51d80e257e3 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,4 +1,2 @@
-DIST cppcheck-1.86.tar.gz 2184186 BLAKE2B
8b488ec72d0998d6b037de2b1204373c8b3de475ad165bf108bb331399356cb0d1e20a7bc6f368f1a038ec886ad7a84ad694172d0a96a203a6877f3838c21001
SHA512
59cec55b8408e8f2e2e7172bce69350c248bc3185a0938b523c44a58f98b344e11aef957ec1b7a7b2bc7a876660b2683e51f54b76f0b550f9549497c29453655
-DIST cppcheck-1.87.tar.gz 2243258 BLAKE2B
ffe42bfb2e896163678c5bb24e46ae2391ba8254cbe7c1c19c3c1b16cd38adf9c773de6aaefe70af08b9c1dca8b0b0b5e9939323368a2f81491fd6981ff18139
SHA512
b0149002b40260c1488904929296403722a66b84263b41d0097c3caed28265332766c114f0d1f378ea6c7e73ab973ea71ab89c6744f6cc818f22de08933e6766
DIST cppcheck-1.88.tar.gz 2364053 BLAKE2B
b688974ff83019422cc5b2ec575d9838bdff4ada17d71fb3d436f07eea50429490c222659163b845667d98c0ec186b3288464827894e379fd017dd0c3fea645f
SHA512
fa4ede0665546341af0ba3dae09a00b6efae09ec7838c616c580be01ff6902594d61168a059539779be0c78e1708d2bd9c8e7987dd0bb67dc8fa332a10d1de6a
DIST cppcheck-2.2.tar.gz 3561406 BLAKE2B
e436de4bec5412a18f013c8557a966c28c14edcd07fbb80eb53a897848d15f32afc180798ea1a074742f896b15d4020755c104b87dc8f82252121b58a92b92dc
SHA512
d766187a69d6aa839e072e3c0ed44009621ca8492504257288ca2f49774f705a1ebcf2957f0801ac6eab2ffbdd845e9237f1213f85c6d0fcdbf16b1e7c690327
diff --git a/dev-util/cppcheck/cppcheck-1.86.ebuild
b/dev-util/cppcheck/cppcheck-1.86.ebuild
deleted file mode 100644
index 03e138c8250..000
--- a/dev-util/cppcheck/cppcheck-1.86.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1 qmake-utils toolchain-funcs
-
-DESCRIPTION="Static analyzer of C/C++ code"
-HOMEPAGE="https://github.com/danmar/cppcheck";
-SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 hppa ~ppc64 sparc x86"
-IUSE="htmlreport pcre qt5"
-
-RDEPEND="
- dev-libs/tinyxml2:=
- htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
- pcre? ( dev-libs/libpcre )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- virtual/pkgconfig
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.75-tinyxml2.patch
- "${FILESDIR}"/${PN}-1.85-ldflags.patch
-)
-
-src_prepare() {
- default
-
- rm -r externals/tinyxml || die
-}
-
-src_configure() {
- tc-export CXX PKG_CONFIG
- export LIBS="$(${PKG_CONFIG} --libs tinyxml2)"
-
- emake dmake
- ./dmake || die
-
- if use pcre ; then
- sed -e '/HAVE_RULES=/s:=no:=yes:' \
- -i Makefile || die
- fi
-
- if use qt5 ; then
- pushd gui || die
- eqmake5
- popd || die
- fi
-}
-
-src_compile() {
- emake ${PN} man \
- CFGDIR="${EROOT}/usr/share/${PN}/cfg" \
-
DB2MAN="${EROOT}/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
-
- if use qt5 ; then
- pushd gui || die
- emake
- popd || die
- fi
-
- if use htmlreport ; then
- pushd htmlreport || die
- distutils-r1_src_compile
- popd || die
- fi
-}
-
-src_test() {
- # safe final version
- mv -v ${PN}{,.final} || die
- mv -v lib/library.o{,.final} || die
- mv -v cli/cppcheckexecutor.o{,.final} || die
- #trigger recompile with CFGDIR inside ${S}
- emake check CFGDIR="${S}/cfg"
- # restore
- mv -v ${PN}{.final,} || die
- mv -v lib/library.o{.final,} || die
- mv -v cli/cppcheckexecutor.o{.final,} || die
-}
-
-src_install() {
[gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/files/, dev-util/cppcheck/
commit: 1e2ade0e9fecfd14846864cf21067d9e03375cf2
Author: Matthias Maier gentoo org>
AuthorDate: Sun Jun 30 16:25:33 2019 +
Commit: Matthias Maier gentoo org>
CommitDate: Sun Jun 30 18:19:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e2ade0e
dev-util/cppcheck: version bump to 1.88
- Cannot reproduce test failure with new version
Closes: https://bugs.gentoo.org/688764
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Matthias Maier gentoo.org>
dev-util/cppcheck/Manifest | 1 +
dev-util/cppcheck/cppcheck-1.88.ebuild | 113 +
.../cppcheck/files/cppcheck-1.88-ldflags.patch | 17
.../cppcheck/files/cppcheck-1.88-tinyxml2.patch| 101 ++
4 files changed, 232 insertions(+)
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 3c9ce707e0c..2d4d3044aea 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,2 +1,3 @@
DIST cppcheck-1.86.tar.gz 2184186 BLAKE2B
8b488ec72d0998d6b037de2b1204373c8b3de475ad165bf108bb331399356cb0d1e20a7bc6f368f1a038ec886ad7a84ad694172d0a96a203a6877f3838c21001
SHA512
59cec55b8408e8f2e2e7172bce69350c248bc3185a0938b523c44a58f98b344e11aef957ec1b7a7b2bc7a876660b2683e51f54b76f0b550f9549497c29453655
DIST cppcheck-1.87.tar.gz 2243258 BLAKE2B
ffe42bfb2e896163678c5bb24e46ae2391ba8254cbe7c1c19c3c1b16cd38adf9c773de6aaefe70af08b9c1dca8b0b0b5e9939323368a2f81491fd6981ff18139
SHA512
b0149002b40260c1488904929296403722a66b84263b41d0097c3caed28265332766c114f0d1f378ea6c7e73ab973ea71ab89c6744f6cc818f22de08933e6766
+DIST cppcheck-1.88.tar.gz 2364053 BLAKE2B
b688974ff83019422cc5b2ec575d9838bdff4ada17d71fb3d436f07eea50429490c222659163b845667d98c0ec186b3288464827894e379fd017dd0c3fea645f
SHA512
fa4ede0665546341af0ba3dae09a00b6efae09ec7838c616c580be01ff6902594d61168a059539779be0c78e1708d2bd9c8e7987dd0bb67dc8fa332a10d1de6a
diff --git a/dev-util/cppcheck/cppcheck-1.88.ebuild
b/dev-util/cppcheck/cppcheck-1.88.ebuild
new file mode 100644
index 000..69aa5c7a1ad
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.88.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+inherit distutils-r1 qmake-utils toolchain-funcs
+
+DESCRIPTION="Static analyzer of C/C++ code"
+HOMEPAGE="https://github.com/danmar/cppcheck";
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+IUSE="htmlreport pcre qt5"
+
+RDEPEND="
+ dev-libs/tinyxml2:=
+ htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
+ pcre? ( dev-libs/libpcre )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ )
+"
+DEPEND="${RDEPEND}
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ virtual/pkgconfig
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.88-tinyxml2.patch
+ "${FILESDIR}"/${PN}-1.88-ldflags.patch
+)
+
+src_prepare() {
+ default
+
+ rm -r externals/tinyxml || die
+}
+
+src_configure() {
+ tc-export CXX PKG_CONFIG
+ export LIBS="$(${PKG_CONFIG} --libs tinyxml2)"
+
+ emake dmake
+ ./dmake || die
+
+ if use pcre ; then
+ sed -e '/HAVE_RULES=/s:=no:=yes:' \
+ -i Makefile || die
+ fi
+
+ if use qt5 ; then
+ pushd gui || die
+ eqmake5
+ popd || die
+ fi
+}
+
+src_compile() {
+ emake ${PN} man \
+ CFGDIR="${EROOT}/usr/share/${PN}/cfg" \
+
DB2MAN="${EROOT}/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
+
+ if use qt5 ; then
+ pushd gui || die
+ emake
+ popd || die
+ fi
+
+ if use htmlreport ; then
+ pushd htmlreport || die
+ distutils-r1_src_compile
+ popd || die
+ fi
+}
+
+src_test() {
+ # safe final version
+ mv -v ${PN}{,.final} || die
+ mv -v lib/library.o{,.final} || die
+ mv -v cli/cppcheckexecutor.o{,.final} || die
+ #trigger recompile with CFGDIR inside ${S}
+ emake check CFGDIR="${S}/cfg"
+ # restore
+ mv -v ${PN}{.final,} || die
+ mv -v lib/library.o{.final,} || die
+ mv -v cli/cppcheckexecutor.o{.final,} || die
+}
+
+src_install() {
+ # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
+ emake install DESTDIR="${ED}"
+
+ insinto "/usr/share/${PN}/cfg"
+ doins cfg/*.cfg
+ if use qt5 ; then
+ dobin gui/${PN}-gui
+ dodoc gui/{projectfile.txt,gui.${PN}}
+ fi
+ if use htmlreport ; then
+ pushd htmlreport || die
+ distutils-r1_src_install
+
[gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/files/, dev-util/cppcheck/
commit: 1eda689fed1aff69fbfba595a81195b942da56d2
Author: Sergei Trofimovich gentoo org>
AuthorDate: Wed Jun 12 06:44:25 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Wed Jun 12 06:46:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eda689f
dev-util/cppcheck: refresh tinyxml2 patch for live ebuild
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-util/cppcheck/cppcheck-.ebuild | 2 +-
.../cppcheck/files/cppcheck--tinyxml2.patch| 56 ++
2 files changed, 57 insertions(+), 1 deletion(-)
diff --git a/dev-util/cppcheck/cppcheck-.ebuild
b/dev-util/cppcheck/cppcheck-.ebuild
index 4eb9053d431..9ebb17a4dbd 100644
--- a/dev-util/cppcheck/cppcheck-.ebuild
+++ b/dev-util/cppcheck/cppcheck-.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
"
PATCHES=(
- "${FILESDIR}"/${PN}-1.75-tinyxml2.patch
+ "${FILESDIR}"/${PN}--tinyxml2.patch
)
src_prepare() {
diff --git a/dev-util/cppcheck/files/cppcheck--tinyxml2.patch
b/dev-util/cppcheck/files/cppcheck--tinyxml2.patch
new file mode 100644
index 000..7a2a037ab37
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck--tinyxml2.patch
@@ -0,0 +1,56 @@
+--- a/externals/externals.pri
b/externals/externals.pri
+@@ -1,9 +1,6 @@
+ INCLUDEPATH += $${PWD} \
+- $${PWD}/simplecpp \
+- $${PWD}/tinyxml
++ $${PWD}/simplecpp
+
+-HEADERS += $${PWD}/simplecpp/simplecpp.h \
+- $${PWD}/tinyxml/tinyxml2.h
++HEADERS += $${PWD}/simplecpp/simplecpp.h
+
+-SOURCES += $${PWD}/simplecpp/simplecpp.cpp \
+- $${PWD}/tinyxml/tinyxml2.cpp
++SOURCES += $${PWD}/simplecpp/simplecpp.cpp
+--- a/gui/gui.pro
b/gui/gui.pro
+@@ -15,6 +15,7 @@ contains(LINKCORE, [yY][eE][sS]) {
+ DEFINES += CPPCHECKLIB_IMPORT
+ }
+ LIBS += -L$$PWD/../externals
++LIBS += $(shell $(PKG_CONFIG) --libs tinyxml2)
+
+ DESTDIR = .
+ RCC_DIR = temp
+--- a/tools/dmake.cpp
b/tools/dmake.cpp
+@@ -122,7 +122,6 @@ int main(int argc, char **argv)
+
+ std::vector extfiles;
+ extfiles.push_back("externals/simplecpp/simplecpp.cpp");
+-extfiles.push_back("externals/tinyxml/tinyxml2.cpp");
+
+ std::vector clifiles;
+ getCppFiles(clifiles, "cli/", false);
+@@ -171,7 +170,6 @@ int main(int argc, char **argv)
+ std::ofstream fout1("test/testfiles.pri");
+ if (fout1.is_open()) {
+ fout1 << "# no manual edits - this file is autogenerated by
dmake\n\n";
+-fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
+ fout1 << "\n\nSOURCES += ";
+ for (unsigned int i = 0; i < testfiles.size(); ++i) {
+ const std::string filename(testfiles[i].substr(5));
+@@ -335,9 +333,9 @@ int main(int argc, char **argv)
+ << "endif\n\n";
+
+ makeConditionalVariable(fout, "PREFIX", "/usr");
+-makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem
externals -isystem externals/simplecpp -isystem externals/tinyxml");
+-makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem
externals/simplecpp -isystem externals/tinyxml");
+-makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem
externals/simplecpp -isystem externals/tinyxml");
++makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem
externals -isystem externals/simplecpp");
++makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem
externals/simplecpp");
++makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem
externals/simplecpp");
+
+ fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
+ fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl
docbook-xml on Linux\n";
[gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/files/, dev-util/cppcheck/
commit: 22d131878d6d360ed9f73fd88520011af8a0d967
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Nov 25 15:04:04 2018 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Nov 25 15:04:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22d13187
dev-util/cppcheck: Version 1.85
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Jeroen Roovers gentoo.org>
dev-util/cppcheck/Manifest | 1 +
.../{cppcheck-.ebuild => cppcheck-1.85.ebuild} | 42 --
dev-util/cppcheck/cppcheck-.ebuild | 40 -
.../cppcheck/files/cppcheck-1.75-tinyxml2.patch| 14
.../cppcheck/files/cppcheck-1.85-ldflags.patch | 24 +
5 files changed, 79 insertions(+), 42 deletions(-)
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index af044e6035f..8a3615a6844 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,2 +1,3 @@
DIST cppcheck-1.81.tar.bz2 1514741 BLAKE2B
2f23dfe4bdb26e203411f0bf9bc569303a4d59f96911b32a8a5f9cc9a6a7fa75e5d87c328cb0bf8cc46bd8f38747a4663c33243b8385355cc5630e1fcf6c891f
SHA512
22e7b63c35e71b2784065faca06aec8c286e3173f182ac10995073cc3d61fd0bfaf353c51ad9207d3bd2c6134ab1a3990a37668709505b657c2816d561f8af92
DIST cppcheck-1.84.tar.gz 2051244 BLAKE2B
8e4b4c71da969addec6d1cb2919c39625054797ae730c8695e872f87295c20e4564db2eadf536a762ca018882285d5d329f9a5789608e14ef17f1069753d
SHA512
7f971f9097db6d2fee7483634afc697bddff499a7b09c4be0bfdc3f8e502d47202a8d4f4fc1a330d0fb1d34a7772065b96419b4b4f4f1467b997e62459304526
+DIST cppcheck-1.85.tar.gz 2150637 BLAKE2B
73a1d4e1fb0770103c8163f35b9e710a5863561df66e46e319b9246ed14e3c5d4d73511db6e70275de4f4510866d7e1888b0fd6b49e5b01fc4f08d081119b36c
SHA512
cc984c751d87150839782e96b3762dbf918d9e3687562eabaff6473e48e3254995dd3bffe8605842f867d7ad76845ca2248a53bbd54b5c367281db8a1c1c7fad
diff --git a/dev-util/cppcheck/cppcheck-.ebuild
b/dev-util/cppcheck/cppcheck-1.85.ebuild
similarity index 75%
copy from dev-util/cppcheck/cppcheck-.ebuild
copy to dev-util/cppcheck/cppcheck-1.85.ebuild
index 38d6d57ecc2..87931e60c7b 100644
--- a/dev-util/cppcheck/cppcheck-.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.85.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
+EAPI=7
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 flag-o-matic qmake-utils toolchain-funcs git-r3
+inherit distutils-r1 qmake-utils toolchain-funcs
DESCRIPTION="Static analyzer of C/C++ code"
HOMEPAGE="http://cppcheck.sourceforge.net";
-EGIT_REPO_URI="https://github.com/danmar/cppcheck.git";
+SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz ->
${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
IUSE="htmlreport pcre qt5"
RDEPEND="
@@ -31,39 +29,47 @@ DEPEND="${RDEPEND}
dev-libs/libxslt
virtual/pkgconfig
"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.75-tinyxml2.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.75-tinyxml2.patch
+ "${FILESDIR}"/${PN}-1.85-ldflags.patch
+)
src_prepare() {
default
- append-cxxflags -std=c++0x
- # Drop bundled libs, patch Makefile generator and re-run it
rm -r externals/tinyxml || die
- tc-export CXX
- emake dmake
- ./dmake || die
}
src_configure() {
+ tc-export CXX PKG_CONFIG
+ export LIBS="$(${PKG_CONFIG} --libs tinyxml2)"
+
+ emake dmake
+ ./dmake || die
+
if use pcre ; then
sed -e '/HAVE_RULES=/s:=no:=yes:' \
-i Makefile || die
fi
+
+ if use qt5 ; then
+ pushd gui || die
+ eqmake5
+ popd || die
+ fi
}
src_compile() {
- export LIBS="$(pkg-config --libs tinyxml2)"
emake ${PN} man \
- CFGDIR="${EROOT}usr/share/${PN}/cfg" \
-
DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
+ CFGDIR="${EROOT}/usr/share/${PN}/cfg" \
+
DB2MAN="${EROOT}/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
if use qt5 ; then
pushd gui || die
- eqmake5
emake
popd || die
fi
+
if use htmlreport ; then
pushd htmlreport || die
distutils-r1_src_compile
diff --git a/dev-util/cppcheck/cppcheck-.ebuild
b/dev-util/cppcheck/cppcheck-.ebuild
index 38d6d57ecc2..9d9977873aa 100644
--- a/dev-util/cppcheck/cppcheck-.ebuild
+++ b/dev-util/cppcheck/cppcheck-.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
+EAPI=
[gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/files/, dev-util/cppcheck/
commit: 9322294404f2c5011564047a1534c4c049a7ccfa
Author: Matt Turner gentoo org>
AuthorDate: Tue Sep 18 23:00:00 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Sep 18 23:04:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93222944
dev-util/cppcheck: Add upstream patch to fix test
On some platforms 'char' is unsigned by default, causing the test to
fail.
See https://trofi.github.io/posts/203-signed-char-or-unsigned-char.html
dev-util/cppcheck/cppcheck-1.84-r1.ebuild | 110 +
.../files/cppcheck-1.84-char-signedness.patch | 88 +
2 files changed, 198 insertions(+)
diff --git a/dev-util/cppcheck/cppcheck-1.84-r1.ebuild
b/dev-util/cppcheck/cppcheck-1.84-r1.ebuild
new file mode 100644
index 000..4d0e7a668ec
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.84-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 flag-o-matic qmake-utils toolchain-funcs
+
+DESCRIPTION="Static analyzer of C/C++ code"
+HOMEPAGE="http://cppcheck.sourceforge.net";
+SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE="htmlreport pcre qt5"
+
+RDEPEND="
+ dev-libs/tinyxml2:=
+ htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
+ pcre? ( dev-libs/libpcre )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ )
+"
+DEPEND="${RDEPEND}
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.75-tinyxml2.patch
+ "${FILESDIR}"/${PN}-1.84-char-signedness.patch
+)
+
+src_prepare() {
+ default
+ append-cxxflags -std=c++0x
+
+ # Drop bundled libs, patch Makefile generator and re-run it
+ rm -r externals/tinyxml || die
+ tc-export CXX
+ emake dmake
+ ./dmake || die
+}
+
+src_configure() {
+ if use pcre ; then
+ sed -e '/HAVE_RULES=/s:=no:=yes:' \
+ -i Makefile || die
+ fi
+}
+
+src_compile() {
+ export LIBS="$(pkg-config --libs tinyxml2)"
+ emake ${PN} man \
+ CFGDIR="${EROOT}usr/share/${PN}/cfg" \
+
DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
+
+ if use qt5 ; then
+ pushd gui || die
+ eqmake5
+ emake
+ popd || die
+ fi
+ if use htmlreport ; then
+ pushd htmlreport || die
+ distutils-r1_src_compile
+ popd || die
+ fi
+}
+
+src_test() {
+ # safe final version
+ mv -v ${PN}{,.final} || die
+ mv -v lib/library.o{,.final} || die
+ mv -v cli/cppcheckexecutor.o{,.final} || die
+ #trigger recompile with CFGDIR inside ${S}
+ emake check CFGDIR="${S}/cfg"
+ # restore
+ mv -v ${PN}{.final,} || die
+ mv -v lib/library.o{.final,} || die
+ mv -v cli/cppcheckexecutor.o{.final,} || die
+}
+
+src_install() {
+ # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
+ emake install DESTDIR="${ED}"
+
+ insinto "/usr/share/${PN}/cfg"
+ doins cfg/*.cfg
+ if use qt5 ; then
+ dobin gui/${PN}-gui
+ dodoc gui/{projectfile.txt,gui.${PN}}
+ fi
+ if use htmlreport ; then
+ pushd htmlreport || die
+ distutils-r1_src_install
+ popd || die
+ find "${D}" -name "*.egg-info" -delete
+ else
+ rm "${ED}/usr/bin/cppcheck-htmlreport" || die
+ fi
+ doman ${PN}.1
+ dodoc -r triage
+}
diff --git a/dev-util/cppcheck/files/cppcheck-1.84-char-signedness.patch
b/dev-util/cppcheck/files/cppcheck-1.84-char-signedness.patch
new file mode 100644
index 000..ee1b136c9a9
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-1.84-char-signedness.patch
@@ -0,0 +1,88 @@
+From 320a957bbc912325363cf86b61108db860195ec3 Mon Sep 17 00:00:00 2001
+From: Alexander Mai
+Date: Thu, 28 Jun 2018 22:16:18 +0200
+Subject: [PATCH] Extend TestSymbolDatabase::findFunction19 to outline
+ different results depending whether char is signed or unsigned on compile
+ time
+
+---
+ test/testsymboldatabase.cpp | 28
+ 1 file changed, 20 insertions(+), 8 deletions(-)
+
+diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
+index 0dafd2730..28473e8e9 100644
+--- a/test/testsymboldatabase.cpp
b/test/testsymboldatabase.cpp
+@@ -26,6 +26,7 @@
+ #include "tokenlist.h"
+ #include "utils.h"
+
++#include
+ #include
+ #include
+ #include
+@@ -5065,6 +5066,7 @@ private:
+
[gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/files/, dev-util/cppcheck/
commit: 9a345b0cdd668ad0678f49a306665354b6c3143c
Author: Michael Weber gentoo org>
AuthorDate: Thu Aug 4 13:08:54 2016 +
Commit: Michael Weber gentoo org>
CommitDate: Thu Aug 4 13:09:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a345b0c
dev-util/cppcheck: add live version (bug 590428).
Package-Manager: portage-2.2.28
dev-util/cppcheck/cppcheck-.ebuild | 105 +
.../cppcheck/files/cppcheck--tinyxml2.patch| 55 +++
2 files changed, 160 insertions(+)
diff --git a/dev-util/cppcheck/cppcheck-.ebuild
b/dev-util/cppcheck/cppcheck-.ebuild
new file mode 100644
index 000..937cc7f
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1 eutils qt4-r2 toolchain-funcs flag-o-matic git-r3
+
+DESCRIPTION="static analyzer of C/C++ code"
+HOMEPAGE="http://cppcheck.sourceforge.net";
+EGIT_REPO_URI="git://github.com/danmar/cppcheck.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="htmlreport pcre qt4"
+
+RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
+ >=dev-libs/tinyxml2-2
+ qt4? ( dev-qt/qtgui:4 )
+ pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ virtual/pkgconfig"
+
+src_prepare() {
+ append-cxxflags -std=c++0x
+
+ # Drop bundled libs, patch Makefile generator and re-run it
+ rm -r externals/tinyxml || die
+ epatch "${FILESDIR}"/${PN}--tinyxml2.patch
+ tc-export CXX
+ emake dmake
+ ./dmake || die
+
+ epatch_user
+}
+
+src_configure() {
+ if use pcre ; then
+ sed -e '/HAVE_RULES=/s:=no:=yes:' \
+ -i Makefile
+ fi
+ if use qt4 ; then
+ pushd gui
+ qt4-r2_src_configure
+ popd
+ fi
+}
+
+src_compile() {
+ export LIBS="$(pkg-config --libs tinyxml2)"
+ emake ${PN} man \
+ CFGDIR="${EROOT}usr/share/${PN}/cfg" \
+
DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
+
+ if use qt4 ; then
+ pushd gui
+ qt4-r2_src_compile
+ popd
+ fi
+ if use htmlreport ; then
+ pushd htmlreport
+ distutils-r1_src_compile
+ popd
+ fi
+}
+
+src_test() {
+ # safe final version
+ mv -v ${PN}{,.final}
+ mv -v lib/library.o{,.final}
+ mv -v cli/cppcheckexecutor.o{,.final}
+ #trigger recompile with CFGDIR inside ${S}
+ emake check CFGDIR="${S}/cfg"
+ # restore
+ mv -v ${PN}{.final,}
+ mv -v lib/library.o{.final,}
+ mv -v cli/cppcheckexecutor.o{.final,}
+}
+
+src_install() {
+ # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
+ emake install DESTDIR="${ED}"
+
+ insinto "/usr/share/${PN}/cfg"
+ doins cfg/*.cfg
+ if use qt4 ; then
+ dobin gui/${PN}-gui
+ dodoc gui/{projectfile.txt,gui.${PN}}
+ fi
+ if use htmlreport ; then
+ pushd htmlreport
+ distutils-r1_src_install
+ popd
+ find "${D}" -name "*.egg-info" -delete
+ else
+ rm "${ED}/usr/bin/cppcheck-htmlreport" || die
+ fi
+ doman ${PN}.1
+ dodoc -r triage
+}
diff --git a/dev-util/cppcheck/files/cppcheck--tinyxml2.patch
b/dev-util/cppcheck/files/cppcheck--tinyxml2.patch
new file mode 100644
index 000..9d85584
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck--tinyxml2.patch
@@ -0,0 +1,55 @@
+--- cppcheck-/gui/gui.pro
cppcheck-/gui/gui.pro
+@@ -19,6 +19,7 @@
+ DEFINES += CPPCHECKLIB_IMPORT
+ }
+ LIBS += -L$$PWD/../externals
++LIBS += `pkg-config --libs tinyxml2`
+
+ DESTDIR = .
+ RCC_DIR = temp
+--- cppcheck-/tools/dmake.cpp
cppcheck-/tools/dmake.cpp
+@@ -123,7 +123,6 @@
+
+ std::vector extfiles;
+ extfiles.push_back("externals/simplecpp/simplecpp.cpp");
+-extfiles.push_back("externals/tinyxml/tinyxml2.cpp");
+
+ std::vector clifiles;
+ getCppFiles(clifiles, "cli/", false);
+@@ -172,7 +171,6 @@
+ std::ofstream fout1("test/testfiles.pri");
+ if (fout1.is_open()) {
+ fout1 << "# no manual edits - this file is autogenerated by
dmake\n\n";
+-fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
+ fout1 << "\n\nSOURCES += ";
+ for (unsigned int i = 0; i < testfiles.size(); ++i) {
+ const std::string filename(testfiles[i].substr(5));
+@@ -337,9 +335,9 @@
+ << "endif\n\n";
+
+ makeConditionalVariable(fout, "PREFIX", "/usr");
+-makeConditionalVar
