[poco] update to 1.13.0 (microsoft#35918)

* [poco] update to 1.13.0 * Disable sql-parser * Fix missing sql-parser/src/SQLParser.h * Copy include files of sql-parser in portfile.cmake
PurpleFlowerGarden · Jan 24, 2024 · c0bc859 · c0bc859
1 parent 5ea2b05
commit c0bc859
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake
@@ -1,9 +1,9 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO pocoproject/poco
-    REF "poco-1.12.5p1-release"
-    SHA512 9cf885f67d87b86d3d5337aa2a3247a5828e071bba04304dfb79f7e00d94cd245e5def5191400a5753eebe0611b7f120c470cb0e0ab9b120f1d8b5f202d7d3d7
-    HEAD_REF master
+    REF "poco-1.13.0-release"
+    SHA512 5e557b4c93dd5eacd7c43af9c89646c49e65217db9d9e0fc016b3f643aca993d70e58a85ec7e63743221eb2b29d36ce9f8a3bfbf4db489d8ff24e20127f450ea
+    HEAD_REF devel
     PATCHES
         # Fix embedded copy of pcre in static linking mode
         0001-static-pcre.patch
@@ -86,7 +86,7 @@ vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
 # Move apps to the tools folder
-vcpkg_copy_tools(TOOL_NAMES cpspc f2cpsp PocoDoc tec arc AUTO_CLEAN)
+vcpkg_copy_tools(TOOL_NAMES cpspc f2cpsp PocoDoc tec poco-arc AUTO_CLEAN)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
@@ -110,6 +110,19 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/include/Poco/SQL/SQLite")
     file(COPY "${SOURCE_PATH}/Data/SQLite/include" DESTINATION "${CURRENT_PACKAGES_DIR}")
 endif()
 
+# Copy include files of sql-parser
+file(GLOB HEADERS "${SOURCE_PATH}/Data/src/sql-parser/src/*.h")
+file(COPY ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/Poco/Data/sql-parser/src")
+
+file(GLOB HEADERS "${SOURCE_PATH}/Data/src/sql-parser/src/parser/*.h")
+file(COPY ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/Poco/Data/sql-parser/src/parser")
+
+file(GLOB HEADERS "${SOURCE_PATH}/Data/src/sql-parser/src/sql/*.h")
+file(COPY ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/Poco/Data/sql-parser/src/sql")
+
+file(GLOB HEADERS "${SOURCE_PATH}/Data/src/sql-parser/src/util/*.h")
+file(COPY ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/Poco/Data/sql-parser/src/util")
+
 if(VCPKG_TARGET_IS_WINDOWS)
   vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
 else()

diff --git a/ports/poco/vcpkg.json b/ports/poco/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "poco",
-  "version": "1.12.5.1",
+  "version": "1.13.0",
   "description": "Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.",
   "homepage": "https://github.com/pocoproject/poco",
   "license": "BSL-1.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6741,7 +6741,7 @@
       "port-version": 0
     },
     "poco": {
-      "baseline": "1.12.5.1",
+      "baseline": "1.13.0",
       "port-version": 0
     },
     "podofo": {

diff --git a/versions/p-/poco.json b/versions/p-/poco.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "659229d449f9bbbdf29ab52068c22fcfc5990bc7",
+      "version": "1.13.0",
+      "port-version": 0
+    },
     {
       "git-tree": "d77c1da4e506a178da0c3d87acde20b8cb0dd550",
       "version": "1.12.5.1",