Print git revision with all --version outputs

Author: tautschnig

src/cbmc/Makefile

@@ -42,6 +42,8 @@ CLEANFILES = cbmc$(EXEEXT)
 
 all: cbmc$(EXEEXT)
 
+CP_CXXFLAGS += -DCBMC_VERSION="\"$(CBMC_VERSION) ($(RELEASE_INFO))\""
+
 ifneq ($(wildcard ../bv_refinement/Makefile),)
   OBJ += ../bv_refinement/bv_refinement$(LIBEXT)
   CP_CXXFLAGS += -DHAVE_BV_REFINEMENT

src/cbmc/cbmc_parse_options.cpp

@@ -55,7 +55,6 @@ Author: Daniel Kroening, [email protected]
 #include "cbmc_solvers.h"
 #include "cbmc_parse_options.h"
 #include "bmc.h"
-#include "version.h"
 #include "xml_interface.h"
 
 /*******************************************************************\

src/cbmc/cbmc_solvers.cpp

@@ -24,7 +24,6 @@ Author: Daniel Kroening, [email protected]
 #include "bv_cbmc.h"
 #include "cbmc_dimacs.h"
 #include "counterexample_beautification.h"
-#include "version.h"
 
 /*******************************************************************\
 

src/cbmc/version.h

@@ -28,3 +28,9 @@ MINISAT2 = ../../minisat-2.2.1
 # Signing identity for MacOS Gatekeeper
 
 OSX_IDENTITY="Developer ID Application: Daniel Kroening"
+
+# Detailed version information
+CBMC_VERSION = 5.7
+GIT_HEAD = $(shell git rev-parse --short HEAD || echo "n/a")
+GIT_MOD = $(shell git diff HEAD --quiet || echo +dirty)
+RELEASE_INFO = $(GIT_HEAD)$(GIT_MOD)

src/config.inc

@@ -26,6 +26,8 @@ CLEANFILES = goto-analyzer$(EXEEXT)
 
 all: goto-analyzer$(EXEEXT)
 
+CP_CXXFLAGS += -DCBMC_VERSION="\"$(CBMC_VERSION) ($(RELEASE_INFO))\""
+
 ifneq ($(wildcard ../java_bytecode/Makefile),)
   OBJ += ../java_bytecode/java_bytecode$(LIBEXT)
   CP_CXXFLAGS += -DHAVE_JAVA_BYTECODE

src/goto-analyzer/Makefile

@@ -42,8 +42,6 @@ Author: Daniel Kroening, [email protected]
 #include <util/string2int.h>
 #include <util/unicode.h>
 
-#include <cbmc/version.h>
-
 #include "goto_analyzer_parse_options.h"
 #include "taint_analysis.h"
 #include "unreachable_instructions.h"

src/goto-analyzer/goto_analyzer_parse_options.cpp

@@ -31,6 +31,8 @@ all: goto-cl$(EXEEXT)
 endif
 all: goto-cc$(EXEEXT)
 
+CP_CXXFLAGS += -DCBMC_VERSION="\"$(CBMC_VERSION) ($(RELEASE_INFO))\""
+
 ifneq ($(wildcard ../java_bytecode/Makefile),)
   OBJ += ../java_bytecode/java_bytecode$(LIBEXT)
 endif

src/goto-cc/Makefile

@@ -35,8 +35,6 @@ Date: June 2006
 
 #include <langapi/mode.h>
 
-#include <cbmc/version.h>
-
 #include "compile.h"
 
 #define DOTGRAPHSETTINGS  "color=black;" \

src/goto-cc/compile.cpp

@@ -26,8 +26,6 @@ Author: CM Wintersteiger, 2006
 #include <util/get_base_name.h>
 #include <util/run.h>
 
-#include <cbmc/version.h>
-
 #include "compile.h"
 #include "gcc_mode.h"
 

src/goto-cc/gcc_mode.cpp

@@ -17,7 +17,6 @@ Author: CM Wintersteiger, 2006
 #include <sysexits.h>
 #endif
 
-#include <cbmc/version.h>
 
 #include "goto_cc_mode.h"
 

src/goto-cc/goto_cc_mode.cpp

@@ -22,8 +22,6 @@ Author: CM Wintersteiger, 2006
 #include <util/config.h>
 #include <util/get_base_name.h>
 
-#include <cbmc/version.h>
-
 #include "ms_cl_mode.h"
 #include "compile.h"
 

src/goto-cc/ms_cl_mode.cpp

@@ -28,6 +28,8 @@ CLEANFILES = goto-diff$(EXEEXT)
 
 all: goto-diff$(EXEEXT)
 
+CP_CXXFLAGS += -DCBMC_VERSION="\"$(CBMC_VERSION) ($(RELEASE_INFO))\""
+
 ifneq ($(wildcard ../java_bytecode/Makefile),)
   OBJ += ../java_bytecode/java_bytecode$(LIBEXT)
   CP_CXXFLAGS += -DHAVE_JAVA_BYTECODE

src/goto-diff/Makefile

@@ -36,8 +36,6 @@ Author: Peter Schrammel
 
 #include <langapi/mode.h>
 
-#include <cbmc/version.h>
-
 #include "goto_diff_parse_options.h"
 #include "goto_diff.h"
 #include "syntactic_diff.h"

src/goto-diff/goto_diff_parse_options.cpp

@@ -52,6 +52,8 @@ include ../common
 
 all: goto-instrument$(EXEEXT)
 
+CP_CXXFLAGS += -DCBMC_VERSION="\"$(CBMC_VERSION) ($(RELEASE_INFO))\""
+
 ifneq ($(wildcard ../java_bytecode/Makefile),)
   OBJ += ../java_bytecode/java_bytecode$(LIBEXT)
   CP_CXXFLAGS += -DHAVE_JAVA_BYTECODE

src/goto-instrument/Makefile

@@ -55,8 +55,6 @@ Author: Daniel Kroening, [email protected]
 #include <analyses/constant_propagator.h>
 #include <analyses/is_threaded.h>
 
-#include <cbmc/version.h>
-
 #include "goto_instrument_parse_options.h"
 #include "document_properties.h"
 #include "uninitialized.h"

src/goto-instrument/goto_instrument_parse_options.cpp

@@ -37,6 +37,8 @@ include ../common
 
 all: musketeer$(EXEEXT)
 
+CP_CXXFLAGS += -DGOTO_FENCE_INSERTER_VERSION="\"0.37 ($(RELEASE_INFO))\""
+
 ifneq ($(LIB_GLPK),)
   LIBS += $(LIB_GLPK)
   CP_CXXFLAGS += -DHAVE_GLPK