use a string instead of macro for version number

kroening · peterschrammel · commit 8ef30b467727 · 2018-07-31T15:49:49.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -28,7 +28,7 @@ Release/*
 *.obj
 *.a
 *.lib
-version.h
+util/version.cpp
 src/ansi-c/arm_builtin_headers.inc
 src/ansi-c/clang_builtin_headers.inc
 src/ansi-c/cprover_builtin_headers.inc
diff --git a/jbmc/src/janalyzer/janalyzer_parse_options.cpp b/jbmc/src/janalyzer/janalyzer_parse_options.cpp
@@ -60,7 +60,7 @@ Author: Daniel Kroening, kroening@kroening.com
 janalyzer_parse_optionst::janalyzer_parse_optionst(int argc, const char **argv)
   : parse_options_baset(JANALYZER_OPTIONS, argc, argv),
     messaget(ui_message_handler),
-    ui_message_handler(cmdline, "JANALYZER " CBMC_VERSION)
+    ui_message_handler(cmdline, std::string("JANALYZER ")+CBMC_VERSION)
 {
 }
 
@@ -342,7 +342,7 @@ int janalyzer_parse_optionst::doit()
   //
   // Print a banner
   //
-  status() << "JANALYZER version " CBMC_VERSION " " << sizeof(void *) * 8
+  status() << "JANALYZER version " << CBMC_VERSION << " " << sizeof(void *) * 8
            << "-bit " << config.this_architecture() << " "
            << config.this_operating_system() << eom;
 
diff --git a/jbmc/src/jbmc/jbmc_parse_options.cpp b/jbmc/src/jbmc/jbmc_parse_options.cpp
@@ -64,7 +64,7 @@ Author: Daniel Kroening, kroening@kroening.com
 jbmc_parse_optionst::jbmc_parse_optionst(int argc, const char **argv):
   parse_options_baset(JBMC_OPTIONS, argc, argv),
   messaget(ui_message_handler),
-  ui_message_handler(cmdline, "JBMC " CBMC_VERSION),
+  ui_message_handler(cmdline, std::string("JBMC ")+CBMC_VERSION),
   path_strategy_chooser()
 {
 }
@@ -75,7 +75,7 @@ ::jbmc_parse_optionst::jbmc_parse_optionst(
   const std::string &extra_options):
   parse_options_baset(JBMC_OPTIONS+extra_options, argc, argv),
   messaget(ui_message_handler),
-  ui_message_handler(cmdline, "JBMC " CBMC_VERSION),
+  ui_message_handler(cmdline, std::string("JBMC ")+CBMC_VERSION),
   path_strategy_chooser()
 {
 }
@@ -418,7 +418,7 @@ int jbmc_parse_optionst::doit()
   //
   // Print a banner
   //
-  status() << "JBMC version " CBMC_VERSION " "
+  status() << "JBMC version " << CBMC_VERSION << " "
            << sizeof(void *)*8 << "-bit "
            << config.this_architecture() << " "
            << config.this_operating_system() << eom;
diff --git a/jbmc/src/jdiff/jdiff_parse_options.cpp b/jbmc/src/jdiff/jdiff_parse_options.cpp
@@ -64,7 +64,7 @@ Author: Peter Schrammel
 jdiff_parse_optionst::jdiff_parse_optionst(int argc, const char **argv)
   : parse_options_baset(JDIFF_OPTIONS, argc, argv),
     jdiff_languagest(cmdline, ui_message_handler),
-    ui_message_handler(cmdline, "JDIFF " CBMC_VERSION),
+    ui_message_handler(cmdline, std::string("JDIFF ")+CBMC_VERSION),
     languages2(cmdline, ui_message_handler)
 {
 }
@@ -75,7 +75,7 @@ ::jdiff_parse_optionst::jdiff_parse_optionst(
   const std::string &extra_options)
   : parse_options_baset(JDIFF_OPTIONS + extra_options, argc, argv),
     jdiff_languagest(cmdline, ui_message_handler),
-    ui_message_handler(cmdline, "JDIFF " CBMC_VERSION),
+    ui_message_handler(cmdline, std::string("JDIFF ")+CBMC_VERSION),
     languages2(cmdline, ui_message_handler)
 {
 }
@@ -206,7 +206,7 @@ int jdiff_parse_optionst::doit()
   //
   // Print a banner
   //
-  status() << "JDIFF version " CBMC_VERSION " " << sizeof(void *) * 8 << "-bit "
+  status() << "JDIFF version " << CBMC_VERSION << " " << sizeof(void *) * 8 << "-bit "
            << config.this_architecture() << " "
            << config.this_operating_system() << eom;
 
diff --git a/src/cbmc/cbmc_parse_options.cpp b/src/cbmc/cbmc_parse_options.cpp
@@ -69,7 +69,7 @@ cbmc_parse_optionst::cbmc_parse_optionst(int argc, const char **argv):
   parse_options_baset(CBMC_OPTIONS, argc, argv),
   xml_interfacet(cmdline),
   messaget(ui_message_handler),
-  ui_message_handler(cmdline, "CBMC " CBMC_VERSION),
+  ui_message_handler(cmdline, std::string("CBMC ")+CBMC_VERSION),
   path_strategy_chooser()
 {
 }
@@ -81,7 +81,7 @@ ::cbmc_parse_optionst::cbmc_parse_optionst(
   parse_options_baset(CBMC_OPTIONS+extra_options, argc, argv),
   xml_interfacet(cmdline),
   messaget(ui_message_handler),
-  ui_message_handler(cmdline, "CBMC " CBMC_VERSION),
+  ui_message_handler(cmdline, std::string("CBMC ")+CBMC_VERSION),
   path_strategy_chooser()
 {
 }
@@ -436,7 +436,7 @@ int cbmc_parse_optionst::doit()
   //
   // Print a banner
   //
-  status() << "CBMC version " CBMC_VERSION " "
+  status() << "CBMC version " << CBMC_VERSION << " "
            << sizeof(void *)*8 << "-bit "
            << config.this_architecture() << " "
            << config.this_operating_system() << eom;
diff --git a/src/cbmc/cbmc_solvers.cpp b/src/cbmc/cbmc_solvers.cpp
@@ -177,7 +177,7 @@ std::unique_ptr<cbmc_solverst::solvert> cbmc_solverst::get_smt2(
       util_make_unique<smt2_dect>(
         ns,
         "cbmc",
-        "Generated by CBMC " CBMC_VERSION,
+        std::string("Generated by CBMC ")+CBMC_VERSION,
         "QF_AUFBV",
         solver);
 
@@ -192,7 +192,7 @@ std::unique_ptr<cbmc_solverst::solvert> cbmc_solverst::get_smt2(
       util_make_unique<smt2_convt>(
         ns,
         "cbmc",
-        "Generated by CBMC " CBMC_VERSION,
+        std::string("Generated by CBMC ")+CBMC_VERSION,
         "QF_AUFBV",
         solver,
         std::cout);
@@ -222,7 +222,7 @@ std::unique_ptr<cbmc_solverst::solvert> cbmc_solverst::get_smt2(
       util_make_unique<smt2_convt>(
         ns,
         "cbmc",
-        "Generated by CBMC " CBMC_VERSION,
+        std::string("Generated by CBMC ")+CBMC_VERSION,
         "QF_AUFBV",
         solver,
         *out);
diff --git a/src/clobber/clobber_parse_options.cpp b/src/clobber/clobber_parse_options.cpp
@@ -38,7 +38,7 @@ Author: Daniel Kroening, kroening@kroening.com
 clobber_parse_optionst::clobber_parse_optionst(int argc, const char **argv):
   parse_options_baset(CLOBBER_OPTIONS, argc, argv),
   language_uit(cmdline, ui_message_handler),
-  ui_message_handler(cmdline, "CLOBBER " CBMC_VERSION)
+  ui_message_handler(cmdline, std::string("CLOBBER ")+CBMC_VERSION)
 {
 }
 
diff --git a/src/goto-analyzer/goto_analyzer_parse_options.cpp b/src/goto-analyzer/goto_analyzer_parse_options.cpp
@@ -67,7 +67,7 @@ goto_analyzer_parse_optionst::goto_analyzer_parse_optionst(
   const char **argv):
   parse_options_baset(GOTO_ANALYSER_OPTIONS, argc, argv),
   messaget(ui_message_handler),
-  ui_message_handler(cmdline, "GOTO-ANALYZER " CBMC_VERSION)
+  ui_message_handler(cmdline, std::string("GOTO-ANALYZER ")+CBMC_VERSION)
 {
 }
 
@@ -374,7 +374,7 @@ int goto_analyzer_parse_optionst::doit()
   //
   // Print a banner
   //
-  status() << "GOTO-ANALYSER version " CBMC_VERSION " "
+  status() << "GOTO-ANALYSER version " << CBMC_VERSION << " "
            << sizeof(void *)*8 << "-bit "
            << config.this_architecture() << " "
            << config.this_operating_system() << eom;
diff --git a/src/goto-cc/as_mode.cpp b/src/goto-cc/as_mode.cpp
@@ -82,15 +82,15 @@ int as_modet::doit()
      cmdline.isset("version"))
   {
     if(act_as_as86)
-      status() << "as86 version: 0.16.17 (goto-cc " CBMC_VERSION ")"
+      status() << "as86 version: 0.16.17 (goto-cc " << CBMC_VERSION << ")"
                << eom;
     else
       status() << "GNU assembler version 2.20.51.0.7 20100318"
-               << " (goto-cc " CBMC_VERSION ")" << eom;
+               << " (goto-cc " << CBMC_VERSION << ")" << eom;
 
     status() << '\n' <<
       "Copyright (C) 2006-2014 Daniel Kroening, Christoph Wintersteiger\n" <<
-      "CBMC version: " CBMC_VERSION << '\n' <<
+      "CBMC version: " << CBMC_VERSION << '\n' <<
       "Architecture: " << config.this_architecture() << '\n' <<
       "OS: " << config.this_operating_system() << eom;
 
diff --git a/src/goto-cc/compile.cpp b/src/goto-cc/compile.cpp
@@ -677,7 +677,8 @@ unsigned compilet::function_body_count(const goto_functionst &functions) const
 
 void compilet::add_compiler_specific_defines(configt &config) const
 {
-  config.ansi_c.defines.push_back("__GOTO_CC_VERSION__=" CBMC_VERSION);
+  config.ansi_c.defines.push_back(
+    std::string("__GOTO_CC_VERSION__=")+CBMC_VERSION);
 }
 
 void compilet::convert_symbols(goto_functionst &dest)
diff --git a/src/goto-cc/gcc_mode.cpp b/src/goto-cc/gcc_mode.cpp
@@ -346,14 +346,14 @@ int gcc_modet::doit()
 
     if(act_as_bcc)
       std::cout << "bcc: version " << gcc_version
-                << " (goto-cc " CBMC_VERSION ")\n";
+                << " (goto-cc " << CBMC_VERSION << ")\n";
     else
     {
       if(gcc_version.flavor == gcc_versiont::flavort::CLANG)
         std::cout << "clang version " << gcc_version
-                  << " (goto-cc " CBMC_VERSION ")\n";
+                  << " (goto-cc " << CBMC_VERSION << ")\n";
       else
-        std::cout << "gcc (goto-cc " CBMC_VERSION ") " << gcc_version << '\n';
+        std::cout << "gcc (goto-cc " << CBMC_VERSION << ") " << gcc_version << '\n';
     }
   }
 
@@ -371,7 +371,7 @@ int gcc_modet::doit()
     std::cout
       << '\n'
       << "Copyright (C) 2006-2018 Daniel Kroening, Christoph Wintersteiger\n"
-      << "CBMC version: " CBMC_VERSION << '\n'
+      << "CBMC version: " << CBMC_VERSION << '\n'
       << "Architecture: " << config.this_architecture() << '\n'
       << "OS: " << config.this_operating_system() << '\n';
 
diff --git a/src/goto-diff/goto_diff_parse_options.cpp b/src/goto-diff/goto_diff_parse_options.cpp
@@ -64,7 +64,7 @@ Author: Peter Schrammel
 goto_diff_parse_optionst::goto_diff_parse_optionst(int argc, const char **argv):
   parse_options_baset(GOTO_DIFF_OPTIONS, argc, argv),
   goto_diff_languagest(cmdline, ui_message_handler),
-  ui_message_handler(cmdline, "GOTO-DIFF " CBMC_VERSION),
+  ui_message_handler(cmdline, std::string("GOTO-DIFF ")+CBMC_VERSION),
   languages2(cmdline, ui_message_handler)
 {
 }
@@ -75,7 +75,7 @@ ::goto_diff_parse_optionst::goto_diff_parse_optionst(
   const std::string &extra_options):
   parse_options_baset(GOTO_DIFF_OPTIONS+extra_options, argc, argv),
   goto_diff_languagest(cmdline, ui_message_handler),
-  ui_message_handler(cmdline, "GOTO-DIFF " CBMC_VERSION),
+  ui_message_handler(cmdline, std::string("GOTO-DIFF ")+CBMC_VERSION),
   languages2(cmdline, ui_message_handler)
 {
 }
@@ -243,7 +243,7 @@ int goto_diff_parse_optionst::doit()
   //
   // Print a banner
   //
-  status() << "GOTO-DIFF version " CBMC_VERSION " "
+  status() << "GOTO-DIFF version " << CBMC_VERSION << " "
            << sizeof(void *)*8 << "-bit "
            << config.this_architecture() << " "
            << config.this_operating_system() << eom;
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
@@ -1,9 +1,4 @@
 file(GLOB_RECURSE sources "*.cpp" "*.h")
-add_library(util ${sources})
-
-generic_includes(util)
-
-target_link_libraries(util big-int langapi)
 
 # based on https://cmake.org/pipermail/cmake/2010-July/038015.html
 find_package(Git)
@@ -18,7 +13,7 @@ if(GIT_FOUND)
       OUTPUT_VARIABLE GIT_INFO
       OUTPUT_STRIP_TRAILING_WHITESPACE
     )
-    configure_file(\${CUR}/version.h.in version.h)
+    configure_file(\${CUR}/version.cpp.in version.cpp)
     "
   )
 else()
@@ -28,18 +23,25 @@ else()
       config_inc_v REGEX \"CBMC_VERSION *= *[0-9\.]+\")
     string(REGEX REPLACE \"^CBMC_VERSION *= *\" \"\" CBMC_RELEASE \${config_inc_v})
     set(GIT_INFO \"n/a\")
-    configure_file(\${CUR}/version.h.in version.h)
+    configure_file(\${CUR}/version.cpp.in version.cpp)
     "
   )
 endif()
 
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/version.h.in
-  "\#define CBMC_VERSION \"@CBMC_RELEASE@ (@GIT_INFO@)\"\n")
-add_custom_target(
-  version.h
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/version.cpp.in
+  "const char *CBMC_VERSION=\"@CBMC_RELEASE@ (@GIT_INFO@)\";\n")
+add_custom_command(
+  OUTPUT version.cpp
   COMMAND ${CMAKE_COMMAND}
     -D CBMC_SOURCE_DIR=${CBMC_SOURCE_DIR}
     -D CUR=${CMAKE_CURRENT_BINARY_DIR}
     -P ${CMAKE_BINARY_DIR}/version.cmake
 )
-add_dependencies(util version.h)
+
+add_library(util
+  ${sources}
+  version.cpp)
+
+generic_includes(util)
+
+target_link_libraries(util big-int langapi)
diff --git a/src/util/Makefile b/src/util/Makefile
@@ -93,6 +93,7 @@ SRC = arith_tools.cpp \
       union_find.cpp \
       union_find_replace.cpp \
       unwrap_nested_exception.cpp \
+      version.cpp \
       xml.cpp \
       xml_expr.cpp \
       xml_irep.cpp \
@@ -105,8 +106,8 @@ include ../common
 
 # get version from git
 GIT_INFO = $(shell git describe --tags --always --dirty || echo "n/a")
-RELEASE_INFO = \#define CBMC_VERSION "$(CBMC_VERSION) ($(GIT_INFO))"
-GIT_INFO_FILE = version.h
+RELEASE_INFO = const char *CBMC_VERSION="$(CBMC_VERSION) ($(GIT_INFO))";
+GIT_INFO_FILE = version.cpp
 
 $(GIT_INFO_FILE):
 	echo '$(RELEASE_INFO)' > $@
diff --git a/src/util/version.h b/src/util/version.h
@@ -0,0 +1 @@
+extern const char *CBMC_VERSION;

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ Author: Peter Schrammel`
`64`	`64`	`jdiff_parse_optionst::jdiff_parse_optionst(int argc, const char **argv)`
`65`	`65`	`: parse_options_baset(JDIFF_OPTIONS, argc, argv),`
`66`	`66`	`jdiff_languagest(cmdline, ui_message_handler),`
`67`		`- ui_message_handler(cmdline, "JDIFF " CBMC_VERSION),`
	`67`	`+ ui_message_handler(cmdline, std::string("JDIFF ")+CBMC_VERSION),`
`68`	`68`	`languages2(cmdline, ui_message_handler)`
`69`	`69`	`{`
`70`	`70`	`}`
`@@ -75,7 +75,7 @@ ::jdiff_parse_optionst::jdiff_parse_optionst(`
`75`	`75`	`const std::string &extra_options)`
`76`	`76`	`: parse_options_baset(JDIFF_OPTIONS + extra_options, argc, argv),`
`77`	`77`	`jdiff_languagest(cmdline, ui_message_handler),`
`78`		`- ui_message_handler(cmdline, "JDIFF " CBMC_VERSION),`
	`78`	`+ ui_message_handler(cmdline, std::string("JDIFF ")+CBMC_VERSION),`
`79`	`79`	`languages2(cmdline, ui_message_handler)`
`80`	`80`	`{`
`81`	`81`	`}`
`@@ -206,7 +206,7 @@ int jdiff_parse_optionst::doit()`
`206`	`206`	`//`
`207`	`207`	`// Print a banner`
`208`	`208`	`//`
`209`		`- status() << "JDIFF version " CBMC_VERSION " " << sizeof(void ) 8 << "-bit "`
	`209`	`+ status() << "JDIFF version " << CBMC_VERSION << " " << sizeof(void ) 8 << "-bit "`
`210`	`210`	`<< config.this_architecture() << " "`
`211`	`211`	`<< config.this_operating_system() << eom;`
`212`	`212`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ Author: Daniel Kroening, kroening@kroening.com`
`38`	`38`	`clobber_parse_optionst::clobber_parse_optionst(int argc, const char **argv):`
`39`	`39`	`parse_options_baset(CLOBBER_OPTIONS, argc, argv),`
`40`	`40`	`language_uit(cmdline, ui_message_handler),`
`41`		`- ui_message_handler(cmdline, "CLOBBER " CBMC_VERSION)`
	`41`	`+ ui_message_handler(cmdline, std::string("CLOBBER ")+CBMC_VERSION)`
`42`	`42`	`{`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -677,7 +677,8 @@ unsigned compilet::function_body_count(const goto_functionst &functions) const`
`677`	`677`
`678`	`678`	`void compilet::add_compiler_specific_defines(configt &config) const`
`679`	`679`	`{`
`680`		`- config.ansi_c.defines.push_back("__GOTO_CC_VERSION__=" CBMC_VERSION);`
	`680`	`+ config.ansi_c.defines.push_back(`
	`681`	`+ std::string("__GOTO_CC_VERSION__=")+CBMC_VERSION);`
`681`	`682`	`}`
`682`	`683`
`683`	`684`	`void compilet::convert_symbols(goto_functionst &dest)`