walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

dmake: "make dmake" now also runs the binary after compilation.

This commit is contained in:
Matthias Krüger 2014-03-31 13:56:07 +02:00
parent 110f956029
commit 4481015bdc
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -81,7 +81,6 @@ script:
# check if Makefile needs to be regenerated # check if Makefile needs to be regenerated
- git clean -dfx - git clean -dfx
- make dmake - make dmake
- ./dmake
# now, if dmake modified the makefile, return false! # now, if dmake modified the makefile, return false!
- git diff --exit-code - git diff --exit-code

3
Makefile
View File

@ -209,6 +209,8 @@ endif
EXTOBJ += $(TINYXML) EXTOBJ += $(TINYXML)
.PHONY: dmake
###### Targets ###### Targets
@ -228,6 +230,7 @@ check: all
dmake: tools/dmake.cpp dmake: tools/dmake.cpp
$(CXX) -std=c++0x -o dmake tools/dmake.cpp cli/filelister.cpp lib/path.cpp -Ilib $(LDFLAGS) $(CXX) -std=c++0x -o dmake tools/dmake.cpp cli/filelister.cpp lib/path.cpp -Ilib $(LDFLAGS)
./dmake
reduce: tools/reduce.cpp reduce: tools/reduce.cpp
$(CXX) -std=c++0x -g -o reduce tools/reduce.cpp -Ilib -Iexternals/tinyxml lib/*.cpp externals/tinyxml/tinyxml2.cpp $(CXX) -std=c++0x -g -o reduce tools/reduce.cpp -Ilib -Iexternals/tinyxml lib/*.cpp externals/tinyxml/tinyxml2.cpp

4
tools/dmake.cpp
View File

@ -365,6 +365,7 @@ int main(int argc, char **argv)
makeExtObj(fout, externalfiles); makeExtObj(fout, externalfiles);
fout << ".PHONY: dmake\n\n";
fout << "\n###### Targets\n\n"; fout << "\n###### Targets\n\n";
fout << "cppcheck: $(LIBOBJ) $(CLIOBJ) $(EXTOBJ)\n"; fout << "cppcheck: $(LIBOBJ) $(CLIOBJ) $(EXTOBJ)\n";
fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -o cppcheck $(CLIOBJ) $(LIBOBJ) $(EXTOBJ) $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n"; fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -o cppcheck $(CLIOBJ) $(LIBOBJ) $(EXTOBJ) $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
@ -376,7 +377,8 @@ int main(int argc, char **argv)
fout << "check:\tall\n"; fout << "check:\tall\n";
fout << "\t./testrunner -g -q\n\n"; fout << "\t./testrunner -g -q\n\n";
fout << "dmake:\ttools/dmake.cpp\n"; fout << "dmake:\ttools/dmake.cpp\n";
fout << "\t$(CXX) -std=c++0x -o dmake tools/dmake.cpp cli/filelister.cpp lib/path.cpp -Ilib $(LDFLAGS)\n\n"; fout << "\t$(CXX) -std=c++0x -o dmake tools/dmake.cpp cli/filelister.cpp lib/path.cpp -Ilib $(LDFLAGS)\n";
fout << "\t./dmake\n\n";
fout << "reduce:\ttools/reduce.cpp\n"; fout << "reduce:\ttools/reduce.cpp\n";
fout << "\t$(CXX) -std=c++0x -g -o reduce tools/reduce.cpp -Ilib -Iexternals/tinyxml lib/*.cpp externals/tinyxml/tinyxml2.cpp\n\n"; fout << "\t$(CXX) -std=c++0x -g -o reduce tools/reduce.cpp -Ilib -Iexternals/tinyxml lib/*.cpp externals/tinyxml/tinyxml2.cpp\n\n";
fout << "clean:\n"; fout << "clean:\n";