Skip to content

Commit 6b6b644

Browse files
committed
Remove Cppcheck from the distribution
I was initially impressed with its output, but over time I've found it less and less useful. I hardly use it anymore, and it would at best be neglected if left in the distribution. The build script is retained in the contrib/ directory, and it's easy to build natively from source.
1 parent ec561da commit 6b6b644

File tree

6 files changed

+2
-62
lines changed

6 files changed

+2
-62
lines changed

Dockerfile

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ ARG MINGW_VERSION=12.0.0
1515
ARG MPC_VERSION=1.3.1
1616
ARG MPFR_VERSION=4.2.1
1717
ARG PDCURSES_VERSION=3.9
18-
ARG CPPCHECK_VERSION=2.10
1918
ARG VIM_VERSION=9.0
2019

2120
RUN apt-get update && apt-get install --yes --no-install-recommends \
@@ -37,8 +36,7 @@ RUN curl --insecure --location --remote-name-all --remote-header-name \
3736
http://ftp.vim.org/pub/vim/unix/vim-$VIM_VERSION.tar.bz2 \
3837
https://github.com/universal-ctags/ctags/archive/refs/tags/v$CTAGS_VERSION.tar.gz \
3938
https://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$MINGW_VERSION.tar.bz2 \
40-
https://downloads.sourceforge.net/project/pdcurses/pdcurses/$PDCURSES_VERSION/PDCurses-$PDCURSES_VERSION.tar.gz \
41-
https://github.com/danmar/cppcheck/archive/$CPPCHECK_VERSION.tar.gz
39+
https://downloads.sourceforge.net/project/pdcurses/pdcurses/$PDCURSES_VERSION/PDCurses-$PDCURSES_VERSION.tar.gz
4240
COPY src/SHA256SUMS $PREFIX/src/
4341
RUN sha256sum -c $PREFIX/src/SHA256SUMS \
4442
&& tar xJf binutils-$BINUTILS_VERSION.tar.xz \
@@ -54,8 +52,7 @@ RUN sha256sum -c $PREFIX/src/SHA256SUMS \
5452
&& tar xzf make-$MAKE_VERSION.tar.gz \
5553
&& tar xjf mingw-w64-v$MINGW_VERSION.tar.bz2 \
5654
&& tar xzf PDCurses-$PDCURSES_VERSION.tar.gz \
57-
&& tar xjf vim-$VIM_VERSION.tar.bz2 \
58-
&& tar xzf cppcheck-$CPPCHECK_VERSION.tar.gz
55+
&& tar xjf vim-$VIM_VERSION.tar.bz2
5956
COPY src/w64devkit.c src/w64devkit.ico src/libmemory.c src/libchkstk.S \
6057
src/alias.c src/debugbreak.c src/pkg-config.c src/vc++filt.c \
6158
src/peports.c src/profile $PREFIX/src/
@@ -449,17 +446,6 @@ RUN sed -i /RT_MANIFEST/d win32/ctags.rc \
449446
OPT= CFLAGS=-Os LDFLAGS=-s \
450447
&& cp ctags.exe $PREFIX/bin/
451448

452-
WORKDIR /cppcheck-$CPPCHECK_VERSION
453-
COPY src/cppcheck.mak src/cppcheck-*.patch $PREFIX/src/
454-
RUN cat $PREFIX/src/cppcheck-*.patch | patch -p1 \
455-
&& make -f $PREFIX/src/cppcheck.mak -j$(nproc) CXX=$ARCH-g++ \
456-
&& mkdir $PREFIX/share/cppcheck/ \
457-
&& cp -r cppcheck.exe cfg/ $PREFIX/share/cppcheck \
458-
&& $ARCH-gcc -DEXE=../share/cppcheck/cppcheck.exe -DCMD=cppcheck \
459-
-Os -fno-asynchronous-unwind-tables -Wl,--gc-sections -s -nostdlib \
460-
-o $PREFIX/bin/cppcheck.exe \
461-
$PREFIX/src/alias.c -lkernel32
462-
463449
# Pack up a release
464450

465451
WORKDIR /

README.md

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ Included tools:
1212
* [busybox-w32][bb] : standard unix utilities, including sh
1313
* [Vim][vim] : powerful text editor
1414
* [Universal Ctags][ctags] : source navigation
15-
* [Cppcheck][cppcheck] : static code analysis
1615

1716
The toolchain includes pthreads, C++11 threads, and OpenMP. All included
1817
runtime components are static. **Docker/Podman is not required to use the
@@ -165,24 +164,6 @@ libraries have paths containing spaces.
165164
debugger, like using Windows' F12 debugger hotkey. Especially useful for
166165
console subsystem programs.
167166

168-
## Cppcheck tips
169-
170-
Use `--library=windows` for programs calling the Win32 API directly, which
171-
adds additional checks. In general, the following configuration is a good
172-
default for programs developed using w64devkit:
173-
174-
$ cppcheck --quiet -j$(nproc) --library=windows \
175-
--suppress=uninitvar --enable=portability,performance .
176-
177-
A "strict" check that is more thorough, but more false positives:
178-
179-
$ cppcheck --quiet -j$(nproc) --library=windows \
180-
--enable=portability,performance,style \
181-
--suppress=uninitvar --suppress=unusedStructMember \
182-
--suppress=constVariable --suppress=shadowVariable \
183-
--suppress=variableScope --suppress=constParameter \
184-
--suppress=shadowArgument --suppress=knownConditionTrueFalse .
185-
186167
## Notes
187168

188169
`$HOME` can be set through the adjacent `w64devkit.ini` configuration, and
@@ -224,7 +205,6 @@ binaries.
224205
[bb]: https://frippery.org/busybox/
225206
[break]: https://nullprogram.com/blog/2022/06/26/
226207
[bs]: https://www.rdegges.com/2016/i-dont-give-a-shit-about-licensing/
227-
[cppcheck]: https://cppcheck.sourceforge.io/
228208
[crt]: https://nullprogram.com/blog/2023/02/15/
229209
[ctags]: https://github.com/universal-ctags/ctags
230210
[debugbreak]: https://nullprogram.com/blog/2022/07/31/
File renamed without changes.

src/SHA256SUMS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
f6e4d41fd5fc778b06b7891457b3620da5ecea1006c6a4a41ae998109f85a800 binutils-2.42.tar.xz
22
e366f887a56bf6f64adff15b7b08ba487fea14c121045078437abe7217cf060d busybox-w32-FRP-5398-g89ae34445.tgz
3-
785dcbf711048dfe43ae920b6eff2eeebb4a096e88188a40e173ca4c030f57c3 cppcheck-2.10.tar.gz
43
71229a73f25529c9e3dabb2cb7310c55405d31caee8e8a9ab5c71b2406d4005a ctags-6.0.0.tar.gz
54
ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364 expat-2.6.2.tar.xz
65
e283c654987afe3de9d8080bc0bd79534b5ca0d681a73a11ff2b5d3767426840 gcc-14.1.0.tar.xz

src/cppcheck-gcc13.patch

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/cppcheck-quiet.patch

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)