[c4core, ryml] Add windows arm/arm64 support (#18316)

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

8 files changed, 28 insertions, 27 deletions

diff --git a/ports/c4core/portfile.cmake b/ports/c4core/portfile.cmake
index 3f5d7ad8f..59a4efec0 100644
--- a/ports/c4core/portfile.cmake
+++ b/ports/c4core/portfile.cmake
@@ -1,7 +1,6 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

 

 vcpkg_fail_port_install(

-    ON_ARCH "arm" "arm64"

     ON_TARGET "OSX"

 )

 

@@ -9,18 +8,18 @@ vcpkg_fail_port_install(
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO biojppm/c4core

-    REF 2413e420fca270c20dfb7a962979d44e0d4c0337

-    SHA512 2b5877941a5a4bdac625d7c54fc2f0e54eea3ab0d7487d314fde29abf441fcd70ed60598b9c8614c2993a7152a508b9ab9b7b234a777d138d5142e1a9df4c023

+    REF 75f879f21e75e7ee42cbbce5d6d7ce75fd315433

+    SHA512 d995e7529269a3968871c48bfe4b60dac52fb863f22250674d7fa3aa45b10c9f2851db12e97799c97f1c88123863034d0545c7e68a81441292c6530806a28cd3

     HEAD_REF master

 )

 

-set(CM_COMMIT_HASH 71c211187b8c52a13d5c59a7979f2ccf8429e350)

+set(CM_COMMIT_HASH c6de791cd37ea3dc6bcb967819cb74b4f054a8f2)

 

 # 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 d15884d985a477df47ead9c5c486cfdeb1df8b6de4f308c36bd7a8c0e901fb876980a2a4f239abd8ecb1fb0baf75ad559ca0780b50c84070762f8cbfe55cb9d2

+    SHA512 2d3f2d8d207f7d9c583b1f0bb35a1f4e0ed571ecdf7d5e745467f4f39cd82b860fc84d220c48a2d01e0ab805ce750133b73006b2f19920c95b1f85c7431459e3

 )

 

 vcpkg_extract_source_archive_ex(

@@ -49,12 +48,12 @@ vcpkg_extract_source_archive_ex(
 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)

+set(FF_COMMIT_HASH 8159e8bcf63c1b92f5a51fb550f966e56624b209)

 

 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

+    SHA512 ae71f74d3bae782f62f037c034bea4e7f45462188c8285971c2959c6b2884d3bb58826681c0989f4290f26fa33237c1b63ceed77ed94f9e97c1cd01b4aa21cd3

 )

 

 vcpkg_extract_source_archive_ex(

@@ -86,9 +85,6 @@ file(READ "${CURRENT_PACKAGES_DIR}/share/c4core/c4coreConfig.cmake" _contents)
 string(REGEX REPLACE [[[ \t\r\n]*"\${PACKAGE_PREFIX_DIR}[\./\\]*"]] [["${PACKAGE_PREFIX_DIR}/../.."]] _contents "${_contents}")

 file(WRITE "${CURRENT_PACKAGES_DIR}/share/c4core/c4coreConfig.cmake" "${_contents}")

 

-# Fix path to header

-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/c4/error.hpp" "<debugbreak/debugbreak.h>" "\"extern/debugbreak/debugbreak.h\"")

-

 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

 

 file(INSTALL

diff --git a/ports/c4core/vcpkg.json b/ports/c4core/vcpkg.json
index 90b36aa17..aa29f86f2 100644
--- a/ports/c4core/vcpkg.json
+++ b/ports/c4core/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "c4core",
-  "version-date": "2021-01-14",
+  "version-date": "2021-06-26",
   "description": "Library of low-level C++ utilities",
   "homepage": "https://github.com/biojppm/c4core",
-  "supports": "!(arm | arm64 | osx)"
+  "supports": "!osx"
 }
diff --git a/ports/ryml/portfile.cmake b/ports/ryml/portfile.cmake
index e5af447b1..639ac1bd9 100644
--- a/ports/ryml/portfile.cmake
+++ b/ports/ryml/portfile.cmake
@@ -1,7 +1,6 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

 

 vcpkg_fail_port_install(

-    ON_ARCH "arm" "arm64"

     ON_TARGET "OSX"

 )

 

@@ -9,19 +8,19 @@ vcpkg_fail_port_install(
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO biojppm/rapidyaml

-    REF db387345abf9cd6710e0c4a487a476bfd176fea3

-    SHA512 4dda145b561e3b8420f89ad01e42eb5056b51a8a28a47f3b8c91bb0a2a6420d1842016a23cbb17d9f119ebce0e2e404b4f4fb67d71bf0d3c87aa81f346c6cfe2

+    REF a1d5ed7c8ace0ab14340ba19dfed60f280eddac0

+    SHA512 27a7b7a3ee2f6bb63600907fbc2307b7da13a13b88605c0e7b628fe26878b120d0df9bc221d7d495c5212543db00f0b570f351e7e3e3bebb0c785a676a4d2469

     HEAD_REF master

     PATCHES cmake-fix.patch

 )

 

-set(COMMIT_HASH 71c211187b8c52a13d5c59a7979f2ccf8429e350)

+set(CM_COMMIT_HASH c6de791cd37ea3dc6bcb967819cb74b4f054a8f2)

 

 # 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 d15884d985a477df47ead9c5c486cfdeb1df8b6de4f308c36bd7a8c0e901fb876980a2a4f239abd8ecb1fb0baf75ad559ca0780b50c84070762f8cbfe55cb9d2

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

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

+    SHA512 2d3f2d8d207f7d9c583b1f0bb35a1f4e0ed571ecdf7d5e745467f4f39cd82b860fc84d220c48a2d01e0ab805ce750133b73006b2f19920c95b1f85c7431459e3

 )

 

 vcpkg_extract_source_archive_ex(

diff --git a/ports/ryml/vcpkg.json b/ports/ryml/vcpkg.json
index dba2751fa..5b992fb57 100644
--- a/ports/ryml/vcpkg.json
+++ b/ports/ryml/vcpkg.json
@@ -1,9 +1,9 @@
 {
   "name": "ryml",
-  "version-date": "2021-05-27",
+  "version-date": "2021-06-29",
   "description": "Rapid YAML library",
   "homepage": "https://github.com/biojppm/rapidyaml",
-  "supports": "!(arm | arm64 | osx)",
+  "supports": "!osx",
   "dependencies": [
     {
       "name": "c4core",
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index d5ece9826..8dbff9980 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1395,8 +1395,6 @@ rttr:arm-uwp=fail
 rttr:x64-uwp=fail
 rxspencer:x64-uwp=fail
 rxspencer:arm-uwp=fail
-ryml:arm-uwp=fail
-ryml:arm64-windows=fail
 ryml:x64-osx=fail
 ryu:arm-uwp=fail
 ryu:x64-uwp=fail
@@ -1709,8 +1707,6 @@ zkpp:x64-windows-static-md=fail
 zkpp:arm64-windows=fail
 zkpp:x64-uwp=fail
 zkpp:arm-uwp=fail
-c4core:arm-uwp=fail
-c4core:arm64-windows=fail
 c4core:x64-osx=fail
 
 # Official downloading server of CTP library is only guaranteed to be available during trading hours of China futures market
diff --git a/versions/baseline.json b/versions/baseline.json
index 12c91d01f..7f8453423 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1097,7 +1097,7 @@
       "port-version": 1
     },
     "c4core": {
-      "baseline": "2021-01-14",
+      "baseline": "2021-06-26",
       "port-version": 0
     },
     "caf": {
@@ -5613,7 +5613,7 @@
       "port-version": 0
     },
     "ryml": {
-      "baseline": "2021-05-27",
+      "baseline": "2021-06-29",
       "port-version": 0
     },
     "ryu": {
diff --git a/versions/c-/c4core.json b/versions/c-/c4core.json
index 62e83925f..6afe37b39 100644
--- a/versions/c-/c4core.json
+++ b/versions/c-/c4core.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "9b07f8a38bbc4d13f8411921e6734753e15f8d50",
+      "version-date": "2021-06-26",
+      "port-version": 0
+    },
+    {
       "git-tree": "12b84a31469a78dd4b42dcf58a27d4600f6b2d48",
       "version-date": "2021-01-14",
       "port-version": 0
diff --git a/versions/r-/ryml.json b/versions/r-/ryml.json
index d02795d65..d24417ed8 100644
--- a/versions/r-/ryml.json
+++ b/versions/r-/ryml.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "f0ae9d06c774834182bdb333b0a5c96aa8c36b52",
+      "version-date": "2021-06-29",
+      "port-version": 0
+    },
+    {
       "git-tree": "783be628f42faca427a8bc1394ccd20580ef56c8",
       "version-date": "2021-05-27",
       "port-version": 0