Refactoring: Added src/ and test/ folders. Moved source files to those folders, updated makefile and codeblocks project file.

This commit is contained in:
Reijo Tomperi 2009-01-06 14:18:36 +00:00
parent 1cf308f018
commit e435a1f1d6
54 changed files with 129 additions and 127 deletions

View File

@ -1,86 +1,88 @@
SRCS=checkbufferoverrun.cpp checkclass.cpp checkheaders.cpp checkmemoryleak.cpp checkfunctionusage.cpp checkother.cpp filelister.cpp preprocessor.cpp tokenize.cpp cppcheck.cpp settings.cpp token.cpp cppcheckexecutor.cpp errormessage.cpp
TMPSRCS=checkbufferoverrun.cpp checkclass.cpp checkheaders.cpp checkmemoryleak.cpp checkfunctionusage.cpp checkother.cpp filelister.cpp preprocessor.cpp tokenize.cpp cppcheck.cpp settings.cpp token.cpp cppcheckexecutor.cpp errormessage.cpp
SRCS=$(TMPSRCS:%=src/%)
OBJS=$(SRCS:%.cpp=%.o)
TESTS=testbufferoverrun.o testcharvar.o testclass.o testconstructors.o testdivision.o testfunctionusage.o testincompletestatement.o testother.o testmemleak.o testmemleakmp.o testpreprocessor.o testredundantif.o testsimplifytokens.o testtokenize.o testtoken.o testunusedprivfunc.o testunusedvar.o testfilelister.o
TMPTESTS=testbufferoverrun.o testcharvar.o testclass.o testconstructors.o testdivision.o testfunctionusage.o testincompletestatement.o testother.o testmemleak.o testmemleakmp.o testpreprocessor.o testredundantif.o testsimplifytokens.o testtokenize.o testtoken.o testunusedprivfunc.o testunusedvar.o testfilelister.o
TESTS=$(TMPTESTS:%=test/%)
BIN = ${DESTDIR}/usr/bin
CFLAGS = -Wall -pedantic -g
all: ${OBJS} main.o
all: ${OBJS} src/main.o
g++ $(CFLAGS) -o cppcheck $^
test: ${OBJS} testrunner.o testsuite.o ${TESTS}
test: ${OBJS} test/testrunner.o test/testsuite.o ${TESTS}
g++ $(CFLAGS) -o testrunner $^
cppcheckexecutor.o: cppcheckexecutor.cpp cppcheckexecutor.h cppcheck.h errorlogger.h
cppcheckexecutor.o: src/cppcheckexecutor.cpp src/cppcheckexecutor.h src/cppcheck.h src/errorlogger.h
g++ $(CFLAGS) -c $*.cpp
cppcheck.o: cppcheck.cpp cppcheck.h settings.h errorlogger.h preprocessor.h tokenize.h token.h checkmemoryleak.h checkbufferoverrun.h checkclass.h checkheaders.h checkother.h checkfunctionusage.h filelister.h
cppcheck.o: src/cppcheck.cpp src/cppcheck.h src/settings.h src/errorlogger.h src/preprocessor.h src/tokenize.h src/token.h src/checkmemoryleak.h src/checkbufferoverrun.h src/checkclass.h src/checkheaders.h src/checkother.h src/checkfunctionusage.h src/filelister.h
g++ $(CFLAGS) -c $*.cpp
main.o: main.cpp cppcheck.h settings.h errorlogger.h
main.o: src/main.cpp src/cppcheck.h src/settings.h src/errorlogger.h
g++ $(CFLAGS) -c $*.cpp
checkbufferoverrun.o: checkbufferoverrun.cpp checkbufferoverrun.h tokenize.h settings.h errorlogger.h token.h
checkbufferoverrun.o: src/checkbufferoverrun.cpp src/checkbufferoverrun.h src/tokenize.h src/settings.h src/errorlogger.h src/token.h
g++ $(CFLAGS) -c $*.cpp
checkclass.o: checkclass.cpp checkclass.h tokenize.h settings.h errorlogger.h token.h
checkclass.o: src/checkclass.cpp src/checkclass.h src/tokenize.h src/settings.h src/errorlogger.h src/token.h
g++ $(CFLAGS) -c $*.cpp
checkfunctionusage.o: checkfunctionusage.cpp checkfunctionusage.h tokenize.h settings.h errorlogger.h token.h
checkfunctionusage.o: src/checkfunctionusage.cpp src/checkfunctionusage.h src/tokenize.h src/settings.h src/errorlogger.h src/token.h
g++ $(CFLAGS) -c $*.cpp
checkheaders.o: checkheaders.cpp checkheaders.h tokenize.h settings.h errorlogger.h token.h
checkheaders.o: src/checkheaders.cpp src/checkheaders.h src/tokenize.h src/settings.h src/errorlogger.h src/token.h
g++ $(CFLAGS) -c $*.cpp
checkmemoryleak.o: checkmemoryleak.cpp checkmemoryleak.h tokenize.h settings.h errorlogger.h token.h
checkmemoryleak.o: src/checkmemoryleak.cpp src/checkmemoryleak.h src/tokenize.h src/settings.h src/errorlogger.h src/token.h
g++ $(CFLAGS) -c $*.cpp
checkother.o: checkother.cpp checkother.h tokenize.h settings.h errorlogger.h token.h
checkother.o: src/checkother.cpp src/checkother.h src/tokenize.h src/settings.h src/errorlogger.h src/token.h
g++ $(CFLAGS) -c $*.cpp
filelister.o: filelister.cpp filelister.h
filelister.o: src/filelister.cpp src/filelister.h
g++ $(CFLAGS) -c $*.cpp
preprocessor.o: preprocessor.cpp preprocessor.h errorlogger.h token.h tokenize.h
preprocessor.o: src/preprocessor.cpp src/preprocessor.h src/errorlogger.h src/token.h src/tokenize.h
g++ $(CFLAGS) -c $*.cpp
settings.o: settings.cpp settings.h
settings.o: src/settings.cpp src/settings.h
g++ $(CFLAGS) -c $*.cpp
errormessage.o: errormessage.cpp errormessage.h
errormessage.o: src/errormessage.cpp src/errormessage.h
g++ $(CFLAGS) -c $*.cpp
testbufferoverrun.o: testbufferoverrun.cpp tokenize.h settings.h errorlogger.h token.h checkbufferoverrun.h testsuite.h
testbufferoverrun.o: test/testbufferoverrun.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkbufferoverrun.h test/testsuite.h
g++ $(CFLAGS) -c $*.cpp
testcharvar.o: testcharvar.cpp tokenize.h settings.h errorlogger.h token.h checkother.h testsuite.h
testcharvar.o: test/testcharvar.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkother.h test/testsuite.h
g++ $(CFLAGS) -c $*.cpp
testclass.o: testclass.cpp tokenize.h settings.h errorlogger.h token.h checkclass.h testsuite.h
testclass.o: test/testclass.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkclass.h test/testsuite.h
g++ $(CFLAGS) -c $*.cpp
testconstructors.o: testconstructors.cpp tokenize.h settings.h errorlogger.h token.h checkclass.h testsuite.h
testconstructors.o: test/testconstructors.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkclass.h test/testsuite.h
g++ $(CFLAGS) -c $*.cpp
testdivision.o: testdivision.cpp tokenize.h settings.h errorlogger.h token.h checkother.h testsuite.h
testdivision.o: test/testdivision.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkother.h test/testsuite.h
g++ $(CFLAGS) -c $*.cpp
testfunctionusage.o: testfunctionusage.cpp tokenize.h settings.h errorlogger.h token.h testsuite.h checkfunctionusage.h
testfunctionusage.o: test/testfunctionusage.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h test/testsuite.h src/checkfunctionusage.h
g++ $(CFLAGS) -c $*.cpp
testincompletestatement.o: testincompletestatement.cpp testsuite.h errorlogger.h tokenize.h settings.h token.h checkother.h
testincompletestatement.o: test/testincompletestatement.cpp test/testsuite.h src/errorlogger.h src/tokenize.h src/settings.h src/token.h src/checkother.h
g++ $(CFLAGS) -c $*.cpp
testother.o: testother.cpp testsuite.h errorlogger.h tokenize.h settings.h token.h checkother.h
testother.o: test/testother.cpp test/testsuite.h src/errorlogger.h src/tokenize.h src/settings.h src/token.h src/checkother.h
g++ $(CFLAGS) -c $*.cpp
testmemleak.o: testmemleak.cpp tokenize.h settings.h errorlogger.h token.h checkmemoryleak.h testsuite.h
testmemleak.o: test/testmemleak.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkmemoryleak.h test/testsuite.h
g++ $(CFLAGS) -c $*.cpp
testmemleakmp.o: testmemleakmp.cpp tokenize.h settings.h errorlogger.h token.h checkmemoryleak.h testsuite.h
testmemleakmp.o: test/testmemleakmp.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkmemoryleak.h test/testsuite.h
g++ $(CFLAGS) -c $*.cpp
testpreprocessor.o: testpreprocessor.cpp testsuite.h errorlogger.h preprocessor.h
testpreprocessor.o: test/testpreprocessor.cpp test/testsuite.h src/errorlogger.h src/preprocessor.h
g++ $(CFLAGS) -c $*.cpp
testredundantif.o: testredundantif.cpp testsuite.h errorlogger.h checkother.h
testredundantif.o: test/testredundantif.cpp test/testsuite.h src/errorlogger.h src/checkother.h
g++ $(CFLAGS) -c $*.cpp
testrunner.o: testrunner.cpp testsuite.h errorlogger.h
testrunner.o: test/testrunner.cpp test/testsuite.h src/errorlogger.h
g++ $(CFLAGS) -c $*.cpp
testsimplifytokens.o: testsimplifytokens.cpp testsuite.h errorlogger.h tokenize.h settings.h token.h
testsimplifytokens.o: test/testsimplifytokens.cpp test/testsuite.h src/errorlogger.h src/tokenize.h src/settings.h src/token.h
g++ $(CFLAGS) -c $*.cpp
testsuite.o: testsuite.cpp testsuite.h errorlogger.h
testsuite.o: test/testsuite.cpp test/testsuite.h src/errorlogger.h
g++ $(CFLAGS) -c $*.cpp
testtoken.o: testtoken.cpp testsuite.h errorlogger.h token.h
testtoken.o: test/testtoken.cpp test/testsuite.h src/errorlogger.h src/token.h
g++ $(CFLAGS) -c $*.cpp
testtokenize.o: testtokenize.cpp testsuite.h errorlogger.h tokenize.h settings.h token.h
testtokenize.o: test/testtokenize.cpp test/testsuite.h src/errorlogger.h src/tokenize.h src/settings.h src/token.h
g++ $(CFLAGS) -c $*.cpp
testunusedprivfunc.o: testunusedprivfunc.cpp tokenize.h settings.h errorlogger.h token.h checkclass.h testsuite.h
testunusedprivfunc.o: test/testunusedprivfunc.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/checkclass.h test/testsuite.h
g++ $(CFLAGS) -c $*.cpp
testunusedvar.o: testunusedvar.cpp testsuite.h errorlogger.h tokenize.h settings.h token.h checkother.h
testunusedvar.o: test/testunusedvar.cpp test/testsuite.h src/errorlogger.h src/tokenize.h src/settings.h src/token.h src/checkother.h
g++ $(CFLAGS) -c $*.cpp
testfilelister.o: testfilelister.cpp filelister.h
testfilelister.o: test/testfilelister.cpp src/filelister.h
g++ $(CFLAGS) -c $*.cpp
token.o: token.cpp token.h
token.o: src/token.cpp src/token.h
g++ $(CFLAGS) -c $*.cpp
tokenize.o: tokenize.cpp tokenize.h settings.h errorlogger.h token.h filelister.h
tokenize.o: src/tokenize.cpp src/tokenize.h src/settings.h src/errorlogger.h src/token.h src/filelister.h
g++ $(CFLAGS) -c $*.cpp
clean:
rm -f *.o testrunner cppcheck
rm -f src/*.o test/*.o testrunner cppcheck
install: cppcheck
install -d ${BIN}
install cppcheck ${BIN}

View File

@ -30,59 +30,57 @@
<Add option="-Wall" />
<Add option="-fexceptions" />
</Compiler>
<Unit filename="checkbufferoverrun.cpp" />
<Unit filename="checkbufferoverrun.h" />
<Unit filename="checkclass.cpp" />
<Unit filename="checkclass.h" />
<Unit filename="checkfunctionusage.cpp" />
<Unit filename="checkfunctionusage.h" />
<Unit filename="checkheaders.cpp" />
<Unit filename="checkheaders.h" />
<Unit filename="checkmemoryleak.cpp" />
<Unit filename="checkmemoryleak.h" />
<Unit filename="checkother.cpp" />
<Unit filename="checkother.h" />
<Unit filename="cppcheck.cpp" />
<Unit filename="cppcheck.h" />
<Unit filename="cppcheckexecutor.cpp" />
<Unit filename="cppcheckexecutor.h" />
<Unit filename="errorlogger.h" />
<Unit filename="errormessage.cpp" />
<Unit filename="errormessage.h" />
<Unit filename="filelister.cpp" />
<Unit filename="filelister.h" />
<Unit filename="main.cpp" />
<Unit filename="preprocessor.cpp" />
<Unit filename="preprocessor.h" />
<Unit filename="settings.cpp" />
<Unit filename="settings.h" />
<Unit filename="testbufferoverrun.cpp" />
<Unit filename="testcharvar.cpp" />
<Unit filename="testclass.cpp" />
<Unit filename="testconstructors.cpp" />
<Unit filename="testdivision.cpp" />
<Unit filename="testfilelister.cpp" />
<Unit filename="testfunctionusage.cpp" />
<Unit filename="testincompletestatement.cpp" />
<Unit filename="testmemleak.cpp" />
<Unit filename="testmemleakmp.cpp">
<Option target="test" />
</Unit>
<Unit filename="testother.cpp" />
<Unit filename="testpreprocessor.cpp" />
<Unit filename="testredundantif.cpp" />
<Unit filename="testrunner.cpp" />
<Unit filename="testsimplifytokens.cpp" />
<Unit filename="testsuite.cpp" />
<Unit filename="testsuite.h" />
<Unit filename="testtoken.cpp" />
<Unit filename="testtokenize.cpp" />
<Unit filename="testunusedprivfunc.cpp" />
<Unit filename="testunusedvar.cpp" />
<Unit filename="token.cpp" />
<Unit filename="token.h" />
<Unit filename="tokenize.cpp" />
<Unit filename="tokenize.h" />
<Unit filename="src/checkbufferoverrun.cpp" />
<Unit filename="src/checkbufferoverrun.h" />
<Unit filename="src/checkclass.cpp" />
<Unit filename="src/checkclass.h" />
<Unit filename="src/checkfunctionusage.cpp" />
<Unit filename="src/checkfunctionusage.h" />
<Unit filename="src/checkheaders.cpp" />
<Unit filename="src/checkheaders.h" />
<Unit filename="src/checkmemoryleak.cpp" />
<Unit filename="src/checkmemoryleak.h" />
<Unit filename="src/checkother.cpp" />
<Unit filename="src/checkother.h" />
<Unit filename="src/cppcheck.cpp" />
<Unit filename="src/cppcheck.h" />
<Unit filename="src/cppcheckexecutor.cpp" />
<Unit filename="src/cppcheckexecutor.h" />
<Unit filename="src/errorlogger.h" />
<Unit filename="src/errormessage.cpp" />
<Unit filename="src/errormessage.h" />
<Unit filename="src/filelister.cpp" />
<Unit filename="src/filelister.h" />
<Unit filename="src/main.cpp" />
<Unit filename="src/preprocessor.cpp" />
<Unit filename="src/preprocessor.h" />
<Unit filename="src/settings.cpp" />
<Unit filename="src/settings.h" />
<Unit filename="src/token.cpp" />
<Unit filename="src/token.h" />
<Unit filename="src/tokenize.cpp" />
<Unit filename="src/tokenize.h" />
<Unit filename="test/testbufferoverrun.cpp" />
<Unit filename="test/testcharvar.cpp" />
<Unit filename="test/testclass.cpp" />
<Unit filename="test/testconstructors.cpp" />
<Unit filename="test/testdivision.cpp" />
<Unit filename="test/testfilelister.cpp" />
<Unit filename="test/testfunctionusage.cpp" />
<Unit filename="test/testincompletestatement.cpp" />
<Unit filename="test/testmemleak.cpp" />
<Unit filename="test/testmemleakmp.cpp" />
<Unit filename="test/testother.cpp" />
<Unit filename="test/testpreprocessor.cpp" />
<Unit filename="test/testredundantif.cpp" />
<Unit filename="test/testrunner.cpp" />
<Unit filename="test/testsimplifytokens.cpp" />
<Unit filename="test/testsuite.cpp" />
<Unit filename="test/testsuite.h" />
<Unit filename="test/testtoken.cpp" />
<Unit filename="test/testtokenize.cpp" />
<Unit filename="test/testunusedprivfunc.cpp" />
<Unit filename="test/testunusedvar.cpp" />
<Extensions>
<code_completion />
<debugger />

View File

@ -1,4 +1,6 @@
#!/bin/bash
astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren *.cpp
astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren *.h
astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren src/*.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 test/*.cpp
astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren test/*.h

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -18,9 +18,9 @@
#define UNIT_TESTING
#include "tokenize.h"
#include "../src/tokenize.h"
#include "testsuite.h"
#include "checkfunctionusage.h"
#include "../src/checkfunctionusage.h"
#include <sstream>
extern std::ostringstream errout;

View File

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

View File

@ -20,8 +20,8 @@
#define UNIT_TESTING
#include "tokenize.h"
#include "checkmemoryleak.h"
#include "../src/tokenize.h"
#include "../src/checkmemoryleak.h"
#include "testsuite.h"
#include <iostream>

View File

@ -19,8 +19,8 @@
#define UNIT_TESTING
#include "tokenize.h"
#include "checkmemoryleak.h"
#include "../src/tokenize.h"
#include "../src/checkmemoryleak.h"
#include "testsuite.h"
#include <sstream>

View File

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

View File

@ -23,7 +23,7 @@
#include "testsuite.h"
#define UNIT_TESTING
#include "preprocessor.h"
#include "../src/preprocessor.h"
#include <map>
#include <string>

View File

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

View File

@ -19,7 +19,7 @@
#include "testsuite.h"
#include "tokenize.h"
#include "../src/tokenize.h"
#include <sstream>
extern std::ostringstream errout;

View File

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

View File

@ -18,7 +18,7 @@
#include <cstring>
#include "testsuite.h"
#include "token.h"
#include "../src/token.h"
extern std::ostringstream errout;
class TestTOKEN : public TestFixture

View File

@ -24,7 +24,7 @@
#include <cstring>
#include "testsuite.h"
#define UNIT_TESTING // Get access to "private" data in Tokenizer
#include "tokenize.h"
#include "../src/tokenize.h"
extern std::ostringstream errout;
class TestTokenizer : public TestFixture

View File

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

View File

@ -22,8 +22,8 @@
#define UNIT_TESTING
#include "testsuite.h"
#include "tokenize.h"
#include "checkother.h"
#include "../src/tokenize.h"
#include "../src/checkother.h"
#include <sstream>
extern std::ostringstream errout;