Merge pull request #7637 from NlightNFotis/cbmc-5.80.0

Mark CBMC version 5.80.0

Author: NlightNFotis

regression/libcprover-cpp/call_bmc.cpp

@@ -23,6 +23,7 @@ int main(int argc, char *argv[])
   try
   {
     std::cout << "Hello from API stub" << std::endl;
+    std::cout << "Working from C++ API version ";
 
     // Convert argv to vector of strings for initialize_goto_model
     std::vector<std::string> arguments(argv + 1, argv + argc);
@@ -35,6 +36,7 @@ int main(int argc, char *argv[])
 
     // Initialise API dependencies and global configuration in one step.
     api_sessiont api(api_options);
+    std::cout << *api.get_api_version() << std::endl;
 
     // Demonstrate the loading of a goto-model from the command line arguments
     api.set_message_callback(print_messages_to_stdout, nullptr);

src/config.inc

@@ -76,7 +76,7 @@ endif
 OSX_IDENTITY="Developer ID Application: Daniel Kroening"
 
 # Detailed version information
-CBMC_VERSION = 5.79.0
+CBMC_VERSION = 5.80.0
 
 # Use the CUDD library for BDDs, can be installed using `make -C src cudd-download`
 # CUDD = ../../cudd-3.0.0

src/libcprover-cpp/api.cpp

@@ -8,6 +8,7 @@
 #include <util/message.h>
 #include <util/options.h>
 #include <util/ui_message.h>
+#include <util/version.h>
 
 #include <goto-programs/goto_model.h>
 #include <goto-programs/initialize_goto_model.h>
@@ -34,7 +35,7 @@ extern configt config;
 
 std::unique_ptr<std::string> api_sessiont::get_api_version() const
 {
-  return util_make_unique<std::string>(std::string{"0.1"});
+  return util_make_unique<std::string>(std::string{CBMC_VERSION});
 }
 
 struct api_session_implementationt

src/libcprover-rust/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "libcprover_rust"
-version = "0.1.0"
+version = "5.80.0"
 edition = "2021"
 description = "Rust API for CBMC and assorted CProver tools"
 repository = "https://github.com/diffblue/cbmc"

src/libcprover-rust/Cargo.toml

@@ -89,8 +89,8 @@ mod tests {
         let client = cprover_api::new_api_session();
         let result = client.get_api_version();
 
-        let_cxx_string!(expected_version = "0.1");
-        assert_eq!(*result, *expected_version);
+        let_cxx_string!(expected_version = "5.79.0");
+        assert!(*result > *expected_version);
     }
 
     #[test]