use a string instead of macro for version number

Author: kroening

.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

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;

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);

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)
 {
 }
 

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;

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;
 

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)

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';
 

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;

src/util/CMakeLists.txt

@@ -1,5 +1,5 @@
 file(GLOB_RECURSE sources "*.cpp" "*.h")
-add_library(util ${sources})
+add_library(util ${sources} version.cpp)
 
 generic_includes(util)
 
@@ -18,7 +18,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 +28,17 @@ 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")
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/version.cpp.in
+  "const char *CBMC_VERSION=\"@CBMC_RELEASE@ (@GIT_INFO@)\";\n")
 add_custom_target(
-  version.h
+  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)