noisymime
/
cppcheck
mirror of https://github.com/noisymime/cppcheck.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactoring the folder structure

This commit is contained in:
Daniel Marjamäki 2009-10-25 12:49:06 +01:00
parent 3ecb7ddf26
commit 09859c1019
75 changed files with 222 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

265
Makefile
View File

@ -1,31 +1,32 @@
CXXFLAGS=-Wall -Wextra -pedantic -O2 CXXFLAGS=-Wall -Wextra -pedantic -g
CXX=g++ CXX=g++
BIN=${DESTDIR}/usr/bin BIN=${DESTDIR}/usr/bin
###### Object Files ###### Object Files
OBJECTS = src/checkautovariables.o \ LIBOBJ = lib/checkautovariables.o \
src/checkbufferoverrun.o \ lib/checkbufferoverrun.o \
src/checkclass.o \ lib/checkclass.o \
src/checkdangerousfunctions.o \ lib/checkdangerousfunctions.o \
src/checkexceptionsafety.o \ lib/checkexceptionsafety.o \
src/checkheaders.o \ lib/checkheaders.o \
src/checkmemoryleak.o \ lib/checkmemoryleak.o \
src/checkother.o \ lib/checkother.o \
src/checkstl.o \ lib/checkstl.o \
src/checkunusedfunctions.o \ lib/checkunusedfunctions.o \
src/cppcheck.o \ lib/cppcheck.o \
src/cppcheckexecutor.o \ lib/errorlogger.o \
src/errorlogger.o \ lib/filelister.o \
src/filelister.o \ lib/mathlib.o \
src/main.o \ lib/preprocessor.o \
src/mathlib.o \ lib/settings.o \
src/preprocessor.o \ lib/token.o \
src/settings.o \ lib/tokenize.o
src/threadexecutor.o \
src/token.o \ CLIOBJ = cli/cppcheckexecutor.o \
src/tokenize.o cli/main.o \
cli/threadexecutor.o
TESTOBJ = test/testautovariables.o \ TESTOBJ = test/testautovariables.o \
test/testbufferoverrun.o \ test/testbufferoverrun.o \
@ -51,49 +52,29 @@ TESTOBJ = test/testautovariables.o \
test/testtokenize.o \ test/testtokenize.o \
test/testunusedfunctions.o \ test/testunusedfunctions.o \
test/testunusedprivfunc.o \ test/testunusedprivfunc.o \
test/testunusedvar.o \ test/testunusedvar.o
src/checkautovariables.o \
src/checkbufferoverrun.o \
src/checkclass.o \
src/checkdangerousfunctions.o \
src/checkexceptionsafety.o \
src/checkheaders.o \
src/checkmemoryleak.o \
src/checkother.o \
src/checkstl.o \
src/checkunusedfunctions.o \
src/cppcheck.o \
src/cppcheckexecutor.o \
src/errorlogger.o \
src/filelister.o \
src/mathlib.o \
src/preprocessor.o \
src/settings.o \
src/threadexecutor.o \
src/token.o \
src/tokenize.o
###### Targets ###### Targets
cppcheck: $(OBJECTS) cppcheck: $(LIBOBJ) $(CLIOBJ)
$(CXX) $(CXXFLAGS) -o cppcheck $(OBJECTS) $(LDFLAGS) $(CXX) $(CXXFLAGS) -o cppcheck $(CLIOBJ) $(LIBOBJ) $(LDFLAGS)
all: cppcheck testrunner tools all: cppcheck testrunner tools
testrunner: $(TESTOBJ) testrunner: $(TESTOBJ) $(LIBOBJ)
$(CXX) $(CXXFLAGS) -o testrunner $(TESTOBJ) $(LDFLAGS) $(CXX) $(CXXFLAGS) -o testrunner $(TESTOBJ) $(LIBOBJ) $(LDFLAGS)
test: all test: all
./testrunner ./testrunner
tools: tools/dmake tools: tools/dmake
tools/dmake: tools/dmake.cpp src/filelister.cpp src/filelister.h tools/dmake: tools/dmake.cpp lib/filelister.cpp lib/filelister.h
$(CXX) $(CXXFLAGS) -o tools/dmake tools/dmake.cpp src/filelister.cpp $(LDFLAGS) $(CXX) $(CXXFLAGS) -o tools/dmake tools/dmake.cpp lib/filelister.cpp $(LDFLAGS)
clean: clean:
rm -f src/*.o test/*.o testrunner cppcheck tools/dmake tools/errmsg rm -f lib/*.o cli/*.o test/*.o testrunner cppcheck tools/dmake tools/errmsg
install: cppcheck install: cppcheck
install -d ${BIN} install -d ${BIN}
@ -102,141 +83,141 @@ install: cppcheck
###### Build ###### Build
src/checkautovariables.o: src/checkautovariables.cpp src/checkautovariables.h src/check.h src/token.h src/tokenize.h src/classinfo.h src/settings.h src/errorlogger.h lib/checkautovariables.o: lib/checkautovariables.cpp lib/checkautovariables.h lib/check.h lib/token.h lib/tokenize.h lib/classinfo.h lib/settings.h lib/errorlogger.h
$(CXX) $(CXXFLAGS) -c -o src/checkautovariables.o src/checkautovariables.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o lib/checkautovariables.o lib/checkautovariables.cpp
src/checkbufferoverrun.o: src/checkbufferoverrun.cpp src/checkbufferoverrun.h src/check.h src/token.h src/tokenize.h src/classinfo.h src/settings.h src/errorlogger.h src/mathlib.h lib/checkbufferoverrun.o: lib/checkbufferoverrun.cpp lib/checkbufferoverrun.h lib/check.h lib/token.h lib/tokenize.h lib/classinfo.h lib/settings.h lib/errorlogger.h lib/mathlib.h
$(CXX) $(CXXFLAGS) -c -o src/checkbufferoverrun.o src/checkbufferoverrun.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o lib/checkbufferoverrun.o lib/checkbufferoverrun.cpp
src/checkclass.o: src/checkclass.cpp src/checkclass.h src/check.h src/token.h src/tokenize.h src/classinfo.h src/settings.h src/errorlogger.h lib/checkclass.o: lib/checkclass.cpp lib/checkclass.h lib/check.h lib/token.h lib/tokenize.h lib/classinfo.h lib/settings.h lib/errorlogger.h
$(CXX) $(CXXFLAGS) -c -o src/checkclass.o src/checkclass.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o lib/checkclass.o lib/checkclass.cpp
src/checkdangerousfunctions.o: src/checkdangerousfunctions.cpp src/checkdangerousfunctions.h src/check.h src/token.h src/tokenize.h src/classinfo.h src/settings.h src/errorlogger.h lib/checkdangerousfunctions.o: lib/checkdangerousfunctions.cpp lib/checkdangerousfunctions.h lib/check.h lib/token.h lib/tokenize.h lib/classinfo.h lib/settings.h lib/errorlogger.h
$(CXX) $(CXXFLAGS) -c -o src/checkdangerousfunctions.o src/checkdangerousfunctions.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o lib/checkdangerousfunctions.o lib/checkdangerousfunctions.cpp
src/checkexceptionsafety.o: src/checkexceptionsafety.cpp lib/checkexceptionsafety.o: lib/checkexceptionsafety.cpp lib/checkexceptionsafety.h lib/check.h lib/token.h lib/tokenize.h lib/classinfo.h lib/settings.h lib/errorlogger.h
$(CXX) $(CXXFLAGS) -c -o src/checkexceptionsafety.o src/checkexceptionsafety.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o lib/checkexceptionsafety.o lib/checkexceptionsafety.cpp
src/checkheaders.o: src/checkheaders.cpp src/checkheaders.h src/tokenize.h src/classinfo.h src/token.h src/errorlogger.h src/settings.h src/filelister.h lib/checkheaders.o: lib/checkheaders.cpp lib/checkheaders.h lib/tokenize.h lib/classinfo.h lib/token.h lib/errorlogger.h lib/settings.h lib/filelister.h
$(CXX) $(CXXFLAGS) -c -o src/checkheaders.o src/checkheaders.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o lib/checkheaders.o lib/checkheaders.cpp
src/checkmemoryleak.o: src/checkmemoryleak.cpp src/checkmemoryleak.h src/check.h src/token.h src/tokenize.h src/classinfo.h src/settings.h src/errorlogger.h src/mathlib.h lib/checkmemoryleak.o: lib/checkmemoryleak.cpp lib/checkmemoryleak.h lib/check.h lib/token.h lib/tokenize.h lib/classinfo.h lib/settings.h lib/errorlogger.h lib/mathlib.h
$(CXX) $(CXXFLAGS) -c -o src/checkmemoryleak.o src/checkmemoryleak.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o lib/checkmemoryleak.o lib/checkmemoryleak.cpp
src/checkother.o: src/checkother.cpp src/checkother.h src/check.h src/token.h src/tokenize.h src/classinfo.h src/settings.h src/errorlogger.h src/mathlib.h lib/checkother.o: lib/checkother.cpp lib/checkother.h lib/check.h lib/token.h lib/tokenize.h lib/classinfo.h lib/settings.h lib/errorlogger.h lib/mathlib.h
$(CXX) $(CXXFLAGS) -c -o src/checkother.o src/checkother.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o lib/checkother.o lib/checkother.cpp
src/checkstl.o: src/checkstl.cpp src/checkstl.h src/check.h src/token.h src/tokenize.h src/classinfo.h src/settings.h src/errorlogger.h lib/checkstl.o: lib/checkstl.cpp lib/checkstl.h lib/check.h lib/token.h lib/tokenize.h lib/classinfo.h lib/settings.h lib/errorlogger.h
$(CXX) $(CXXFLAGS) -c -o src/checkstl.o src/checkstl.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o lib/checkstl.o lib/checkstl.cpp
src/checkunusedfunctions.o: src/checkunusedfunctions.cpp src/checkunusedfunctions.h src/tokenize.h src/classinfo.h src/token.h src/errorlogger.h src/settings.h lib/checkunusedfunctions.o: lib/checkunusedfunctions.cpp lib/checkunusedfunctions.h lib/tokenize.h lib/classinfo.h lib/token.h lib/errorlogger.h lib/settings.h
$(CXX) $(CXXFLAGS) -c -o src/checkunusedfunctions.o src/checkunusedfunctions.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o lib/checkunusedfunctions.o lib/checkunusedfunctions.cpp
src/cppcheck.o: src/cppcheck.cpp src/cppcheck.h src/settings.h src/errorlogger.h src/checkunusedfunctions.h src/tokenize.h src/classinfo.h src/token.h src/preprocessor.h src/filelister.h src/check.h lib/cppcheck.o: lib/cppcheck.cpp lib/cppcheck.h lib/settings.h lib/errorlogger.h lib/checkunusedfunctions.h lib/tokenize.h lib/classinfo.h lib/token.h lib/preprocessor.h lib/filelister.h lib/check.h
$(CXX) $(CXXFLAGS) -c -o src/cppcheck.o src/cppcheck.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o lib/cppcheck.o lib/cppcheck.cpp
src/cppcheckexecutor.o: src/cppcheckexecutor.cpp src/cppcheckexecutor.h src/errorlogger.h src/settings.h src/cppcheck.h src/checkunusedfunctions.h src/tokenize.h src/classinfo.h src/token.h src/threadexecutor.h lib/errorlogger.o: lib/errorlogger.cpp lib/errorlogger.h lib/settings.h lib/tokenize.h lib/classinfo.h lib/token.h
$(CXX) $(CXXFLAGS) -c -o src/cppcheckexecutor.o src/cppcheckexecutor.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o lib/errorlogger.o lib/errorlogger.cpp
src/errorlogger.o: src/errorlogger.cpp src/errorlogger.h src/settings.h src/tokenize.h src/classinfo.h src/token.h lib/filelister.o: lib/filelister.cpp lib/filelister.h
$(CXX) $(CXXFLAGS) -c -o src/errorlogger.o src/errorlogger.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o lib/filelister.o lib/filelister.cpp
src/filelister.o: src/filelister.cpp src/filelister.h lib/mathlib.o: lib/mathlib.cpp lib/mathlib.h lib/token.h
$(CXX) $(CXXFLAGS) -c -o src/filelister.o src/filelister.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o lib/mathlib.o lib/mathlib.cpp
src/main.o: src/main.cpp src/cppcheckexecutor.h src/errorlogger.h src/settings.h lib/preprocessor.o: lib/preprocessor.cpp lib/preprocessor.h lib/errorlogger.h lib/settings.h lib/tokenize.h lib/classinfo.h lib/token.h lib/filelister.h
$(CXX) $(CXXFLAGS) -c -o src/main.o src/main.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o lib/preprocessor.o lib/preprocessor.cpp
src/mathlib.o: src/mathlib.cpp src/mathlib.h src/token.h lib/settings.o: lib/settings.cpp lib/settings.h
$(CXX) $(CXXFLAGS) -c -o src/mathlib.o src/mathlib.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o lib/settings.o lib/settings.cpp
src/preprocessor.o: src/preprocessor.cpp src/preprocessor.h src/errorlogger.h src/settings.h src/tokenize.h src/classinfo.h src/token.h src/filelister.h lib/token.o: lib/token.cpp lib/token.h
$(CXX) $(CXXFLAGS) -c -o src/preprocessor.o src/preprocessor.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o lib/token.o lib/token.cpp
src/settings.o: src/settings.cpp src/settings.h lib/tokenize.o: lib/tokenize.cpp lib/tokenize.h lib/classinfo.h lib/token.h lib/filelister.h lib/mathlib.h lib/settings.h lib/errorlogger.h lib/check.h
$(CXX) $(CXXFLAGS) -c -o src/settings.o src/settings.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o lib/tokenize.o lib/tokenize.cpp
src/threadexecutor.o: src/threadexecutor.cpp src/threadexecutor.h src/settings.h src/errorlogger.h src/cppcheck.h src/checkunusedfunctions.h src/tokenize.h src/classinfo.h src/token.h cli/cppcheckexecutor.o: cli/cppcheckexecutor.cpp cli/cppcheckexecutor.h cli/threadexecutor.h
$(CXX) $(CXXFLAGS) -c -o src/threadexecutor.o src/threadexecutor.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o cli/cppcheckexecutor.o cli/cppcheckexecutor.cpp
src/token.o: src/token.cpp src/token.h cli/main.o: cli/main.cpp cli/cppcheckexecutor.h
$(CXX) $(CXXFLAGS) -c -o src/token.o src/token.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o cli/main.o cli/main.cpp
src/tokenize.o: src/tokenize.cpp src/tokenize.h src/classinfo.h src/token.h src/filelister.h src/mathlib.h src/settings.h src/errorlogger.h src/check.h cli/threadexecutor.o: cli/threadexecutor.cpp cli/threadexecutor.h
$(CXX) $(CXXFLAGS) -c -o src/tokenize.o src/tokenize.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o cli/threadexecutor.o cli/threadexecutor.cpp
test/testautovariables.o: test/testautovariables.cpp src/tokenize.h src/classinfo.h src/token.h src/checkautovariables.h src/check.h src/settings.h src/errorlogger.h test/testsuite.h test/testautovariables.o: test/testautovariables.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testautovariables.o test/testautovariables.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testautovariables.o test/testautovariables.cpp
test/testbufferoverrun.o: test/testbufferoverrun.cpp src/tokenize.h src/classinfo.h src/token.h src/checkbufferoverrun.h src/check.h src/settings.h src/errorlogger.h test/testsuite.h test/testbufferoverrun.o: test/testbufferoverrun.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testbufferoverrun.o test/testbufferoverrun.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testbufferoverrun.o test/testbufferoverrun.cpp
test/testcharvar.o: test/testcharvar.cpp src/tokenize.h src/classinfo.h src/token.h src/checkother.h src/check.h src/settings.h src/errorlogger.h test/testsuite.h test/testcharvar.o: test/testcharvar.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testcharvar.o test/testcharvar.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testcharvar.o test/testcharvar.cpp
test/testclass.o: test/testclass.cpp src/tokenize.h src/classinfo.h src/token.h src/checkclass.h src/check.h src/settings.h src/errorlogger.h test/testsuite.h test/testclass.o: test/testclass.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testclass.o test/testclass.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testclass.o test/testclass.cpp
test/testconstructors.o: test/testconstructors.cpp src/tokenize.h src/classinfo.h src/token.h src/checkclass.h src/check.h src/settings.h src/errorlogger.h test/testsuite.h test/testconstructors.o: test/testconstructors.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testconstructors.o test/testconstructors.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testconstructors.o test/testconstructors.cpp
test/testcppcheck.o: test/testcppcheck.cpp test/testsuite.h src/errorlogger.h src/settings.h src/cppcheck.h src/checkunusedfunctions.h src/tokenize.h src/classinfo.h src/token.h test/testcppcheck.o: test/testcppcheck.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testcppcheck.o test/testcppcheck.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testcppcheck.o test/testcppcheck.cpp
test/testdangerousfunctions.o: test/testdangerousfunctions.cpp src/tokenize.h src/classinfo.h src/token.h src/checkdangerousfunctions.h src/check.h src/settings.h src/errorlogger.h test/testsuite.h test/testdangerousfunctions.o: test/testdangerousfunctions.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testdangerousfunctions.o test/testdangerousfunctions.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testdangerousfunctions.o test/testdangerousfunctions.cpp
test/testdivision.o: test/testdivision.cpp src/tokenize.h src/classinfo.h src/token.h src/checkother.h src/check.h src/settings.h src/errorlogger.h test/testsuite.h test/testdivision.o: test/testdivision.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testdivision.o test/testdivision.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testdivision.o test/testdivision.cpp
test/testexceptionsafety.o: test/testexceptionsafety.cpp test/testexceptionsafety.o: test/testexceptionsafety.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testexceptionsafety.o test/testexceptionsafety.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testexceptionsafety.o test/testexceptionsafety.cpp
test/testfilelister.o: test/testfilelister.cpp test/testsuite.h src/errorlogger.h src/settings.h src/filelister.h test/testfilelister.o: test/testfilelister.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testfilelister.o test/testfilelister.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testfilelister.o test/testfilelister.cpp
test/testincompletestatement.o: test/testincompletestatement.cpp test/testsuite.h src/errorlogger.h src/settings.h src/tokenize.h src/classinfo.h src/token.h src/checkother.h src/check.h test/testincompletestatement.o: test/testincompletestatement.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testincompletestatement.o test/testincompletestatement.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testincompletestatement.o test/testincompletestatement.cpp
test/testmathlib.o: test/testmathlib.cpp src/mathlib.h src/token.h test/testsuite.h src/errorlogger.h src/settings.h test/testmathlib.o: test/testmathlib.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testmathlib.o test/testmathlib.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testmathlib.o test/testmathlib.cpp
test/testmemleak.o: test/testmemleak.cpp src/tokenize.h src/classinfo.h src/token.h src/checkmemoryleak.h src/check.h src/settings.h src/errorlogger.h test/testsuite.h test/testmemleak.o: test/testmemleak.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testmemleak.o test/testmemleak.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testmemleak.o test/testmemleak.cpp
test/testother.o: test/testother.cpp src/tokenize.h src/classinfo.h src/token.h src/checkother.h src/check.h src/settings.h src/errorlogger.h test/testsuite.h test/testother.o: test/testother.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testother.o test/testother.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testother.o test/testother.cpp
test/testpreprocessor.o: test/testpreprocessor.cpp test/testsuite.h src/errorlogger.h src/settings.h src/preprocessor.h src/tokenize.h src/classinfo.h src/token.h test/testpreprocessor.o: test/testpreprocessor.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testpreprocessor.o test/testpreprocessor.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testpreprocessor.o test/testpreprocessor.cpp
test/testredundantif.o: test/testredundantif.cpp src/tokenize.h src/classinfo.h src/token.h src/checkother.h src/check.h src/settings.h src/errorlogger.h test/testsuite.h test/testredundantif.o: test/testredundantif.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testredundantif.o test/testredundantif.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testredundantif.o test/testredundantif.cpp
test/testrunner.o: test/testrunner.cpp test/testsuite.h src/errorlogger.h src/settings.h test/testrunner.o: test/testrunner.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testrunner.o test/testrunner.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testrunner.o test/testrunner.cpp
test/testsimplifytokens.o: test/testsimplifytokens.cpp test/testsuite.h src/errorlogger.h src/settings.h src/tokenize.h src/classinfo.h src/token.h test/testsimplifytokens.o: test/testsimplifytokens.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testsimplifytokens.o test/testsimplifytokens.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testsimplifytokens.o test/testsimplifytokens.cpp
test/teststl.o: test/teststl.cpp src/tokenize.h src/classinfo.h src/token.h src/checkstl.h src/check.h src/settings.h src/errorlogger.h test/testsuite.h test/teststl.o: test/teststl.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/teststl.o test/teststl.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/teststl.o test/teststl.cpp
test/testsuite.o: test/testsuite.cpp test/testsuite.h src/errorlogger.h src/settings.h test/testsuite.o: test/testsuite.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testsuite.o test/testsuite.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testsuite.o test/testsuite.cpp
test/testtoken.o: test/testtoken.cpp test/testsuite.h src/errorlogger.h src/settings.h src/tokenize.h src/classinfo.h src/token.h test/testtoken.o: test/testtoken.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testtoken.o test/testtoken.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testtoken.o test/testtoken.cpp
test/testtokenize.o: test/testtokenize.cpp test/testsuite.h src/errorlogger.h src/settings.h src/tokenize.h src/classinfo.h src/token.h test/testtokenize.o: test/testtokenize.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testtokenize.o test/testtokenize.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testtokenize.o test/testtokenize.cpp
test/testunusedfunctions.o: test/testunusedfunctions.cpp src/tokenize.h src/classinfo.h src/token.h test/testsuite.h src/errorlogger.h src/settings.h src/checkunusedfunctions.h test/testunusedfunctions.o: test/testunusedfunctions.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testunusedfunctions.o test/testunusedfunctions.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testunusedfunctions.o test/testunusedfunctions.cpp
test/testunusedprivfunc.o: test/testunusedprivfunc.cpp src/tokenize.h src/classinfo.h src/token.h src/checkclass.h src/check.h src/settings.h src/errorlogger.h test/testsuite.h test/testunusedprivfunc.o: test/testunusedprivfunc.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testunusedprivfunc.o test/testunusedprivfunc.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testunusedprivfunc.o test/testunusedprivfunc.cpp
test/testunusedvar.o: test/testunusedvar.cpp test/testsuite.h src/errorlogger.h src/settings.h src/tokenize.h src/classinfo.h src/token.h src/checkother.h src/check.h test/testunusedvar.o: test/testunusedvar.cpp test/testsuite.h
$(CXX) $(CXXFLAGS) -c -o test/testunusedvar.o test/testunusedvar.cpp $(CXX) $(CXXFLAGS) -Ilib -c -o test/testunusedvar.o test/testunusedvar.cpp

0
src/cppcheckexecutor.cpp → cli/cppcheckexecutor.cpp
View File

0
src/cppcheckexecutor.h → cli/cppcheckexecutor.h
View File

0
src/main.cpp → cli/main.cpp
View File

0
src/threadexecutor.cpp → cli/threadexecutor.cpp
View File

0
src/threadexecutor.h → cli/threadexecutor.h
View File

0
src/check.h → lib/check.h
View File

0
src/checkautovariables.cpp → lib/checkautovariables.cpp
View File

0
src/checkautovariables.h → lib/checkautovariables.h
View File

0
src/checkbufferoverrun.cpp → lib/checkbufferoverrun.cpp
View File

0
src/checkbufferoverrun.h → lib/checkbufferoverrun.h
View File

0
src/checkclass.cpp → lib/checkclass.cpp
View File

0
src/checkclass.h → lib/checkclass.h
View File

0
src/checkdangerousfunctions.cpp → lib/checkdangerousfunctions.cpp
View File

0
src/checkdangerousfunctions.h → lib/checkdangerousfunctions.h
View File

0
src/checkexceptionsafety.cpp → lib/checkexceptionsafety.cpp
View File

0
src/checkexceptionsafety.h → lib/checkexceptionsafety.h
View File

0
src/checkheaders.cpp → lib/checkheaders.cpp
View File

0
src/checkheaders.h → lib/checkheaders.h
View File

0
src/checkmemoryleak.cpp → lib/checkmemoryleak.cpp
View File

0
src/checkmemoryleak.h → lib/checkmemoryleak.h
View File

0
src/checkother.cpp → lib/checkother.cpp
View File

0
src/checkother.h → lib/checkother.h
View File

0
src/checkstl.cpp → lib/checkstl.cpp
View File

0
src/checkstl.h → lib/checkstl.h
View File

0
src/checkunusedfunctions.cpp → lib/checkunusedfunctions.cpp
View File

0
src/checkunusedfunctions.h → lib/checkunusedfunctions.h
View File

0
src/classinfo.h → lib/classinfo.h
View File

0
src/cppcheck.cpp → lib/cppcheck.cpp
View File

0
src/cppcheck.h → lib/cppcheck.h
View File

0
src/cppcheck.rc → lib/cppcheck.rc
View File

0
src/errorlogger.cpp → lib/errorlogger.cpp
View File

0
src/errorlogger.h → lib/errorlogger.h
View File

0
src/filelister.cpp → lib/filelister.cpp
View File

0
src/filelister.h → lib/filelister.h
View File

0
src/mathlib.cpp → lib/mathlib.cpp
View File

0
src/mathlib.h → lib/mathlib.h
View File

0
src/preprocessor.cpp → lib/preprocessor.cpp
View File

0
src/preprocessor.h → lib/preprocessor.h
View File

0
src/resource.h → lib/resource.h
View File

0
src/settings.cpp → lib/settings.cpp
View File

0
src/settings.h → lib/settings.h
View File

0
src/src.pri → lib/src.pri
View File

0
src/src.pro → lib/src.pro
View File

0
src/token.cpp → lib/token.cpp
View File

0
src/token.h → lib/token.h
View File

0
src/tokenize.cpp → lib/tokenize.cpp
View File

0
src/tokenize.h → lib/tokenize.h
View File

6
runastyle
View File

@ -1,9 +1,11 @@
#!/bin/bash #!/bin/bash
astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren src/*.cpp astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren cli/*.cpp
astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren src/*.h astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren cli/*.h
astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren gui/*.cpp astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren gui/*.cpp
astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren gui/*.h astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren gui/*.h
astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren lib/*.cpp
astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren lib/*.h
astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren test/*.cpp astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren test/*.cpp
astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren test/*.h astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren test/*.h

19
runastyle.bat
View File

@ -1,9 +1,12 @@
astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren src/*.cpp astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren cli/*.cpp
astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren src/*.h astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren cli/*.h
astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren gui/*.cpp astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren gui/*.cpp
astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren gui/*.h astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren gui/*.h
astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren test/*.cpp astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren lib/*.cpp
astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren test/*.h astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren lib/*.h
astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren tools/*.cpp astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren test/*.cpp
astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren test/*.h
astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren tools/*.cpp

4
test/testautovariables.cpp
View File

@ -17,8 +17,8 @@
*/ */
#include "../src/tokenize.h" #include "tokenize.h"
#include "../src/checkautovariables.h" #include "checkautovariables.h"
#include "testsuite.h" #include "testsuite.h"
#include <sstream> #include <sstream>

4
test/testbufferoverrun.cpp
View File

@ -17,8 +17,8 @@
*/ */
#include "../src/tokenize.h" #include "tokenize.h"
#include "../src/checkbufferoverrun.h" #include "checkbufferoverrun.h"
#include "testsuite.h" #include "testsuite.h"
#include <sstream> #include <sstream>

4
test/testcharvar.cpp
View File

@ -17,8 +17,8 @@
*/ */
#include "../src/tokenize.h" #include "tokenize.h"
#include "../src/checkother.h" #include "checkother.h"
#include "testsuite.h" #include "testsuite.h"
#include <sstream> #include <sstream>

4
test/testclass.cpp
View File

@ -18,8 +18,8 @@
#include "../src/tokenize.h" #include "tokenize.h"
#include "../src/checkclass.h" #include "checkclass.h"
#include "testsuite.h" #include "testsuite.h"
#include <sstream> #include <sstream>

4
test/testconstructors.cpp
View File

@ -18,8 +18,8 @@
#include "../src/tokenize.h" #include "tokenize.h"
#include "../src/checkclass.h" #include "checkclass.h"
#include "testsuite.h" #include "testsuite.h"
#include <sstream> #include <sstream>

2
test/testcppcheck.cpp
View File

@ -21,8 +21,8 @@
// the code for a known configuration, it generates the code for each configuration. // the code for a known configuration, it generates the code for each configuration.
#include "cppcheck.h"
#include "testsuite.h" #include "testsuite.h"
#include "../src/cppcheck.h"
#include <map> #include <map>
#include <string> #include <string>

4
test/testdangerousfunctions.cpp
View File

@ -17,8 +17,8 @@
*/ */
#include "../src/tokenize.h" #include "tokenize.h"
#include "../src/checkdangerousfunctions.h" #include "checkdangerousfunctions.h"
#include "testsuite.h" #include "testsuite.h"
#include <sstream> #include <sstream>

4
test/testdivision.cpp
View File

@ -21,8 +21,8 @@
// such as "svar / uvar". Treating "svar" as unsigned data is not good // such as "svar / uvar". Treating "svar" as unsigned data is not good
#include "../src/tokenize.h" #include "tokenize.h"
#include "../src/checkother.h" #include "checkother.h"
#include "testsuite.h" #include "testsuite.h"
#include <sstream> #include <sstream>

4
test/testexceptionsafety.cpp
View File

@ -17,8 +17,8 @@
*/ */
#include "../src/tokenize.h" #include "tokenize.h"
#include "../src/checkexceptionsafety.h" #include "checkexceptionsafety.h"
#include "testsuite.h" #include "testsuite.h"
#include <sstream> #include <sstream>

2
test/testfilelister.cpp
View File

@ -18,7 +18,7 @@
#include <string> #include <string>
#include "testsuite.h" #include "testsuite.h"
#include "../src/filelister.h" #include "filelister.h"
class TestFileLister : public TestFixture class TestFileLister : public TestFixture
{ {

4
test/testincompletestatement.cpp
View File

@ -22,8 +22,8 @@
#include "testsuite.h" #include "testsuite.h"
#include "../src/tokenize.h" #include "tokenize.h"
#include "../src/checkother.h" #include "checkother.h"
#include <sstream> #include <sstream>

2
test/testmathlib.cpp
View File

@ -18,7 +18,7 @@
#include "../src/mathlib.h" #include "mathlib.h"
#include "testsuite.h" #include "testsuite.h"
class TestMathLib : public TestFixture class TestMathLib : public TestFixture

4
test/testmemleak.cpp
View File

@ -19,8 +19,8 @@
#define private public #define private public
#include "../src/tokenize.h" #include "tokenize.h"
#include "../src/checkmemoryleak.h" #include "checkmemoryleak.h"
#undef private #undef private
#include "testsuite.h" #include "testsuite.h"

4
test/testother.cpp
View File

@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "../src/tokenize.h" #include "tokenize.h"
#include "../src/checkother.h" #include "checkother.h"
#include "testsuite.h" #include "testsuite.h"
#include <sstream> #include <sstream>

6
test/testpreprocessor.cpp
View File

@ -22,9 +22,9 @@
#include "testsuite.h" #include "testsuite.h"
#include "../src/preprocessor.h" #include "preprocessor.h"
#include "../src/tokenize.h" #include "tokenize.h"
#include "../src/token.h" #include "token.h"
#include <map> #include <map>
#include <string> #include <string>
#include <sstream> #include <sstream>

4
test/testredundantif.cpp
View File

@ -21,8 +21,8 @@
// such as "svar / uvar". Treating "svar" as unsigned data is not good // such as "svar / uvar". Treating "svar" as unsigned data is not good
#include "../src/tokenize.h" #include "tokenize.h"
#include "../src/checkother.h" #include "checkother.h"
#include "testsuite.h" #include "testsuite.h"
#include <sstream> #include <sstream>

4
test/testsimplifytokens.cpp
View File

@ -20,9 +20,9 @@
#include "testsuite.h" #include "testsuite.h"
#define private public #define private public
#include "../src/tokenize.h" #include "tokenize.h"
#undef private #undef private
#include "../src/token.h" #include "token.h"
#include <sstream> #include <sstream>
extern std::ostringstream errout; extern std::ostringstream errout;

4
test/teststl.cpp
View File

@ -18,8 +18,8 @@
#include "../src/tokenize.h" #include "tokenize.h"
#include "../src/checkstl.h" #include "checkstl.h"
#include "testsuite.h" #include "testsuite.h"
#include <sstream> #include <sstream>

2
test/testsuite.h
View File

@ -21,7 +21,7 @@
#define testsuiteH #define testsuiteH
#include <sstream> #include <sstream>
#include "../src/errorlogger.h" #include "errorlogger.h"
class Token; class Token;

7
test/testtoken.cpp
View File

@ -16,10 +16,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <cstring>
#include "testsuite.h" #include "testsuite.h"
#include "../src/tokenize.h" #include "tokenize.h"
#include "../src/token.h" #include "token.h"
#include <cstring>
extern std::ostringstream errout; extern std::ostringstream errout;
class TestTOKEN : public TestFixture class TestTOKEN : public TestFixture

4
test/testtokenize.cpp
View File

@ -24,9 +24,9 @@
#include <cstring> #include <cstring>
#include "testsuite.h" #include "testsuite.h"
#define private public #define private public
#include "../src/tokenize.h" #include "tokenize.h"
#undef private #undef private
#include "../src/token.h" #include "token.h"
extern std::ostringstream errout; extern std::ostringstream errout;
class TestTokenizer : public TestFixture class TestTokenizer : public TestFixture

4
test/testunusedfunctions.cpp
View File

@ -17,9 +17,9 @@
*/ */
#include "../src/tokenize.h" #include "tokenize.h"
#include "testsuite.h" #include "testsuite.h"
#include "../src/checkunusedfunctions.h" #include "checkunusedfunctions.h"
#include <sstream> #include <sstream>
extern std::ostringstream errout; extern std::ostringstream errout;

4
test/testunusedprivfunc.cpp
View File

@ -17,8 +17,8 @@
*/ */
#include "../src/tokenize.h" #include "tokenize.h"
#include "../src/checkclass.h" #include "checkclass.h"
#include "testsuite.h" #include "testsuite.h"
#include <sstream> #include <sstream>

4
test/testunusedvar.cpp
View File

@ -21,8 +21,8 @@
// Check for unused variables.. // Check for unused variables..
#include "testsuite.h" #include "testsuite.h"
#include "../src/tokenize.h" #include "tokenize.h"
#include "../src/checkother.h" #include "checkother.h"
#include <sstream> #include <sstream>
extern std::ostringstream errout; extern std::ostringstream errout;

79
tools/dmake.cpp
View File

@ -23,7 +23,7 @@
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <vector> #include <vector>
#include "../src/filelister.h" #include "../lib/filelister.h"
std::string objfile(std::string cppfile) std::string objfile(std::string cppfile)
{ {
@ -61,16 +61,28 @@ void getDeps(const std::string &filename, std::vector<std::string> &depfiles)
} }
} }
static void compilefiles(std::ostream &fout, const std::vector<std::string> &files)
{
for (unsigned int i = 0; i < files.size(); ++i)
{
fout << objfile(files[i]) << ": " << files[i];
std::vector<std::string> depfiles;
getDeps(files[i], depfiles);
for (unsigned int dep = 0; dep < depfiles.size(); ++dep)
fout << " " << depfiles[dep];
fout << "\n\t$(CXX) $(CXXFLAGS) -Ilib -c -o " << objfile(files[i]) << " " << files[i] << "\n\n";
}
}
int main() int main()
{ {
// Get files.. // Get files..
std::vector<std::string> srcfiles; std::vector<std::string> libfiles;
FileLister::recursiveAddFiles(srcfiles, "src/", true); FileLister::recursiveAddFiles(libfiles, "lib/", true);
if (srcfiles.empty())
{ std::vector<std::string> clifiles;
std::cout << "No source files found." << std::endl; FileLister::recursiveAddFiles(clifiles, "cli/", true);
exit(1);
}
std::vector<std::string> testfiles; std::vector<std::string> testfiles;
FileLister::recursiveAddFiles(testfiles, "test/", true); FileLister::recursiveAddFiles(testfiles, "test/", true);
@ -82,59 +94,42 @@ int main()
fout << "BIN=${DESTDIR}/usr/bin\n\n"; fout << "BIN=${DESTDIR}/usr/bin\n\n";
fout << "\n###### Object Files\n\n"; fout << "\n###### Object Files\n\n";
fout << "OBJECTS = " << objfile(srcfiles[0]); fout << "LIBOBJ = " << objfile(libfiles[0]);
for (unsigned int i = 1; i < srcfiles.size(); ++i) for (unsigned int i = 1; i < libfiles.size(); ++i)
fout << " \\" << std::endl << std::string(14, ' ') << objfile(srcfiles[i]); fout << " \\" << std::endl << std::string(14, ' ') << objfile(libfiles[i]);
fout << "\n\n";
fout << "CLIOBJ = " << objfile(clifiles[0]);
for (unsigned int i = 1; i < clifiles.size(); ++i)
fout << " \\" << std::endl << std::string(14, ' ') << objfile(clifiles[i]);
fout << "\n\n"; fout << "\n\n";
fout << "TESTOBJ = " << objfile(testfiles[0]); fout << "TESTOBJ = " << objfile(testfiles[0]);
for (unsigned int i = 1; i < testfiles.size(); ++i) for (unsigned int i = 1; i < testfiles.size(); ++i)
fout << " \\" << std::endl << std::string(14, ' ') << objfile(testfiles[i]); fout << " \\" << std::endl << std::string(14, ' ') << objfile(testfiles[i]);
for (unsigned int i = 0; i < srcfiles.size(); ++i)
{
if (srcfiles[i] != "src/main.cpp")
fout << " \\" << std::endl << std::string(14, ' ') << objfile(srcfiles[i]);
}
fout << "\n\n"; fout << "\n\n";
fout << "\n###### Targets\n\n"; fout << "\n###### Targets\n\n";
fout << "cppcheck:\t$(OBJECTS)\n"; fout << "cppcheck:\t$(LIBOBJ)\t$(CLIOBJ)\n";
fout << "\t$(CXX) $(CXXFLAGS) -o cppcheck $(OBJECTS) $(LDFLAGS)\n\n"; fout << "\t$(CXX) $(CXXFLAGS) -o cppcheck $(CLIOBJ) $(LIBOBJ) $(LDFLAGS)\n\n";
fout << "all:\tcppcheck\ttestrunner\ttools\n\n"; fout << "all:\tcppcheck\ttestrunner\ttools\n\n";
fout << "testrunner:\t$(TESTOBJ)\n"; fout << "testrunner:\t$(TESTOBJ)\t$(LIBOBJ)\n";
fout << "\t$(CXX) $(CXXFLAGS) -o testrunner $(TESTOBJ) $(LDFLAGS)\n\n"; fout << "\t$(CXX) $(CXXFLAGS) -o testrunner $(TESTOBJ) $(LIBOBJ) $(LDFLAGS)\n\n";
fout << "test:\tall\n"; fout << "test:\tall\n";
fout << "\t./testrunner\n\n"; fout << "\t./testrunner\n\n";
fout << "tools:\ttools/dmake\n\n"; fout << "tools:\ttools/dmake\n\n";
fout << "tools/dmake:\ttools/dmake.cpp\tsrc/filelister.cpp\tsrc/filelister.h\n"; fout << "tools/dmake:\ttools/dmake.cpp\tlib/filelister.cpp\tlib/filelister.h\n";
fout << "\t$(CXX) $(CXXFLAGS) -o tools/dmake tools/dmake.cpp src/filelister.cpp $(LDFLAGS)\n\n"; fout << "\t$(CXX) $(CXXFLAGS) -o tools/dmake tools/dmake.cpp lib/filelister.cpp $(LDFLAGS)\n\n";
fout << "clean:\n"; fout << "clean:\n";
fout << "\trm -f src/*.o test/*.o testrunner cppcheck tools/dmake tools/errmsg\n\n"; fout << "\trm -f lib/*.o cli/*.o test/*.o testrunner cppcheck tools/dmake\n\n";
fout << "install:\tcppcheck\n"; fout << "install:\tcppcheck\n";
fout << "\tinstall -d ${BIN}\n"; fout << "\tinstall -d ${BIN}\n";
fout << "\tinstall cppcheck ${BIN}\n\n"; fout << "\tinstall cppcheck ${BIN}\n\n";
fout << "\n###### Build\n\n"; fout << "\n###### Build\n\n";
for (unsigned int i = 0; i < srcfiles.size(); ++i) compilefiles(fout, libfiles);
{ compilefiles(fout, clifiles);
fout << objfile(srcfiles[i]) << ": " << srcfiles[i]; compilefiles(fout, testfiles);
std::vector<std::string> depfiles;
getDeps(srcfiles[i], depfiles);
for (unsigned int dep = 0; dep < depfiles.size(); ++dep)
fout << " " << depfiles[dep];
fout << "\n\t$(CXX) $(CXXFLAGS) -c -o " << objfile(srcfiles[i]) << " " << srcfiles[i] << "\n\n";
}
for (unsigned int i = 0; i < testfiles.size(); ++i)
{
fout << objfile(testfiles[i]) << ": " << testfiles[i];
std::vector<std::string> depfiles;
getDeps(testfiles[i], depfiles);
for (unsigned int dep = 0; dep < depfiles.size(); ++dep)
fout << " " << depfiles[dep];
fout << "\n\t$(CXX) $(CXXFLAGS) -c -o " << objfile(testfiles[i]) << " " << testfiles[i] << "\n\n";
}
return 0; return 0;
} }