[c4core, ryml] Update to latest version and add features (#19282)

microsoft · Aug 2, 2021 · 56134b5 · 56134b5
1 parent 667f041
commit 56134b5
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 13 deletions.
diff --git a/ports/c4core/portfile.cmake b/ports/c4core/portfile.cmake
@@ -8,18 +8,18 @@ vcpkg_fail_port_install(
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO biojppm/c4core
-    REF 75f879f21e75e7ee42cbbce5d6d7ce75fd315433
-    SHA512 d995e7529269a3968871c48bfe4b60dac52fb863f22250674d7fa3aa45b10c9f2851db12e97799c97f1c88123863034d0545c7e68a81441292c6530806a28cd3
+    REF 636f507c33f0c79dce491aec066455ff384d49dc
+    SHA512 3282876be5883b047e8d25ee392f62d2e9ae79af8fdd65c11b1e36d2fdb0648230fe6c7fb57472a4cbced166979351f12494215aa664977a113b74c26bb6f19b
     HEAD_REF master
 )
 
-set(CM_COMMIT_HASH c6de791cd37ea3dc6bcb967819cb74b4f054a8f2)
+set(CM_COMMIT_HASH fe41e86552046c3df9ba73a40bf3d755df028c1e)
 
 # Get cmake scripts for c4core
 vcpkg_download_distfile(CMAKE_ARCHIVE
     URLS "https://github.com/biojppm/cmake/archive/${CM_COMMIT_HASH}.zip"
     FILENAME "cmake-${CM_COMMIT_HASH}.zip"
-    SHA512 2d3f2d8d207f7d9c583b1f0bb35a1f4e0ed571ecdf7d5e745467f4f39cd82b860fc84d220c48a2d01e0ab805ce750133b73006b2f19920c95b1f85c7431459e3
+    SHA512 7292f9856d9c41581f2731e73fdf08880e0f4353b757da38a13ec89b62c5c8cb52b9efc1a9ff77336efa0b6809727c17649e607d8ecacc965a9b2a7a49925237
 )
 
 vcpkg_extract_source_archive_ex(

diff --git a/ports/c4core/vcpkg.json b/ports/c4core/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "c4core",
-  "version-date": "2021-06-26",
+  "version-date": "2021-07-18",
   "description": "Library of low-level C++ utilities",
   "homepage": "https://github.com/biojppm/c4core",
   "supports": "!osx"

diff --git a/ports/ryml/portfile.cmake b/ports/ryml/portfile.cmake
@@ -8,19 +8,19 @@ vcpkg_fail_port_install(
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO biojppm/rapidyaml
-    REF a1d5ed7c8ace0ab14340ba19dfed60f280eddac0
-    SHA512 27a7b7a3ee2f6bb63600907fbc2307b7da13a13b88605c0e7b628fe26878b120d0df9bc221d7d495c5212543db00f0b570f351e7e3e3bebb0c785a676a4d2469
+    REF affafd5db67208eb85413327595507314c068525
+    SHA512 31d827ead680828b3c0ad879290b17d4729d412e30a20459aea4b92a8f4f3b8397f82b09c27d918ab4b955289560b17697d5f15eaa4d24661ff46f5dbbc50fa8
     HEAD_REF master
     PATCHES cmake-fix.patch
 )
 
-set(CM_COMMIT_HASH c6de791cd37ea3dc6bcb967819cb74b4f054a8f2)
+set(CM_COMMIT_HASH fe41e86552046c3df9ba73a40bf3d755df028c1e)
 
 # Get cmake scripts for rapidyaml
 vcpkg_download_distfile(CMAKE_ARCHIVE
     URLS "https://github.com/biojppm/cmake/archive/${CM_COMMIT_HASH}.zip"
     FILENAME "cmake-${CM_COMMIT_HASH}.zip"
-    SHA512 2d3f2d8d207f7d9c583b1f0bb35a1f4e0ed571ecdf7d5e745467f4f39cd82b860fc84d220c48a2d01e0ab805ce750133b73006b2f19920c95b1f85c7431459e3
+    SHA512 7292f9856d9c41581f2731e73fdf08880e0f4353b757da38a13ec89b62c5c8cb52b9efc1a9ff77336efa0b6809727c17649e607d8ecacc965a9b2a7a49925237
 )
 
 vcpkg_extract_source_archive_ex(
@@ -32,9 +32,17 @@ vcpkg_extract_source_archive_ex(
 file(REMOVE_RECURSE "${SOURCE_PATH}/ext/c4core/cmake")
 file(RENAME ${SOURCE_PATH_CMAKE} "${SOURCE_PATH}/ext/c4core/cmake")
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        def-callbacks RYML_DEFAULT_CALLBACKS
+        dbg           RYML_DBG
+)
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    OPTIONS
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_install_cmake()

diff --git a/ports/ryml/vcpkg.json b/ports/ryml/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "ryml",
-  "version-date": "2021-06-29",
+  "version-date": "2021-07-24",
   "description": "Rapid YAML library",
   "homepage": "https://github.com/biojppm/rapidyaml",
   "supports": "!osx",
@@ -9,5 +9,16 @@
       "name": "c4core",
       "default-features": false
     }
-  ]
+  ],
+  "default-features": [
+    "def-callbacks"
+  ],
+  "features": {
+    "dbg": {
+      "description": "Enable (very verbose) ryml debug prints."
+    },
+    "def-callbacks": {
+      "description": "Enable ryml's default implementation of callbacks: allocate(), free(), error()"
+    }
+  }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -1105,7 +1105,7 @@
       "port-version": 1
     },
     "c4core": {
-      "baseline": "2021-06-26",
+      "baseline": "2021-07-18",
       "port-version": 0
     },
     "caf": {
@@ -5653,7 +5653,7 @@
       "port-version": 0
     },
     "ryml": {
-      "baseline": "2021-06-29",
+      "baseline": "2021-07-24",
       "port-version": 0
     },
     "ryu": {

diff --git a/versions/c-/c4core.json b/versions/c-/c4core.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "eae79eece3a7383d94cc686275624cb49ee6a68e",
+      "version-date": "2021-07-18",
+      "port-version": 0
+    },
     {
       "git-tree": "9b07f8a38bbc4d13f8411921e6734753e15f8d50",
       "version-date": "2021-06-26",

diff --git a/versions/r-/ryml.json b/versions/r-/ryml.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d97344132c58ae2aafb8c0ed1f23acde843404b5",
+      "version-date": "2021-07-24",
+      "port-version": 0
+    },
     {
       "git-tree": "f0ae9d06c774834182bdb333b0a5c96aa8c36b52",
       "version-date": "2021-06-29",