Attachment #616184 for bug #693352

View | Details | Raw Unified | Return to bug 693352
Collapse All | Expand All

Lines 6-13 Link Here

(-)a/oss-fuzz/Makefile (-2 / +2 lines)
6	# make CXX=clang++-6.0 CXXFLAGS="-fsanitize=address" fuzz-client	6	# make CXX=clang++-6.0 CXXFLAGS="-fsanitize=address" fuzz-client
7		7
8	CPPCHECK_DIR=..	8	CPPCHECK_DIR=..
9	INCLUDE_DIR=-I ${CPPCHECK_DIR}/lib -I ${CPPCHECK_DIR}/externals/simplecpp -I ${CPPCHECK_DIR}/externals/tinyxml -I ${CPPCHECK_DIR}/externals	9	INCLUDE_DIR=-I ${CPPCHECK_DIR}/lib -I ${CPPCHECK_DIR}/externals/simplecpp -I ${CPPCHECK_DIR}/externals
10	SRC_FILES=main.cpp type2.cpp ${CPPCHECK_DIR}/externals/simplecpp/simplecpp.cpp ${CPPCHECK_DIR}/externals/tinyxml/tinyxml2.cpp ${CPPCHECK_DIR}/lib/*.cpp	10	SRC_FILES=main.cpp type2.cpp ${CPPCHECK_DIR}/externals/simplecpp/simplecpp.cpp ${CPPCHECK_DIR}/lib/*.cpp
11		11
12	all: oss-fuzz-client translate	12	all: oss-fuzz-client translate
13		13




static void getDeps(const std::string &filename, std::vector<std::string> &depfiles)
{
    static const std::vector<std::string> externalfolders = {"externals",
                                                             "externals/simplecpp"
                                                             "externals/tinyxml"
                                                            };

    // Is the dependency already included?

         << "endif\n\n";

    makeConditionalVariable(fout, "PREFIX", "/usr");
    makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem externals -isystem externals/simplecpp");
    makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem externals/simplecpp");
    makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem externals/simplecpp");

    fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
    fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";

    fout << "run-dmake: dmake\n";
    fout << "\t./dmake\n\n";
    fout << "generate_cfg_tests: tools/generate_cfg_tests.o $(EXTOBJ)\n";
    fout << "\tg++ -o generate_cfg_tests tools/generate_cfg_tests.o $(EXTOBJ)\n";
    fout << "clean:\n";
    fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/*/*.o testrunner dmake cppcheck cppcheck.exe cppcheck.1\n\n";
    fout << "man:\tman/cppcheck.1\n\n";

Lines 1-9 Link Here

(-)a/externals/externals.pri (-6 / +3 lines)
1	INCLUDEPATH += $${PWD} \	1	INCLUDEPATH += $${PWD} \
2	$${PWD}/simplecpp \	2	$${PWD}/simplecpp
3	$${PWD}/tinyxml
4		3
5	HEADERS += $${PWD}/simplecpp/simplecpp.h \	4	HEADERS += $${PWD}/simplecpp/simplecpp.h
6	$${PWD}/tinyxml/tinyxml2.h
7		5
8	SOURCES += $${PWD}/simplecpp/simplecpp.cpp \	6	SOURCES += $${PWD}/simplecpp/simplecpp.cpp
9	$${PWD}/tinyxml/tinyxml2.cpp

Lines 15-20 contains(LINKCORE, [yY][eE][sS]) { Link Here

(-)a/gui/gui.pro (+1 lines)
15	DEFINES += CPPCHECKLIB_IMPORT	15	DEFINES += CPPCHECKLIB_IMPORT
16	}	16	}
17	LIBS += -L$$PWD/../externals	17	LIBS += -L$$PWD/../externals
		18	LIBS += $(shell $(PKG_CONFIG) --libs tinyxml2)
18		19
19	DESTDIR = .	20	DESTDIR = .
20	RCC_DIR = temp	21	RCC_DIR = temp

Lines 1-7 Link Here

(-)a/gui/test/xmlreportv2/xmlreportv2.pro (-1 / +1 lines)
1	TEMPLATE = app	1	TEMPLATE = app
2	TARGET = test-xmlreportv2	2	TARGET = test-xmlreportv2
3	DEPENDPATH += .	3	DEPENDPATH += .
4	INCLUDEPATH += . ../../../externals/simplecpp ../../../externals/tinyxml	4	INCLUDEPATH += . ../../../externals/simplecpp
5	OBJECTS_DIR = ../build	5	OBJECTS_DIR = ../build
6	MOC_DIR = ../build	6	MOC_DIR = ../build
7		7

Return to bug 693352

Lines 57-64 static std::string objfiles(const std::vector<std::string> &files) Link Here

(-)a/tools/dmake.cpp (-6 / +5 lines)
57	static void getDeps(const std::string &filename, std::vector<std::string> &depfiles)	57	static void getDeps(const std::string &filename, std::vector<std::string> &depfiles)
58	{	58	{
59	static const std::vector<std::string> externalfolders = {"externals",	59	static const std::vector<std::string> externalfolders = {"externals",
60	"externals/simplecpp",	60	"externals/simplecpp"
61	"externals/tinyxml"
62	};	61	};
63		62
64	// Is the dependency already included?	63	// Is the dependency already included?
Lines 383-391 int main(int argc, char **argv) Link Here
383	<< "endif\n\n";	382	<< "endif\n\n";
384		383
385	makeConditionalVariable(fout, "PREFIX", "/usr");	384	makeConditionalVariable(fout, "PREFIX", "/usr");
386	makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem externals -isystem externals/simplecpp -isystem externals/tinyxml");	385	makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -isystem externals -isystem externals/simplecpp");
387	makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem externals/simplecpp -isystem externals/tinyxml");	386	makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -isystem externals/simplecpp");
388	makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem externals/simplecpp -isystem externals/tinyxml");	387	makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -isystem externals/simplecpp");
389		388
390	fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";	389	fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
391	fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";	390	fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
Lines 417-423 int main(int argc, char **argv) Link Here
417	fout << "run-dmake: dmake\n";	416	fout << "run-dmake: dmake\n";
418	fout << "\t./dmake\n\n";	417	fout << "\t./dmake\n\n";
419	fout << "generate_cfg_tests: tools/generate_cfg_tests.o $(EXTOBJ)\n";	418	fout << "generate_cfg_tests: tools/generate_cfg_tests.o $(EXTOBJ)\n";
420	fout << "\tg++ -isystem externals/tinyxml -o generate_cfg_tests tools/generate_cfg_tests.o $(EXTOBJ)\n";	419	fout << "\tg++ -o generate_cfg_tests tools/generate_cfg_tests.o $(EXTOBJ)\n";
421	fout << "clean:\n";	420	fout << "clean:\n";
422	fout << "\trm -f build/.o lib/.o cli/.o test/.o tools/.o externals//*.o testrunner dmake cppcheck cppcheck.exe cppcheck.1\n\n";	421	fout << "\trm -f build/.o lib/.o cli/.o test/.o tools/.o externals//*.o testrunner dmake cppcheck cppcheck.exe cppcheck.1\n\n";
423	fout << "man:\tman/cppcheck.1\n\n";	422	fout << "man:\tman/cppcheck.1\n\n";