rename version.h to z3_version.h to differentiate name in install include directory. Add support for z3_version.h in python build system. #1833

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

scripts/mk_project.py

@@ -10,7 +10,7 @@ from mk_util import *
 # Z3 Project definition
 def init_project_def():
     set_version(4, 8, 0, 0)
-    add_lib('util', [])
+    add_lib('util', [], includes2install = ['z3_version.h'])
     add_lib('polynomial', ['util'], 'math/polynomial')
     add_lib('sat', ['util'])
     add_lib('nlsat', ['polynomial', 'sat'])

scripts/mk_util.py

@@ -2805,8 +2805,8 @@ def get_full_version_string(major, minor, build, revision):
 # Update files with the version number
 def mk_version_dot_h(major, minor, build, revision):
     c = get_component(UTIL_COMPONENT)
-    version_template = os.path.join(c.src_dir, 'version.h.in')
-    version_header_output = os.path.join(c.src_dir, 'version.h')
+    version_template = os.path.join(c.src_dir, 'z3_version.h.in')
+    version_header_output = os.path.join(c.src_dir, 'z3_version.h')
     # Note the substitution names are what is used by the CMake
     # builds system. If you change these you should change them
     # in the CMake build too

src/CMakeLists.txt

@@ -167,7 +167,7 @@ foreach (header ${libz3_public_headers})
     PUBLIC_HEADER "${CMAKE_SOURCE_DIR}/src/api/${header}")
 endforeach()
 set_property(TARGET libz3 APPEND PROPERTY
-    PUBLIC_HEADER "${CMAKE_CURRENT_BINARY_DIR}/util/version.h")
+    PUBLIC_HEADER "${CMAKE_CURRENT_BINARY_DIR}/util/z3_version.h")
 
 install(TARGETS libz3
   EXPORT Z3_EXPORTED_TARGETS

src/shell/main.cpp

@@ -26,7 +26,7 @@ Revision History:
 #include "shell/smtlib_frontend.h"
 #include "shell/z3_log_frontend.h"
 #include "util/warning.h"
-#include "util/version.h"
+#include "util/z3_version.h"
 #include "shell/dimacs_frontend.h"
 #include "shell/datalog_frontend.h"
 #include "shell/opt_frontend.h"

src/solver/solver.cpp

@@ -273,7 +273,8 @@ expr_ref_vector solver::get_non_units(ast_manager& m) {
         }
         app* _f = to_app(f);
         if (_f->get_family_id() == bfid) {
-            // basic objects are true/false/and/or/not/=/distinct and proof objects (that are not Boolean)
+            // basic objects are true/false/and/or/not/=/distinct 
+            // and proof objects (that are not Boolean).
             if (_f->get_num_args() > 0 && m.is_bool(_f->get_arg(0))) {
                 fmls.append(_f->get_num_args(), _f->get_args());
             }

src/util/CMakeLists.txt

@@ -1,11 +1,11 @@
-if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/version.h")
-  message(FATAL_ERROR "\"${CMAKE_CURRENT_SOURCE_DIR}/version.h\""
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/z3_version.h")
+  message(FATAL_ERROR "\"${CMAKE_CURRENT_SOURCE_DIR}/z3_version.h\""
           ${z3_polluted_tree_msg}
   )
 endif()
 
 set(Z3_FULL_VERSION "\"${Z3_FULL_VERSION_STR}\"")
-configure_file(version.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+configure_file(z3_version.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/z3_version.h)
 
 
 z3_add_component(util