Skip to content

Commit d03f005

Browse files
pfultz2pfultz2
committed
Move filelister to cppcheck-core
1 parent bdf2f42 commit d03f005

File tree

10 files changed

+32
-30
lines changed

10 files changed

+32
-30
lines changed

‎Makefile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ LIBOBJ = $(libcppdir)/valueflow.o \
233233
$(libcppdir)/ctu.o \
234234
$(libcppdir)/errorlogger.o \
235235
$(libcppdir)/errortypes.o \
236+
$(libcppdir)/filelister.o \
236237
$(libcppdir)/findtoken.o \
237238
$(libcppdir)/forwardanalyzer.o \
238239
$(libcppdir)/fwdanalysis.o \
@@ -272,7 +273,6 @@ FEOBJ = frontend/frontend.o
272273
CLIOBJ = cli/cmdlineparser.o \
273274
cli/cppcheckexecutor.o \
274275
cli/executor.o \
275-
cli/filelister.o \
276276
cli/main.o \
277277
cli/processexecutor.o \
278278
cli/sehwrapper.o \
@@ -369,7 +369,7 @@ cppcheck: $(EXTOBJ) $(LIBOBJ) $(FEOBJ) $(CLIOBJ)
369369

370370
all: cppcheck testrunner
371371

372-
testrunner: $(EXTOBJ) $(TESTOBJ) $(LIBOBJ) $(FEOBJ) cli/cmdlineparser.o cli/cppcheckexecutor.o cli/executor.o cli/filelister.o cli/processexecutor.o cli/sehwrapper.o cli/signalhandler.o cli/singleexecutor.o cli/stacktrace.o cli/threadexecutor.o
372+
testrunner: $(EXTOBJ) $(TESTOBJ) $(LIBOBJ) $(FEOBJ) cli/cmdlineparser.o cli/cppcheckexecutor.o cli/executor.o cli/processexecutor.o cli/sehwrapper.o cli/signalhandler.o cli/singleexecutor.o cli/stacktrace.o cli/threadexecutor.o
373373
$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)
374374

375375
test: all
@@ -592,6 +592,9 @@ $(libcppdir)/errorlogger.o: lib/errorlogger.cpp externals/tinyxml2/tinyxml2.h li
592592
$(libcppdir)/errortypes.o: lib/errortypes.cpp lib/config.h lib/errortypes.h lib/utils.h
593593
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/errortypes.cpp
594594

595+
$(libcppdir)/filelister.o: lib/filelister.cpp lib/config.h lib/filelister.h lib/filesettings.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/standards.h lib/utils.h
596+
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/filelister.cpp
597+
595598
$(libcppdir)/findtoken.o: lib/findtoken.cpp lib/astutils.h lib/config.h lib/errortypes.h lib/findtoken.h lib/library.h lib/mathlib.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
596599
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/findtoken.cpp
597600

@@ -685,7 +688,7 @@ $(libcppdir)/vfvalue.o: lib/vfvalue.cpp lib/config.h lib/errortypes.h lib/mathli
685688
frontend/frontend.o: frontend/frontend.cpp frontend/frontend.h lib/addoninfo.h lib/checkers.h lib/config.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h
686689
$(CXX) ${INCLUDE_FOR_FE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ frontend/frontend.cpp
687690

688-
cli/cmdlineparser.o: cli/cmdlineparser.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/filelister.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/regex.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h lib/xml.h
691+
cli/cmdlineparser.o: cli/cmdlineparser.cpp cli/cmdlinelogger.h cli/cmdlineparser.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filelister.h lib/filesettings.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/regex.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h lib/xml.h
689692
$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/cmdlineparser.cpp
690693

691694
cli/cppcheckexecutor.o: cli/cppcheckexecutor.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/cppcheckexecutor.h cli/executor.h cli/processexecutor.h cli/sehwrapper.h cli/signalhandler.h cli/singleexecutor.h cli/threadexecutor.h externals/picojson/picojson.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/checkers.h lib/checkersreport.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/sarifreport.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h
@@ -694,9 +697,6 @@ cli/cppcheckexecutor.o: cli/cppcheckexecutor.cpp cli/cmdlinelogger.h cli/cmdline
694697
cli/executor.o: cli/executor.cpp cli/executor.h lib/addoninfo.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
695698
$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/executor.cpp
696699

697-
cli/filelister.o: cli/filelister.cpp cli/filelister.h lib/config.h lib/filesettings.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/standards.h lib/utils.h
698-
$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/filelister.cpp
699-
700700
cli/main.o: cli/main.cpp cli/cppcheckexecutor.h lib/config.h lib/errortypes.h lib/filesettings.h lib/mathlib.h lib/path.h lib/platform.h lib/standards.h
701701
$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/main.cpp
702702

@@ -721,7 +721,7 @@ cli/threadexecutor.o: cli/threadexecutor.cpp cli/executor.h cli/threadexecutor.h
721721
test/fixture.o: test/fixture.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/xml.h test/fixture.h test/helpers.h test/options.h test/redirect.h
722722
$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/fixture.cpp
723723

724-
test/helpers.o: test/helpers.cpp cli/filelister.h externals/simplecpp/simplecpp.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/checkers.h lib/config.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/xml.h test/helpers.h
724+
test/helpers.o: test/helpers.cpp externals/simplecpp/simplecpp.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/checkers.h lib/config.h lib/errortypes.h lib/filelister.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/xml.h test/helpers.h
725725
$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/helpers.cpp
726726

727727
test/main.o: test/main.cpp externals/simplecpp/simplecpp.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h test/options.h
@@ -787,7 +787,7 @@ test/testexceptionsafety.o: test/testexceptionsafety.cpp lib/addoninfo.h lib/che
787787
test/testexecutor.o: test/testexecutor.cpp cli/executor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
788788
$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testexecutor.cpp
789789

790-
test/testfilelister.o: test/testfilelister.cpp cli/filelister.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
790+
test/testfilelister.o: test/testfilelister.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filelister.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
791791
$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testfilelister.cpp
792792

793793
test/testfilesettings.o: test/testfilesettings.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
@@ -955,6 +955,6 @@ externals/simplecpp/simplecpp.o: externals/simplecpp/simplecpp.cpp externals/sim
955955
externals/tinyxml2/tinyxml2.o: externals/tinyxml2/tinyxml2.cpp externals/tinyxml2/tinyxml2.h
956956
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -w -D_LARGEFILE_SOURCE -c -o $@ externals/tinyxml2/tinyxml2.cpp
957957

958-
tools/dmake/dmake.o: tools/dmake/dmake.cpp cli/filelister.h lib/config.h lib/filesettings.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/standards.h lib/utils.h
958+
tools/dmake/dmake.o: tools/dmake/dmake.cpp lib/config.h lib/filelister.h lib/filesettings.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/standards.h lib/utils.h
959959
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ tools/dmake/dmake.cpp
960960

‎cli/CMakeLists.txt‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11

2-
file(GLOB hdrs "*.h")
3-
file(GLOB srcs "*.cpp")
4-
file(GLOB mainfile "main.cpp")
5-
list(REMOVE_ITEM srcs ${mainfile})
2+
if (BUILD_CLI)
3+
file(GLOB hdrs "*.h")
4+
file(GLOB srcs "*.cpp")
5+
file(GLOB mainfile "main.cpp")
6+
list(REMOVE_ITEM srcs ${mainfile})
67

7-
add_library(cli ${hdrs} ${srcs})
8-
target_include_directories(cli PUBLIC .)
9-
target_link_libraries(cli PRIVATE cppcheck-core frontend tinyxml2 simplecpp picojson)
10-
if (NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
11-
target_precompile_headers(cli PRIVATE precompiled.h)
12-
endif()
8+
add_library(cli ${hdrs} ${srcs})
9+
target_include_directories(cli PUBLIC .)
10+
target_link_libraries(cli PRIVATE cppcheck-core frontend tinyxml2 simplecpp picojson)
11+
if (NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
12+
target_precompile_headers(cli PRIVATE precompiled.h)
13+
endif()
1314

14-
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 13)
15-
# false positive warning in Clang 13 - caused by FD_ZERO macro
16-
set_source_files_properties(processexecutor.cpp PROPERTIES COMPILE_FLAGS -Wno-reserved-identifier)
17-
endif()
15+
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 13)
16+
# false positive warning in Clang 13 - caused by FD_ZERO macro
17+
set_source_files_properties(processexecutor.cpp PROPERTIES COMPILE_FLAGS -Wno-reserved-identifier)
18+
endif()
1819

19-
if (BUILD_CLI)
2020
list(APPEND cppcheck_SOURCES ${hdrs} ${mainfile})
2121
if (WIN32)
2222
list(APPEND cppcheck_SOURCES version.rc)

‎cli/cli.vcxproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@
224224
<ClInclude Include="cmdlineparser.h" />
225225
<ClInclude Include="cppcheckexecutor.h" />
226226
<ClInclude Include="executor.h" />
227-
<ClInclude Include="filelister.h" />
228227
<ClInclude Include="processexecutor.h" />
229228
<ClInclude Include="sehwrapper.h" />
230229
<ClInclude Include="signalhandler.h" />
@@ -247,7 +246,6 @@
247246
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release-PCRE|x64'">Create</PrecompiledHeader>
248247
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug-PCRE|x64'">Create</PrecompiledHeader>
249248
</ClCompile>
250-
<ClCompile Include="filelister.cpp" />
251249
<ClCompile Include="main.cpp" />
252250
<ClCompile Include="processexecutor.cpp" />
253251
<ClCompile Include="sehwrapper.cpp" />

‎lib/cppcheck.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
<ClCompile Include="ctu.cpp" />
6666
<ClCompile Include="errorlogger.cpp" />
6767
<ClCompile Include="errortypes.cpp" />
68+
<ClCompile Include="filelister.cpp" />
6869
<ClCompile Include="findtoken.cpp" />
6970
<ClCompile Include="forwardanalyzer.cpp" />
7071
<ClCompile Include="fwdanalysis.cpp" />
@@ -139,6 +140,7 @@
139140
<ClInclude Include="ctu.h" />
140141
<ClInclude Include="errorlogger.h" />
141142
<ClInclude Include="errortypes.h" />
143+
<ClInclude Include="filelister.h" />
142144
<ClInclude Include="filesettings.h" />
143145
<ClInclude Include="findtoken.h" />
144146
<ClInclude Include="forwardanalyzer.h" />

cli/filelister.cpp renamed to lib/filelister.cpp

File renamed without changes.

cli/filelister.h renamed to lib/filelister.h

File renamed without changes.

‎oss-fuzz/Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ LIBOBJ = $(libcppdir)/valueflow.o \
7979
$(libcppdir)/ctu.o \
8080
$(libcppdir)/errorlogger.o \
8181
$(libcppdir)/errortypes.o \
82+
$(libcppdir)/filelister.o \
8283
$(libcppdir)/findtoken.o \
8384
$(libcppdir)/forwardanalyzer.o \
8485
$(libcppdir)/fwdanalysis.o \
@@ -272,6 +273,9 @@ $(libcppdir)/errorlogger.o: ../lib/errorlogger.cpp ../externals/tinyxml2/tinyxml
272273
$(libcppdir)/errortypes.o: ../lib/errortypes.cpp ../lib/config.h ../lib/errortypes.h ../lib/utils.h
273274
$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/errortypes.cpp
274275

276+
$(libcppdir)/filelister.o: ../lib/filelister.cpp ../lib/config.h ../lib/filelister.h ../lib/filesettings.h ../lib/mathlib.h ../lib/path.h ../lib/pathmatch.h ../lib/platform.h ../lib/standards.h ../lib/utils.h
277+
$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/filelister.cpp
278+
275279
$(libcppdir)/findtoken.o: ../lib/findtoken.cpp ../lib/astutils.h ../lib/config.h ../lib/errortypes.h ../lib/findtoken.h ../lib/library.h ../lib/mathlib.h ../lib/smallvector.h ../lib/standards.h ../lib/templatesimplifier.h ../lib/token.h ../lib/utils.h ../lib/vfvalue.h
276280
$(CXX) ${LIB_FUZZING_ENGINE} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/findtoken.cpp
277281

‎test/testrunner.vcxproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<ClCompile Include="..\cli\cmdlineparser.cpp" />
2828
<ClCompile Include="..\cli\cppcheckexecutor.cpp" />
2929
<ClCompile Include="..\cli\executor.cpp" />
30-
<ClCompile Include="..\cli\filelister.cpp" />
3130
<ClCompile Include="..\cli\processexecutor.cpp" />
3231
<ClCompile Include="..\cli\sehwrapper.cpp" />
3332
<ClCompile Include="..\cli\signalhandler.cpp" />
@@ -122,7 +121,6 @@
122121
<ClInclude Include="..\cli\cmdlineparser.h" />
123122
<ClInclude Include="..\cli\cppcheckexecutor.h" />
124123
<ClInclude Include="..\cli\executor.h" />
125-
<ClInclude Include="..\cli\filelister.h" />
126124
<ClInclude Include="..\cli\processexecutor.h" />
127125
<ClInclude Include="..\cli\sehwrapper.h" />
128126
<ClInclude Include="..\cli\signalhandler.h" />

‎tools/dmake/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
add_executable(dmake EXCLUDE_FROM_ALL
33
dmake.cpp
44
)
5-
target_link_libraries(dmake cppcheck-core cli simplecpp)
5+
target_link_libraries(dmake cppcheck-core simplecpp)
66
if (WIN32 AND NOT BORLAND)
77
if(NOT MINGW)
88
target_link_libraries(dmake Shlwapi.lib)

‎tools/dmake/dmake.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <string>
3232
#include <vector>
3333

34-
#include "../cli/filelister.h"
34+
#include "../lib/filelister.h"
3535
#include "../lib/filesettings.h"
3636
#include "../lib/pathmatch.h"
3737
#include "../lib/utils.h"

0 commit comments

Comments
 (0)