Skip to content

Commit cf94283

Browse files
authored
Merge pull request #4719 from MidnightCommander/4573_remove_cppcheck_doxygen
Ticket #4573: remove obsolete cppcheck & doxygen infrastructure
2 parents 8b543a5 + 4eb687d commit cf94283

File tree

23 files changed

+6
-947
lines changed

23 files changed

+6
-947
lines changed

.github/workflows/ci-ubuntu.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ jobs:
7777
--disable-aspell \
7878
--disable-background \
7979
--disable-vfs \
80-
--disable-doxygen-doc \
8180
--without-x \
8281
--without-gpm-mouse \
8382
--without-internal-edit \

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ stamp-h?
3333
stamp-h.in
3434
tmpout
3535
debug
36-
Doxyfile
3736
mc.kdevelop
3837
version.h
3938
TAGS

Makefile.am

Lines changed: 1 addition & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,7 @@ ACLOCAL_AMFLAGS = -I m4
1919

2020
CONFIG_STATUS_DEPENDENCIES = $(top_srcdir)/mc-version.h
2121

22-
.PHONY: update-version \
23-
cppcheck \
24-
cppcheck-error \
25-
cppcheck-information \
26-
cppcheck-performance \
27-
cppcheck-portability \
28-
cppcheck-style \
29-
cppcheck-warning \
30-
cppcheck-all
31-
22+
.PHONY: update-version
3223

3324
update-version:
3425
@if test -x $(top_srcdir)/version.sh; then \
@@ -42,79 +33,6 @@ update-version:
4233

4334
$(top_srcdir)/mc-version.h: update-version
4435

45-
CPPCHECK_CMD = cppcheck \
46-
--inline-suppr \
47-
--error-exitcode=0 \
48-
-j 4 \
49-
--force \
50-
-I $(top_srcdir)/lib \
51-
--language=c \
52-
--std=c99
53-
54-
CPPCHECK_DIRS = \
55-
"$(top_srcdir)/lib" \
56-
"$(top_srcdir)/src"
57-
58-
CPPCHECK_OUT_PREFIX = $(top_builddir)/cppcheck-
59-
60-
CPPCHECK_OUT_EXT = log.txt
61-
62-
CPPCHECK_SED_FILTER = \
63-
-e '/is reassigned a value before the old one has been used./d' \
64-
-e '/ Unmatched suppression: /d' \
65-
-e "/Skipping configuration '.*' since the value of '.*' is unknown./d"
66-
67-
cppcheck:
68-
$(CPPCHECK_CMD) --enable=all $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)all.$(CPPCHECK_OUT_EXT).tmp;
69-
$(SED) $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)all.$(CPPCHECK_OUT_EXT).tmp > $(CPPCHECK_OUT_PREFIX)all.$(CPPCHECK_OUT_EXT)
70-
rm -f $(CPPCHECK_OUT_PREFIX)all.$(CPPCHECK_OUT_EXT).tmp
71-
72-
cppcheck-all: cppcheck
73-
74-
cppcheck-information:
75-
$(CPPCHECK_CMD) --enable=information $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)information.$(CPPCHECK_OUT_EXT).tmp;
76-
$(SED) $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)information.$(CPPCHECK_OUT_EXT).tmp > $(CPPCHECK_OUT_PREFIX)information.$(CPPCHECK_OUT_EXT)
77-
rm -f $(CPPCHECK_OUT_PREFIX)all.$(CPPCHECK_OUT_EXT).tmp
78-
79-
cppcheck-performance:
80-
$(CPPCHECK_CMD) --enable=performance $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)performance.$(CPPCHECK_OUT_EXT).tmp;
81-
$(SED) $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)performance.$(CPPCHECK_OUT_EXT).tmp > $(CPPCHECK_OUT_PREFIX)performance.$(CPPCHECK_OUT_EXT)
82-
rm -f $(CPPCHECK_OUT_PREFIX)performance.$(CPPCHECK_OUT_EXT).tmp
83-
84-
cppcheck-portability:
85-
$(CPPCHECK_CMD) --enable=portability $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)portability.$(CPPCHECK_OUT_EXT).tmp;
86-
$(SED) $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)portability.$(CPPCHECK_OUT_EXT).tmp > $(CPPCHECK_OUT_PREFIX)portability.$(CPPCHECK_OUT_EXT)
87-
rm -f $(CPPCHECK_OUT_PREFIX)portability.$(CPPCHECK_OUT_EXT).tmp
88-
89-
cppcheck-style:
90-
$(CPPCHECK_CMD) --enable=style $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)style.$(CPPCHECK_OUT_EXT).tmp;
91-
$(SED) $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)style.$(CPPCHECK_OUT_EXT).tmp > $(CPPCHECK_OUT_PREFIX)style.$(CPPCHECK_OUT_EXT)
92-
rm -f $(CPPCHECK_OUT_PREFIX)style.$(CPPCHECK_OUT_EXT).tmp
93-
94-
cppcheck-warning:
95-
$(CPPCHECK_CMD) --enable=warning $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)warning.$(CPPCHECK_OUT_EXT).tmp;
96-
$(SED) $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)warning.$(CPPCHECK_OUT_EXT).tmp > $(CPPCHECK_OUT_PREFIX)warning.$(CPPCHECK_OUT_EXT)
97-
rm -f $(CPPCHECK_OUT_PREFIX)warning.$(CPPCHECK_OUT_EXT).tmp
98-
99-
cppcheck-unusedFunction:
100-
$(CPPCHECK_CMD) --enable=unusedFunction $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)unusedFunction.$(CPPCHECK_OUT_EXT).tmp;
101-
$(SED) $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)unusedFunction.$(CPPCHECK_OUT_EXT).tmp > $(CPPCHECK_OUT_PREFIX)unusedFunction.$(CPPCHECK_OUT_EXT)
102-
rm -f $(CPPCHECK_OUT_PREFIX)unusedFunction.$(CPPCHECK_OUT_EXT).tmp
103-
104-
cppcheck-missingInclude:
105-
$(CPPCHECK_CMD) --enable=missingInclude $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)missingInclude.$(CPPCHECK_OUT_EXT).tmp;
106-
$(SED) $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)missingInclude.$(CPPCHECK_OUT_EXT).tmp > $(CPPCHECK_OUT_PREFIX)missingInclude.$(CPPCHECK_OUT_EXT)
107-
rm -f $(CPPCHECK_OUT_PREFIX)missingInclude.$(CPPCHECK_OUT_EXT).tmp
108-
109-
cppcheck-split-all: \
110-
cppcheck-information \
111-
cppcheck-performance \
112-
cppcheck-portability \
113-
cppcheck-style \
114-
cppcheck-warning \
115-
cppcheck-unusedFunction \
116-
cppcheck-missingInclude
117-
11836
INDENT_CMD = clang-format -i
11937

12038
INDENT_DIRS = \

acinclude.m4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ m4_include([m4.include/gnulib/fsusage.m4])
66
m4_include([m4.include/gnulib/mountlist.m4])
77
m4_include([m4.include/gnulib/windows-stat-inodes.m4])
88
m4_include([m4.include/gnulib/sys_types_h.m4])
9-
m4_include([m4.include/dx_doxygen.m4])
109
m4_include([m4.include/ax_require_defined.m4])
1110
m4_include([m4.include/ax_check_compile_flag.m4])
1211
m4_include([m4.include/ax_append_flag.m4])

configure.ac

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -522,17 +522,6 @@ for h_lang in $ALL_DOC_LINGUAS; do
522522
done
523523
AC_SUBST(DOC_LINGUAS)
524524

525-
DX_HTML_FEATURE(ON)
526-
DX_CHM_FEATURE(OFF)
527-
DX_CHI_FEATURE(OFF)
528-
DX_MAN_FEATURE(OFF)
529-
DX_RTF_FEATURE(OFF)
530-
DX_XML_FEATURE(OFF)
531-
DX_PDF_FEATURE(OFF)
532-
DX_PS_FEATURE(OFF)
533-
DX_INIT_DOXYGEN(mc,doxygen.cfg,devel)
534-
535-
536525
dnl ############################################################################
537526
dnl Configure results
538527
dnl ############################################################################

doc/Makefile.am

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
DIST_SUBDIRS = hints man hlp
22
SUBDIRS = hints man hlp
33

4-
DOCS = FAQ HACKING INSTALL
5-
EXTRA_DIST = $(DX_CONFIG) doxygen-include.am $(DOCS)
6-
7-
include doxygen-include.am
4+
EXTRA_DIST = FAQ HACKING INSTALL

doc/doxygen-include.am

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

0 commit comments

Comments
 (0)