update mysql: all platform to 8.0.31 (#2220)

* add test to mysql

* Update xmake.lua

* Update xmake.lua

* fix shared and static in linux

* set editline to bundle

* 好像没必要限制arch

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

---------

Co-authored-by: ruki <[email protected]>

packages/m/mysql/xmake.lua

@@ -1,6 +1,6 @@
 package("mysql")
 
-    set_homepage("https://dev.mysql.com/doc/refman/5.7/en/")
+    set_homepage("https://dev.mysql.com/doc")
     set_description("Open source relational database management system.")
 
     if is_plat("macosx", "linux") then
@@ -9,13 +9,13 @@ package("mysql")
         add_versions("5.7.29", "00f514124de2bad1ba7b380cbbd46e316cae7fc7bc3a5621456cabf352f27978")
     end
 
-    if is_plat("windows") then
+    if is_plat("windows", "macosx", "linux") then
         set_urls("https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-$(version).tar.gz")
         add_versions("8.0.31", "67bb8cba75b28e95c7f7948563f01fb84528fcbb1a35dba839d4ce44fe019baa")
     end
 
     if is_plat("mingw") then
-        add_configs("shared", {description = "Download shared binaries.", default = true, type = "boolean", readonly=true})
+        add_configs("shared", {description = "Download shared binaries.", default = true, type = "boolean", readonly = true})
         if is_arch("i386") then
             set_urls("https://github.com/xmake-mirror/mysql/releases/download/$(version)/mysql_$(version)_x86.zip")
             add_versions("8.0.31", "fd626cae72b1f697b941cd3a2ea9d93507e689adabb1c2c11d465f01f4b07cb9")
@@ -24,23 +24,22 @@ package("mysql")
             add_versions("8.0.31", "26312cfa871c101b7a55cea96278f9d14d469455091c4fd3ffaaa67a2d1aeea5")
         end
     end
-    
-    if is_plat("macosx", "linux", "windows") then
-        add_deps("cmake", "openssl")
-        if is_plat("linux") then
-            add_deps("ncurses")
-        end
-    end
 
     add_includedirs("include", "include/mysql")
+    add_deps("cmake")
 
-    on_load("windows", "mingw", function(package) 
+    on_load("windows", "mingw", "linux", "macosx", function(package) 
         if package:version():ge("8.0.0") then
             package:add("deps", "boost")
             package:add("deps", "openssl 1.1.1-t")
             package:add("deps", "zlib v1.2.13")
             package:add("deps", "zstd")
             package:add("deps", "lz4")
+        else
+            package:add("deps", "openssl")
+            if package:is_plat("linux") then
+                package:add("deps", "ncurses")
+            end
         end
     end)
 
@@ -50,82 +49,94 @@ package("mysql")
         os.cp("lib/libmysql.dll", package:installdir("bin"))
     end)
 
-    on_install("windows", function (package)
-        io.gsub("CMakeLists.txt", "ADD_SUBDIRECTORY%(storage/ndb%)", "")
-        local configs = {"-DCOMPILATION_COMMENT=XMake",
-                         "-DDEFAULT_CHARSET=utf8",
-                         "-DDEFAULT_COLLATION=utf8_general_ci",
-                         "-DINSTALL_DOCDIR=share/doc/#{name}",
-                         "-DINSTALL_INCLUDEDIR=include/mysql",
-                         "-DINSTALL_INFODIR=share/info",
-                         "-DINSTALL_MANDIR=share/man",
-                         "-DINSTALL_MYSQLSHAREDIR=share/mysql",
-                         "-DWITH_EDITLINE=" .. (is_plat("macosx") and "system" or "bundled"),
-                         "-DWITH_UNIT_TESTS=OFF",
-                         "-DDISABLE_SHARED=" .. (package:config("shared") and "OFF" or "ON"),
-                         "-DWITH_LZ4='system'",
-                         "-DWITH_ZSTD='system'",
-                         "-DWITH_ZLIB='system'",
-                         "-DWINDOWS_RUNTIME_MD=" .. (package:config("vs_runtime"):startswith("MD") and "ON" or "OFF"),
-                         "-DWITHOUT_SERVER=ON"}
-        io.replace("cmake/ssl.cmake","IF(NOT OPENSSL_APPLINK_C)","IF(FALSE AND NOT OPENSSL_APPLINK_C)", {plain = true})
-        for _, removelib in ipairs({"icu", "libevent", "re2", "rapidjson", "protobuf", "libedit"}) do
-            io.replace("CMakeLists.txt", "MYSQL_CHECK_" .. string.upper(removelib) .. "()\n", "", {plain = true})
-            io.replace("CMakeLists.txt", "INCLUDE(" .. removelib .. ")\n", "", {plain = true})
-            io.replace("CMakeLists.txt", "WARN_MISSING_SYSTEM_" .. string.upper(removelib) .. "(" .. string.upper(removelib) .. "_WARN_GIVEN)", "# WARN_MISSING_SYSTEM_" .. string.upper(removelib) .. "(" .. string.upper(removelib) .. "_WARN_GIVEN)", {plain = true})
-            io.replace("CMakeLists.txt", "SET(" .. string.upper(removelib) .. "_WARN_GIVEN)", "# SET(" .. string.upper(removelib) .. "_WARN_GIVEN)", {plain = true})
-        end
-        os.rmdir("extra")
-        for _, folder in ipairs({"client", "man", "mysql-test", "libbinlogstandalone"}) do
-            os.rmdir(folder)
-            io.replace("CMakeLists.txt", "ADD_SUBDIRECTORY(" .. folder .. ")\n", "", {plain = true})
-        end
-        os.rmdir("storage/ndb")
-        for _, line in ipairs({"INCLUDE(cmake/boost.cmake)\n", "MYSQL_CHECK_EDITLINE()\n"}) do
-            io.replace("CMakeLists.txt", line, "", {plain = true})
-        end
-        io.replace("libbinlogevents/CMakeLists.txt", "INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/libbinlogevents/include)", "MY_INCLUDE_SYSTEM_DIRECTORIES(LZ4)\nINCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/libbinlogevents/include)", {plain = true})
-        io.replace("cmake/install_macros.cmake", "  INSTALL_DEBUG_SYMBOLS(","  # INSTALL_DEBUG_SYMBOLS(", {plain = true})
-        import("package.tools.cmake").install(package, configs)
-        if package:config("shared") then
-            os.rm(package:installdir("lib/mysqlclient.lib"))
-            os.cp(package:installdir("lib/libmysql.dll"), package:installdir("bin"))
+    on_install("windows", "linux", "macosx", function (package)
+        if package:version():ge("8.0.0") then
+            io.gsub("CMakeLists.txt", "ADD_SUBDIRECTORY%(storage/ndb%)", "")
+            local configs = {"-DCOMPILATION_COMMENT=XMake",
+                             "-DDEFAULT_CHARSET=utf8",
+                             "-DDEFAULT_COLLATION=utf8_general_ci",
+                             "-DINSTALL_DOCDIR=share/doc/#{name}",
+                             "-DINSTALL_INCLUDEDIR=include/mysql",
+                             "-DINSTALL_INFODIR=share/info",
+                             "-DINSTALL_MANDIR=share/man",
+                             "-DINSTALL_MYSQLSHAREDIR=share/mysql",
+                             "-DWITH_EDITLINE=bundled",
+                             "-DWITH_UNIT_TESTS=OFF",
+                             "-DDISABLE_SHARED=" .. (package:config("shared") and "OFF" or "ON"),
+                             "-DWITH_LZ4='system'",
+                             "-DWITH_ZSTD='system'",
+                             "-DWITH_ZLIB='system'",
+                             "-DWINDOWS_RUNTIME_MD=" .. (is_plat("windows") and package:config("vs_runtime"):startswith("MD") and "ON" or "OFF"),
+                             "-DWITHOUT_SERVER=ON"}
+            io.replace("cmake/ssl.cmake","IF(NOT OPENSSL_APPLINK_C)","IF(FALSE AND NOT OPENSSL_APPLINK_C)", {plain = true})
+            for _, removelib in ipairs({"icu", "libevent", "re2", "rapidjson", "protobuf", "libedit"}) do
+                io.replace("CMakeLists.txt", "MYSQL_CHECK_" .. string.upper(removelib) .. "()\n", "", {plain = true})
+                io.replace("CMakeLists.txt", "INCLUDE(" .. removelib .. ")\n", "", {plain = true})
+                io.replace("CMakeLists.txt", "WARN_MISSING_SYSTEM_" .. string.upper(removelib) .. "(" .. string.upper(removelib) .. "_WARN_GIVEN)", "# WARN_MISSING_SYSTEM_" .. string.upper(removelib) .. "(" .. string.upper(removelib) .. "_WARN_GIVEN)", {plain = true})
+                io.replace("CMakeLists.txt", "SET(" .. string.upper(removelib) .. "_WARN_GIVEN)", "# SET(" .. string.upper(removelib) .. "_WARN_GIVEN)", {plain = true})
+            end
+            os.rmdir("extra")
+            for _, folder in ipairs({"client", "man", "mysql-test", "libbinlogstandalone"}) do
+                os.rmdir(folder)
+                io.replace("CMakeLists.txt", "ADD_SUBDIRECTORY(" .. folder .. ")\n", "", {plain = true})
+            end
+            os.rmdir("storage/ndb")
+            for _, line in ipairs({"INCLUDE(cmake/boost.cmake)\n", "MYSQL_CHECK_EDITLINE()\n"}) do
+                io.replace("CMakeLists.txt", line, "", {plain = true})
+            end
+            io.replace("libbinlogevents/CMakeLists.txt", "INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/libbinlogevents/include)", "MY_INCLUDE_SYSTEM_DIRECTORIES(LZ4)\nINCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/libbinlogevents/include)", {plain = true})
+            io.replace("cmake/install_macros.cmake", "  INSTALL_DEBUG_SYMBOLS(","  # INSTALL_DEBUG_SYMBOLS(", {plain = true})
+            import("package.tools.cmake").install(package, configs)
+            if package:is_plat("windows") then
+                if package:config("shared") then
+                    os.rm(package:installdir(path.join("lib", "mysqlclient.lib")))
+                    os.cp(package:installdir(path.join("lib", "libmysql.dll")), package:installdir("bin"))
+                else
+                    os.rm(package:installdir(path.join("lib", "libmysql.lib")))
+                    os.rm(package:installdir(path.join("lib", "libmysql.dll")))
+                end
+            else
+                if package:config("shared") then
+                    os.rm(package:installdir(path.join("lib", "*.a")))
+                    os.cp(package:installdir(path.join("lib", "*.so.*")), package:installdir("bin"))
+                else
+                    os.rm(package:installdir(path.join("lib", "*.so.*")))
+                end
+            end
         else
-            os.rm(package:installdir("lib/libmysql.lib"))
-            os.rm(package:installdir("lib/libmysql.dll"))
-        end
-    end)
-
-    on_install("macosx", "linux", function (package)
-        -- https://bugs.mysql.com/bug.php?id=87348
-        -- Fixes: "ADD_SUBDIRECTORY given source
-        -- 'storage/ndb' which is not an existing"
-        io.gsub("CMakeLists.txt", "ADD_SUBDIRECTORY%(storage/ndb%)", "")
-        local configs = {"-DCOMPILATION_COMMENT=XMake",
-                         "-DDEFAULT_CHARSET=utf8",
-                         "-DDEFAULT_COLLATION=utf8_general_ci",
-                         "-DINSTALL_DOCDIR=share/doc/#{name}",
-                         "-DINSTALL_INCLUDEDIR=include/mysql",
-                         "-DINSTALL_INFODIR=share/info",
-                         "-DINSTALL_MANDIR=share/man",
-                         "-DINSTALL_MYSQLSHAREDIR=share/mysql",
-                         "-DWITH_BOOST=../boost",
-                         "-DWITH_EDITLINE=" .. (is_plat("macosx") and "system" or "bundled"),
-                         "-DWITH_SSL=yes",
-                         "-DWITH_UNIT_TESTS=OFF",
-                         "-DWITHOUT_SERVER=ON"}
-        if package:is_plat("linux") then
-            local curses = package:dep("ncurses"):fetch()
-            if curses then
-                local includedirs = table.wrap(curses.sysincludedirs or curses.includedirs)
-                local libfiles = table.wrap(curses.libfiles)
-                table.insert(configs, "-DCURSES_INCLUDE_PATH=" .. table.concat(includedirs, ";"))
-                table.insert(configs, "-DCURSES_LIBRARY=" .. table.concat(libfiles, ";"))
+            io.gsub("CMakeLists.txt", "ADD_SUBDIRECTORY%(storage/ndb%)", "")
+            local configs = {"-DCOMPILATION_COMMENT=XMake",
+                             "-DDEFAULT_CHARSET=utf8",
+                             "-DDEFAULT_COLLATION=utf8_general_ci",
+                             "-DINSTALL_DOCDIR=share/doc/#{name}",
+                             "-DINSTALL_INCLUDEDIR=include/mysql",
+                             "-DINSTALL_INFODIR=share/info",
+                             "-DINSTALL_MANDIR=share/man",
+                             "-DINSTALL_MYSQLSHAREDIR=share/mysql",
+                             "-DWITH_BOOST=../boost",
+                             "-DWITH_EDITLINE=" .. (is_plat("macosx") and "system" or "bundled"),
+                             "-DWITH_SSL=yes",
+                             "-DWITH_UNIT_TESTS=OFF",
+                             "-DWITHOUT_SERVER=ON"}
+            if package:is_plat("linux") then
+                local curses = package:dep("ncurses"):fetch()
+                if curses then
+                    local includedirs = table.wrap(curses.sysincludedirs or curses.includedirs)
+                    local libfiles = table.wrap(curses.libfiles)
+                    table.insert(configs, "-DCURSES_INCLUDE_PATH=" .. table.concat(includedirs, ";"))
+                    table.insert(configs, "-DCURSES_LIBRARY=" .. table.concat(libfiles, ";"))
+                end
             end
+            import("package.tools.cmake").install(package, configs)
         end
-        import("package.tools.cmake").install(package, configs)
     end)
 
     on_test(function (package)
         assert(package:has_cfuncs("mysql_init", {includes = "mysql.h"}))
+        assert(package:check_cxxsnippets({test = [[
+            #include <mysql.h>
+            void test() {
+                MYSQL s;
+            }
+        ]]}))
     end)