[z3] bump version to 4.8.5 (#6803)

4 files changed, 88 insertions, 181 deletions

diff --git a/ports/z3/CONTROL b/ports/z3/CONTROL
index 9a64766a9..861c3eab4 100644
--- a/ports/z3/CONTROL
+++ b/ports/z3/CONTROL
@@ -1,3 +1,3 @@
 Source: z3
-Version: 4.8.4-1
+Version: 4.8.5
 Description: An SMT solver
diff --git a/ports/z3/fix-install-path.patch b/ports/z3/fix-install-path.patch
index 76912da62..170ca085a 100644
--- a/ports/z3/fix-install-path.patch
+++ b/ports/z3/fix-install-path.patch
@@ -1,116 +1,85 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt

-index 9877af8..10ef458 100644

---- a/CMakeLists.txt

-+++ b/CMakeLists.txt

-@@ -675,7 +675,7 @@ install(EXPORT

-   Z3_EXPORTED_TARGETS

-   FILE "Z3Targets.cmake"

-   NAMESPACE z3::

--  DESTINATION "${CMAKE_INSTALL_Z3_CMAKE_PACKAGE_DIR}"

-+  DESTINATION share/z3

- )

- set(Z3_INSTALL_TREE_CMAKE_CONFIG_FILE "${CMAKE_BINARY_DIR}/cmake/Z3Config.cmake")

- set(Z3_FIRST_PACKAGE_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}")

-@@ -700,7 +700,7 @@ unset(CONFIG_FILE_TYPE)

- # Add install rule to install ${Z3_INSTALL_TREE_CMAKE_CONFIG_FILE}

- install(

-   FILES "${Z3_INSTALL_TREE_CMAKE_CONFIG_FILE}"

--  DESTINATION "${CMAKE_INSTALL_Z3_CMAKE_PACKAGE_DIR}"

-+  DESTINATION share/z3

- )

- 

- # TODO: Provide a `Z3Version.cmake` file so that clients can specify the version

-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt

-index b097126..e127bef 100644

---- a/doc/CMakeLists.txt

-+++ b/doc/CMakeLists.txt

-@@ -88,6 +88,6 @@ set(CMAKE_INSTALL_API_BINDINGS_DOC

- if (INSTALL_API_BINDINGS_DOCUMENTATION)

-   install(

-     DIRECTORY "${DOC_DEST_DIR}"

--    DESTINATION "${CMAKE_INSTALL_API_BINDINGS_DOC}"

-+    DESTINATION share/z3

-   )

- endif()

-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt

-index c497c19..0b0e081 100644

---- a/src/CMakeLists.txt

-+++ b/src/CMakeLists.txt

-@@ -173,7 +173,8 @@ install(TARGETS libz3

-   EXPORT Z3_EXPORTED_TARGETS

-   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"

-   ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" # On Windows this installs ``libz3.lib`` which CMake calls the "corresponding import library". Do we want this installed?

--  RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}" # For Windows. DLLs are runtime targets for CMake

-+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" # For Windows. DLLs are runtime targets for CMake

-+  BUNDLE  DESTINATION "${CMAKE_INSTALL_BINDIR}" # For MACOSX.

-   PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"

- )

- 

-diff --git a/src/api/dotnet/CMakeLists.txt b/src/api/dotnet/CMakeLists.txt

-index 20621e4..57bb3f0 100644

---- a/src/api/dotnet/CMakeLists.txt

-+++ b/src/api/dotnet/CMakeLists.txt

-@@ -257,7 +257,7 @@ if (DOTNET_TOOLCHAIN_IS_MONO)

-   message(STATUS "Emitting install rules for .NET bindings")

-   # Install pkgconfig file for the assembly. This is needed by Monodevelop

-   # to find the assembly

--  install(FILES "${Z3_DOTNET_PKGCONFIG_FILE}" DESTINATION "${CMAKE_INSTALL_PKGCONFIGDIR}")

-+  install(FILES "${Z3_DOTNET_PKGCONFIG_FILE}" DESTINATION share/z3/pkgconfig)

- 

-   # Configure the install and uninstall scripts.

-   # Note: If multi-configuration generator support is ever fixed then these

-@@ -266,7 +266,7 @@ if (DOTNET_TOOLCHAIN_IS_MONO)

-   configure_file(cmake_uninstall_gac.cmake.in cmake_uninstall_gac.cmake @ONLY)

- 

-   # Tell CMake to Invoke a script to install assembly to the GAC during install

--  install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/cmake_install_gac.cmake")

-+  install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/cmake_install_gac.cmake" DESTINATION share/z3)

- 

-   # Add custom target to uninstall the assembly from the GAC

-   add_custom_target(remove_dotnet_dll_from_gac

-@@ -280,7 +280,7 @@ elseif(DOTNET_TOOLCHAIN_IS_WINDOWS)

-   # Don't install Z3_DOTNET_ASSEMBLY_DLL into the gac. Instead just copy into

-   # installation directory.

-   install(FILES "${Z3_DOTNET_ASSEMBLY_DLL}" DESTINATION "${CMAKE_INSTALL_LIBDIR}")

--  install(FILES "${Z3_DOTNET_ASSEMBLY_DLL_DOC}" DESTINATION "${CMAKE_INSTALL_LIBDIR}")

-+  install(FILES "${Z3_DOTNET_ASSEMBLY_DLL_DOC}" DESTINATION share/z3)

- else()

-   message(FATAL_ERROR "Unknown .NET toolchain")

- endif()

-diff --git a/src/api/java/CMakeLists.txt b/src/api/java/CMakeLists.txt

-index c2d73ff..506142c 100644

---- a/src/api/java/CMakeLists.txt

-+++ b/src/api/java/CMakeLists.txt

-@@ -228,7 +228,7 @@ if (INSTALL_JAVA_BINDINGS)

-     PATH

-     "Directory to install Z3 Java JNI bridge library relative to install prefix"

-   )

--  install(TARGETS z3java DESTINATION "${Z3_JAVA_JNI_LIB_INSTALLDIR}")

-+  install(TARGETS z3java DESTINATION share/z3)

-   # Note: Don't use ``DESTINATION`` here as the version of ``UseJava.cmake`` shipped

-   # with CMake 2.8.12.2 handles that incorrectly.

-   install_jar(z3JavaJar "${Z3_JAVA_JAR_INSTALLDIR}")

-diff --git a/src/api/python/CMakeLists.txt b/src/api/python/CMakeLists.txt

-index 6efdc15..e4d5be0 100644

---- a/src/api/python/CMakeLists.txt

-+++ b/src/api/python/CMakeLists.txt

-@@ -136,7 +136,7 @@ if (INSTALL_PYTHON_BINDINGS)

-   # Using DESTDIR still seems to work even if we use an absolute path

-   message(STATUS "Python bindings will be installed to \"${CMAKE_INSTALL_PYTHON_PKG_DIR}\"")

-   install(FILES ${build_z3_python_bindings_target_depends}

--    DESTINATION "${CMAKE_INSTALL_PYTHON_PKG_DIR}/z3"

-+    DESTINATION share/z3

-   )

- else()

-   message(STATUS "Not emitting rules to install Z3 python bindings")

-diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt

-index 2782463..b6cd2f1 100644

---- a/src/shell/CMakeLists.txt

-+++ b/src/shell/CMakeLists.txt

-@@ -44,5 +44,5 @@ target_link_libraries(shell PRIVATE ${Z3_DEPENDENT_LIBS})

- z3_add_component_dependencies_to_target(shell ${shell_expanded_deps})

- z3_append_linker_flag_list_to_target(shell ${Z3_DEPENDENT_EXTRA_CXX_LINK_FLAGS})

- install(TARGETS shell

--  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"

-+  RUNTIME DESTINATION tools/z3

- )

+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e73daf63..c6bca7918 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -615,7 +615,7 @@ install(EXPORT
+   Z3_EXPORTED_TARGETS
+   FILE "Z3Targets.cmake"
+   NAMESPACE z3::
+-  DESTINATION "${CMAKE_INSTALL_Z3_CMAKE_PACKAGE_DIR}"
++  DESTINATION share/z3
+ )
+ set(Z3_INSTALL_TREE_CMAKE_CONFIG_FILE "${PROJECT_BINARY_DIR}/cmake/Z3Config.cmake")
+ set(Z3_FIRST_PACKAGE_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}")
+@@ -640,7 +640,7 @@ unset(CONFIG_FILE_TYPE)
+ # Add install rule to install ${Z3_INSTALL_TREE_CMAKE_CONFIG_FILE}
+ install(
+   FILES "${Z3_INSTALL_TREE_CMAKE_CONFIG_FILE}"
+-  DESTINATION "${CMAKE_INSTALL_Z3_CMAKE_PACKAGE_DIR}"
++  DESTINATION share/z3
+ )
+ 
+ # TODO: Provide a `Z3Version.cmake` file so that clients can specify the version
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index d5778add9..35b7e4c55 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -88,6 +88,6 @@ set(CMAKE_INSTALL_API_BINDINGS_DOC
+ if (INSTALL_API_BINDINGS_DOCUMENTATION)
+   install(
+     DIRECTORY "${DOC_DEST_DIR}"
+-    DESTINATION "${CMAKE_INSTALL_API_BINDINGS_DOC}"
++    DESTINATION share/z3
+   )
+ endif()
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9b6f00b62..8b47125d3 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -173,7 +173,8 @@ install(TARGETS libz3
+   EXPORT Z3_EXPORTED_TARGETS
+   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+   ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" # On Windows this installs ``libz3.lib`` which CMake calls the "corresponding import library". Do we want this installed?
+-  RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}" # For Windows. DLLs are runtime targets for CMake
++  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" # For Windows. DLLs are runtime targets for CMake
++  BUNDLE  DESTINATION "${CMAKE_INSTALL_BINDIR}" # For MACOSX.
+   PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ 
+diff --git a/src/api/java/CMakeLists.txt b/src/api/java/CMakeLists.txt
+index f593d91a4..70682b721 100644
+--- a/src/api/java/CMakeLists.txt
++++ b/src/api/java/CMakeLists.txt
+@@ -228,7 +228,7 @@ if (INSTALL_JAVA_BINDINGS)
+     PATH
+     "Directory to install Z3 Java JNI bridge library relative to install prefix"
+   )
+-  install(TARGETS z3java DESTINATION "${Z3_JAVA_JNI_LIB_INSTALLDIR}")
++  install(TARGETS z3java DESTINATION share/z3)
+   # Note: Don't use ``DESTINATION`` here as the version of ``UseJava.cmake`` shipped
+   # with CMake 2.8.12.2 handles that incorrectly.
+   install_jar(z3JavaJar "${Z3_JAVA_JAR_INSTALLDIR}")
+diff --git a/src/api/python/CMakeLists.txt b/src/api/python/CMakeLists.txt
+index 6cabb779a..0b79861bf 100644
+--- a/src/api/python/CMakeLists.txt
++++ b/src/api/python/CMakeLists.txt
+@@ -136,7 +136,7 @@ if (INSTALL_PYTHON_BINDINGS)
+   # Using DESTDIR still seems to work even if we use an absolute path
+   message(STATUS "Python bindings will be installed to \"${CMAKE_INSTALL_PYTHON_PKG_DIR}\"")
+   install(FILES ${build_z3_python_bindings_target_depends}
+-    DESTINATION "${CMAKE_INSTALL_PYTHON_PKG_DIR}/z3"
++    DESTINATION share/z3
+   )
+ else()
+   message(STATUS "Not emitting rules to install Z3 python bindings")
+diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
+index 278246341..b6cd2f1c1 100644
+--- a/src/shell/CMakeLists.txt
++++ b/src/shell/CMakeLists.txt
+@@ -44,5 +44,5 @@ target_link_libraries(shell PRIVATE ${Z3_DEPENDENT_LIBS})
+ z3_add_component_dependencies_to_target(shell ${shell_expanded_deps})
+ z3_append_linker_flag_list_to_target(shell ${Z3_DEPENDENT_EXTRA_CXX_LINK_FLAGS})
+ install(TARGETS shell
+-  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++  RUNTIME DESTINATION tools/z3
+ )
diff --git a/ports/z3/fix_cmake_long_dir.patch b/ports/z3/fix_cmake_long_dir.patch
deleted file mode 100644
index f7dc505d6..000000000
--- a/ports/z3/fix_cmake_long_dir.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/cmake/z3_add_component.cmake b/cmake/z3_add_component.cmake
-index 8ab6e045d..ac6d1ec06 100644
---- a/cmake/z3_add_component.cmake
-+++ b/cmake/z3_add_component.cmake
-@@ -262,18 +262,20 @@ macro(z3_add_install_tactic_rule)
-       GLOBAL
-       PROPERTY Z3_${dependency}_TACTIC_HEADERS
-     )
--    list(APPEND _tactic_header_files ${_component_tactic_header_files})
-+    list(APPEND _tactic_header_files "${_component_tactic_header_files}")
-   endforeach()
-   unset(_component_tactic_header_files)
- 
-+  string(REPLACE ";" "\n" _tactic_header_files "${_tactic_header_files}")
-+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/install_tactic.deps" ${_tactic_header_files})
-   add_custom_command(OUTPUT "install_tactic.cpp"
-     COMMAND "${PYTHON_EXECUTABLE}"
-     "${CMAKE_SOURCE_DIR}/scripts/mk_install_tactic_cpp.py"
-     "${CMAKE_CURRENT_BINARY_DIR}"
--    ${_tactic_header_files}
-+    "${CMAKE_CURRENT_BINARY_DIR}/install_tactic.deps"
-     DEPENDS "${CMAKE_SOURCE_DIR}/scripts/mk_install_tactic_cpp.py"
-             ${Z3_GENERATED_FILE_EXTRA_DEPENDENCIES}
--            ${_tactic_header_files}
-+            "${CMAKE_CURRENT_BINARY_DIR}/install_tactic.deps"
-     COMMENT "Generating \"${CMAKE_CURRENT_BINARY_DIR}/install_tactic.cpp\""
-     ${ADD_CUSTOM_COMMAND_USES_TERMINAL_ARG}
-     VERBATIM
-diff --git a/scripts/mk_install_tactic_cpp.py b/scripts/mk_install_tactic_cpp.py
-index a152eff14..b82e71354 100755
---- a/scripts/mk_install_tactic_cpp.py
-+++ b/scripts/mk_install_tactic_cpp.py
-@@ -14,19 +14,22 @@ def main(args):
-     logging.basicConfig(level=logging.INFO)
-     parser = argparse.ArgumentParser(description=__doc__)
-     parser.add_argument("destination_dir", help="destination directory")
--    parser.add_argument("header_files", nargs="+",
--                        help="One or more header files to parse")
-+    parser.add_argument("deps", help="file with header file names to parse")
-     pargs = parser.parse_args(args)
- 
-     if not mk_genfile_common.check_dir_exists(pargs.destination_dir):
-         return 1
- 
--    if not mk_genfile_common.check_files_exist(pargs.header_files):
-+    if not mk_genfile_common.check_files_exist([pargs.deps]):
-         return 1
- 
--    h_files_full_path = []
--    for header_file in pargs.header_files:
--        h_files_full_path.append(os.path.abspath(header_file))
-+    with open(pargs.deps, 'r') as f:
-+        lines = f.read().split('\n')
-+        h_files_full_path = [os.path.abspath(header_file)
-+                                for header_file in lines if header_file]
-+
-+    if not mk_genfile_common.check_files_exist(h_files_full_path):
-+        return 1
- 
-     output = mk_genfile_common.mk_install_tactic_cpp_internal(
-         h_files_full_path,
diff --git a/ports/z3/portfile.cmake b/ports/z3/portfile.cmake
index ea27a5bd9..72da20dd9 100644
--- a/ports/z3/portfile.cmake
+++ b/ports/z3/portfile.cmake
@@ -15,11 +15,10 @@ vcpkg_add_to_path("${PYTHON2_DIR}")
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO Z3Prover/z3
-  REF z3-4.8.4
-  SHA512 4660ba6ab33a6345b2e8396c332d4afcfc73eda66ceb2595a39f152df4d62a9ea0f349b0f9212389ba84ecba6bdae6ad9b62b376ba44dc4d9c74f80d7a818bf4
+  REF Z3-4.8.5
+  SHA512 ca36e1a0332bd473a64f41dfdb31656fb3486178473e4fd4934dccce109a84c9686c08f94998df74bacb588eb12ea5db25dc17a564ee76f82fd2559349697309
   HEAD_REF master
   PATCHES
-         fix_cmake_long_dir.patch
          fix-install-path.patch
 )