[ryml] [c4core] Update RapidYaml (ryml) to newer version (#18230)

* remove old port version

* fix versions yet again

Co-authored-by: Michael Goulding <Michael.Goulding@microsoft.com>

10 files changed, 66 insertions, 36 deletions

diff --git a/ports/c4core/CONTROL b/ports/c4core/CONTROL
deleted file mode 100644
index 62eed51dd..000000000
--- a/ports/c4core/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: c4core

-Version: 2020-04-12

-Homepage: https://github.com/biojppm/c4core

-Description: Library of low-level C++ utilities 

-Supports: !(arm|arm64|osx)
\ No newline at end of file
diff --git a/ports/c4core/portfile.cmake b/ports/c4core/portfile.cmake
index 2b764af9d..3f5d7ad8f 100644
--- a/ports/c4core/portfile.cmake
+++ b/ports/c4core/portfile.cmake
@@ -9,18 +9,18 @@ vcpkg_fail_port_install(
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO biojppm/c4core

-    REF bc4de0291bb96ae509ee99a54f139563cf14638e

-    SHA512 2c0c4511cb43f34492b6d0d8dfef90623dfacb6ae43f6a6173fbf9efa63f7a018235ec9dcd9a211a3cd393c2114adb39a4276df94e2d23f9c354d644a36e51a0

+    REF 2413e420fca270c20dfb7a962979d44e0d4c0337

+    SHA512 2b5877941a5a4bdac625d7c54fc2f0e54eea3ab0d7487d314fde29abf441fcd70ed60598b9c8614c2993a7152a508b9ab9b7b234a777d138d5142e1a9df4c023

     HEAD_REF master

 )

 

-set(COMMIT_HASH a0f0c17bfc9a9a91cc72891539b513c129c6d122)

+set(CM_COMMIT_HASH 71c211187b8c52a13d5c59a7979f2ccf8429e350)

 

 # Get cmake scripts for c4core

 vcpkg_download_distfile(CMAKE_ARCHIVE

-    URLS "https://github.com/biojppm/cmake/archive/${COMMIT_HASH}.zip"

-    FILENAME "cmake-${COMMIT_HASH}.zip"

-    SHA512 4fbc711f3120501fa40733c3b66e34cd6a7e1b598b1378fbb59d1a87c88290a03d021f5176634089da41682fd918d7e27c6c146052dec54d7e956be15f12744f

+    URLS "https://github.com/biojppm/cmake/archive/${CM_COMMIT_HASH}.zip"

+    FILENAME "cmake-${CM_COMMIT_HASH}.zip"

+    SHA512 d15884d985a477df47ead9c5c486cfdeb1df8b6de4f308c36bd7a8c0e901fb876980a2a4f239abd8ecb1fb0baf75ad559ca0780b50c84070762f8cbfe55cb9d2

 )

 

 vcpkg_extract_source_archive_ex(

@@ -32,11 +32,11 @@ vcpkg_extract_source_archive_ex(
 file(REMOVE_RECURSE "${SOURCE_PATH}/cmake")

 file(RENAME ${SOURCE_PATH_CMAKE} "${SOURCE_PATH}/cmake")

 

-set(COMMIT_HASH 78e525c6e74df6d62d782864a52c0d279dcee24f)

+set(DB_COMMIT_HASH 78e525c6e74df6d62d782864a52c0d279dcee24f)

 

 vcpkg_download_distfile(DEBUGBREAK_ARCHIVE

-    URLS "https://github.com/biojppm/debugbreak/archive/${COMMIT_HASH}.zip"

-    FILENAME "debugbreak-${COMMIT_HASH}.zip"

+    URLS "https://github.com/biojppm/debugbreak/archive/${DB_COMMIT_HASH}.zip"

+    FILENAME "debugbreak-${DB_COMMIT_HASH}.zip"

     SHA512 25f3d45b09ce362f736fac0f6d6a6c7f2053fec4975b32b0565288893e4658fd0648a7988c3a5fe0e373e92705d7a3970eaa7cfc053f375ffb75e80772d0df64

 )

 

@@ -46,8 +46,25 @@ vcpkg_extract_source_archive_ex(
     WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/deps"

 )

 

-file(REMOVE_RECURSE "${SOURCE_PATH}/ext/debugbreak")

-file(RENAME ${SOURCE_PATH_DEBUGBREAK} "${SOURCE_PATH}/ext/debugbreak")

+file(REMOVE_RECURSE "${SOURCE_PATH}/src/c4/ext/debugbreak")

+file(RENAME ${SOURCE_PATH_DEBUGBREAK} "${SOURCE_PATH}/src/c4/ext/debugbreak")

+

+set(FF_COMMIT_HASH 3377facde283d36fa3bd29080f46fb0589b74bd3)

+

+vcpkg_download_distfile(FAST_FLOAT_ARCHIVE

+    URLS "https://github.com/biojppm/fast_float/archive/${FF_COMMIT_HASH}.zip"

+    FILENAME "fast_float-${FF_COMMIT_HASH}.zip"

+    SHA512 e2a7b869e422113b099f2ab95e42de8aed3b13f961fdc84583a908159936fdad00990ce664bc0c2491b7ca49e3323e17fb08f2208b2ceb577015c7d89cc4d785

+)

+

+vcpkg_extract_source_archive_ex(

+    OUT_SOURCE_PATH SOURCE_PATH_FAST_FLOAT

+    ARCHIVE ${FAST_FLOAT_ARCHIVE}

+    WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/deps"

+)

+

+file(REMOVE_RECURSE "${SOURCE_PATH}/src/c4/ext/fast_float")

+file(RENAME ${SOURCE_PATH_FAST_FLOAT} "${SOURCE_PATH}/src/c4/ext/fast_float")

 

 vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}

@@ -76,4 +93,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 

 file(INSTALL

     "${SOURCE_PATH}/LICENSE.txt"

-    DESTINATION "${CURRENT_PACKAGES_DIR}/share/c4core" RENAME copyright)

+    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

diff --git a/ports/c4core/vcpkg.json b/ports/c4core/vcpkg.json
new file mode 100644
index 000000000..90b36aa17
--- /dev/null
+++ b/ports/c4core/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "c4core",
+  "version-date": "2021-01-14",
+  "description": "Library of low-level C++ utilities",
+  "homepage": "https://github.com/biojppm/c4core",
+  "supports": "!(arm | arm64 | osx)"
+}
diff --git a/ports/ryml/CONTROL b/ports/ryml/CONTROL
deleted file mode 100644
index b6efa45ff..000000000
--- a/ports/ryml/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: ryml

-Version: 2020-04-12

-Homepage: https://github.com/biojppm/rapidyaml 

-Description: Rapid YAML library

-Build-Depends: c4core[core]

-Supports: !(arm|arm64|osx)
\ No newline at end of file
diff --git a/ports/ryml/cmake-fix.patch b/ports/ryml/cmake-fix.patch
index f2ee81703..e8a01c5a6 100644
--- a/ports/ryml/cmake-fix.patch
+++ b/ports/ryml/cmake-fix.patch
@@ -2,12 +2,6 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 3e4eb23..115b8aa 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1,4 +1,5 @@
- cmake_minimum_required(VERSION 3.9)
-+
- project(ryml)
- 
- include(./ext/c4core/cmake/c4Project.cmake)
 @@ -19,8 +20,7 @@ option(RYML_BUILD_API "Enable API generation (python, etc)" OFF)
  
  #-------------------------------------------------------
diff --git a/ports/ryml/portfile.cmake b/ports/ryml/portfile.cmake
index ed7953f2e..e5af447b1 100644
--- a/ports/ryml/portfile.cmake
+++ b/ports/ryml/portfile.cmake
@@ -9,19 +9,19 @@ vcpkg_fail_port_install(
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO biojppm/rapidyaml

-    REF ec23e87007ccc39c6132345c154b267de9381706

-    SHA512 7d349c0dd58da814dad02de88a5c54394ef8d77e7db3014fb5fb684d519e35604d45f5d16db5ed6ed8ccb52b1ed4a4dbc91e717a091b54b04dc18901800e12c1

+    REF db387345abf9cd6710e0c4a487a476bfd176fea3

+    SHA512 4dda145b561e3b8420f89ad01e42eb5056b51a8a28a47f3b8c91bb0a2a6420d1842016a23cbb17d9f119ebce0e2e404b4f4fb67d71bf0d3c87aa81f346c6cfe2

     HEAD_REF master

     PATCHES cmake-fix.patch

 )

 

-set(COMMIT_HASH a0f0c17bfc9a9a91cc72891539b513c129c6d122)

+set(COMMIT_HASH 71c211187b8c52a13d5c59a7979f2ccf8429e350)

 

 # Get cmake scripts for rapidyaml

 vcpkg_download_distfile(CMAKE_ARCHIVE

     URLS "https://github.com/biojppm/cmake/archive/${COMMIT_HASH}.zip"

     FILENAME "cmake-${COMMIT_HASH}.zip"

-    SHA512 4fbc711f3120501fa40733c3b66e34cd6a7e1b598b1378fbb59d1a87c88290a03d021f5176634089da41682fd918d7e27c6c146052dec54d7e956be15f12744f

+    SHA512 d15884d985a477df47ead9c5c486cfdeb1df8b6de4f308c36bd7a8c0e901fb876980a2a4f239abd8ecb1fb0baf75ad559ca0780b50c84070762f8cbfe55cb9d2

 )

 

 vcpkg_extract_source_archive_ex(

@@ -67,4 +67,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 

 file(INSTALL

     "${SOURCE_PATH}/LICENSE.txt"

-    DESTINATION "${CURRENT_PACKAGES_DIR}/share/ryml" RENAME copyright)

+    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

diff --git a/ports/ryml/vcpkg.json b/ports/ryml/vcpkg.json
new file mode 100644
index 000000000..dba2751fa
--- /dev/null
+++ b/ports/ryml/vcpkg.json
@@ -0,0 +1,13 @@
+{
+  "name": "ryml",
+  "version-date": "2021-05-27",
+  "description": "Rapid YAML library",
+  "homepage": "https://github.com/biojppm/rapidyaml",
+  "supports": "!(arm | arm64 | osx)",
+  "dependencies": [
+    {
+      "name": "c4core",
+      "default-features": false
+    }
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index cbba0301d..e8e5731c4 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1097,7 +1097,7 @@
       "port-version": 1
     },
     "c4core": {
-      "baseline": "2020-04-12",
+      "baseline": "2021-01-14",
       "port-version": 0
     },
     "caf": {
@@ -5585,7 +5585,7 @@
       "port-version": 0
     },
     "ryml": {
-      "baseline": "2020-04-12",
+      "baseline": "2021-05-27",
       "port-version": 0
     },
     "ryu": {
diff --git a/versions/c-/c4core.json b/versions/c-/c4core.json
index 71fe2c8c7..62e83925f 100644
--- a/versions/c-/c4core.json
+++ b/versions/c-/c4core.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "12b84a31469a78dd4b42dcf58a27d4600f6b2d48",
+      "version-date": "2021-01-14",
+      "port-version": 0
+    },
+    {
       "git-tree": "bd4565e8ab55bc5e098a1750fa5ff0bc4406ca9b",
       "version-string": "2020-04-12",
       "port-version": 0
diff --git a/versions/r-/ryml.json b/versions/r-/ryml.json
index 31e44d495..d02795d65 100644
--- a/versions/r-/ryml.json
+++ b/versions/r-/ryml.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "783be628f42faca427a8bc1394ccd20580ef56c8",
+      "version-date": "2021-05-27",
+      "port-version": 0
+    },
+    {
       "git-tree": "ff07e4add8c6becd2fc4d57c2707cc141af1e341",
       "version-string": "2020-04-12",
       "port-version": 0