[LIBMYSQL] OSX build creates invalid nuget package (#31134)

Fix: Change /lib/plugin/debug to /debug/lib/plugin Feat: Change ref to actual tagged version Fix: Remove duplicate "remove" file Fix: Add WITH_BUILD_ID to MAYBE_UNUSED_VARIABLES Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
microsoft · May 1, 2023 · c07e248 · c07e248
1 parent ccefd02
commit c07e248
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake
@@ -9,8 +9,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mysql/mysql-server
-    REF 1bfe02bdad6604d54913c62614bde57a055c8332 # 8.0.32
-    SHA512 9a556b783ee978c919ccc0c1c99ab4a84ecc9fe0b75e2e100ad616f3b7c7bd280c8da63eb9e9c98291256ebbd130aef8c6e5c404e93b7cc8b8fe754b055b650f
+    REF mysql-${VERSION}
+    SHA512 1233abe4fe055f62cc28c847e77bcfc37e03e77ee68b8606e5ad722e0b6d1ae30b95bbe623a88cecdfa0b5868b61eabaf4b99e78cb6fbb9cf3627c91d17feb0e
     HEAD_REF master
     PATCHES
         ignore-boost-version.patch
@@ -64,6 +64,7 @@ vcpkg_cmake_configure(
         BUNDLE_RUNTIME_LIBRARIES # only on windows
         LINK_STATIC_RUNTIME_LIBRARIES # only on windows
         WIX_DIR # only on windows
+        WITH_BUILD_ID # only on windows
 )
 
 vcpkg_cmake_install(ADD_BIN_TO_PATH)
@@ -122,11 +123,12 @@ file(RENAME "${CURRENT_PACKAGES_DIR}/include2" "${CURRENT_PACKAGES_DIR}/include/
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
     "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/debug/man"
     "${CURRENT_PACKAGES_DIR}/docs"
     "${CURRENT_PACKAGES_DIR}/debug/docs"
     "${CURRENT_PACKAGES_DIR}/lib/debug"
     "${CURRENT_PACKAGES_DIR}/lib/plugin"
-    "${CURRENT_PACKAGES_DIR}/lib/plugin/debug"
+    "${CURRENT_PACKAGES_DIR}/debug/lib/plugin"
 )
 
 # delete dynamic dll on static build
@@ -141,7 +143,6 @@ if (BUILD_STATIC_LIBS)
         "${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.lib"
         "${CURRENT_PACKAGES_DIR}/lib/libmysql.pdb"
         "${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.pdb"
-        "${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.pdb"
     )
 endif()
 

diff --git a/ports/libmysql/vcpkg.json b/ports/libmysql/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libmysql",
   "version": "8.0.32",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A MySQL client library for C development",
   "homepage": "https://github.com/mysql/mysql-server",
   "license": "GPL-2.0-or-later",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4266,7 +4266,7 @@
     },
     "libmysql": {
       "baseline": "8.0.32",
-      "port-version": 1
+      "port-version": 2
     },
     "libnice": {
       "baseline": "0.1.21",

diff --git a/versions/l-/libmysql.json b/versions/l-/libmysql.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8c4f68caa6f20ecfc912028a0f94ef956c154410",
+      "version": "8.0.32",
+      "port-version": 2
+    },
     {
       "git-tree": "1c2161c6415adf63a68c648172ff414eef484d4e",
       "version": "8.0.32",