Merge pull request diffblue#11 from diffblue/project_build_improvement

Improving build scripts and ignore of config+built stuff.

Author: marek-trtik

.gitignore

@@ -0,0 +1,12 @@
+# Local files generated by IDEs
+.vscode/*
+scripts/__pycache__/*
+src/goto-analyzer/taint_driver_scripts/.idea/*
+/*.config
+/*.creator
+/*.creator.user
+/*.files
+/*.includes
+
+# Ignoring boost
+boost/*

Makefile

@@ -0,0 +1,7 @@
+all:
+	$(MAKE) $(MAKEARGS) -C src
+
+clean:
+	$(MAKE) $(MAKEARGS) -C cbmc/src clean
+	$(MAKE) $(MAKEARGS) -C src clean
+

src/.gitignore

@@ -1,6 +1,3 @@
-# Local files generated by IDEs
-.vscode/*
-
 # compilation files
 *.lo
 *.od
@@ -9,84 +6,5 @@
 *.obj
 *.a
 *.lib
-src/ansi-c/arm_builtin_headers.inc
-src/ansi-c/clang_builtin_headers.inc
-src/ansi-c/cprover_library.inc
-src/ansi-c/cw_builtin_headers.inc
-src/ansi-c/gcc_builtin_headers_alpha.inc
-src/ansi-c/gcc_builtin_headers_arm.inc
-src/ansi-c/gcc_builtin_headers_generic.inc
-src/ansi-c/gcc_builtin_headers_ia32-2.inc
-src/ansi-c/gcc_builtin_headers_ia32.inc
-src/ansi-c/gcc_builtin_headers_mips.inc
-src/ansi-c/gcc_builtin_headers_power.inc
-src/util/irep_ids.h
-src/util/irep_ids.inc
-
-# regression/test files
-*.out
-regression/**/tests.log
-regression/**/*.gb
-regression/**/*.smt2
-
-# regression/coverage file
-/regression/coverage_**
-
-# files stored by editors
-*~
-
-# libs downloaded by make [name]-download
-libzip/
-zlib/
-minisat*/
-glucose-syrup/
-
-# flex/bison generated files
-src/ansi-c/ansi_c_lex.yy.cpp
-src/ansi-c/ansi_c_y.output
-src/ansi-c/ansi_c_y.tab.cpp
-src/ansi-c/ansi_c_y.tab.h
-src/assembler/assembler_lex.yy.cpp
-src/jsil/jsil_lex.yy.cpp
-src/jsil/jsil_y.output
-src/jsil/jsil_y.tab.cpp
-src/jsil/jsil_y.tab.h
-src/json/json_lex.yy.cpp
-src/json/json_y.output
-src/json/json_y.tab.cpp
-src/json/json_y.tab.h
-src/xmllang/xml_lex.yy.cpp
-src/xmllang/xml_y.output
-src/xmllang/xml_y.tab.cpp
-src/xmllang/xml_y.tab.h
-
-# binaries
-src/cbmc/cbmc
-src/cbmc/cbmc.exe
-src/cegis/cegis
-src/cegis/cegis.exe
-src/goto-analyzer/goto-analyzer
-src/goto-analyzer/goto-analyzer.exe
-src/goto-cc/goto-cc
-src/goto-cc/goto-cc.exe
-src/goto-cc/goto-cl.exe
-src/goto-instrument/goto-instrument
-src/goto-instrument/goto-instrument.exe
-src/musketeer/musketeer
-src/musketeer/musketeer.exe
-src/symex/symex
-src/symex/symex.exe
-src/goto-diff/goto-diff
-src/goto-diff/goto-diff.exe
-src/clobber/clobber
-src/clobber/clobber.exe
-src/big-int/test-bigint
-src/big-int/test-bigint.exe
+driver/sec-driver
 
-# build tools
-src/ansi-c/file_converter
-src/ansi-c/file_converter.exe
-src/ansi-c/library/converter
-src/ansi-c/library/converter.exe
-src/util/irep_ids_convert
-src/util/irep_ids_convert.exe

src/Makefile

@@ -2,7 +2,7 @@ DIRS = driver pointer-analysis summaries taint-analysis
 
 all: driver.dir
 
-driver.dir: pointer-analysis.dir summaries.dir taint-analysis.dir cbmc.dir
+driver.dir: cbmc.dir pointer-analysis.dir summaries.dir taint-analysis.dir
 
 # building for a particular directory
 

src/taint-analysis/Makefile

@@ -6,7 +6,7 @@ SRC = taint_trace_dump_html.cpp taint_summary_dump.cpp taint_trace_dump_json.cpp
       taint_statistics_dump_html.cpp taint_config.cpp \
       taint_statistics_dump_json.cpp taint_cond.cpp taint_set.cpp
 
-INCLUDES= -I .. -I ../../cbmc/src
+INCLUDES= -I .. -I ../../cbmc/src -I ../../boost
 
 include ../../cbmc/src/config.inc
 include ../../cbmc/src/common