From 667e187283162eba1d94dbc7b10836f4cb957fda Mon Sep 17 00:00:00 2001
From: kreuzerkrieg <kreuzerkrieg@gmail.com>
Date: Fri, 21 Feb 2020 20:55:23 +0200
Subject: [PATCH 1/7] ryu

---
 ports/ryu/CONTROL         |  4 ++++
 ports/ryu/portfile.cmake  | 22 ++++++++++++++++++++++
 ports/ryu/ryuConfig.cmake | 16 ++++++++++++++++
 scripts/ci.baseline.txt   |  4 +++-
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 ports/ryu/CONTROL
 create mode 100644 ports/ryu/portfile.cmake
 create mode 100644 ports/ryu/ryuConfig.cmake

diff --git a/ports/ryu/CONTROL b/ports/ryu/CONTROL
new file mode 100644
index 00000000000000..62e6e9f82e72f3
--- /dev/null
+++ b/ports/ryu/CONTROL
@@ -0,0 +1,4 @@
+Source: ryu
+Version: 2.0
+Homepage: https://github.com/ulfjack/ryu
+Description: Ryu generates the shortest decimal representation of a floating point number that maintains round-trip safety.
diff --git a/ports/ryu/portfile.cmake b/ports/ryu/portfile.cmake
new file mode 100644
index 00000000000000..5907f89317f90b
--- /dev/null
+++ b/ports/ryu/portfile.cmake
@@ -0,0 +1,22 @@
+vcpkg_fail_port_install(ON_TARGET "UWP")
+
+vcpkg_from_github(
+        OUT_SOURCE_PATH SOURCE_PATH
+        REPO ulfjack/ryu
+        REF v2.0
+        SHA512 88a0cca74a4889e8e579987abdc75a6ac87c1cdae557e5a15c29dbfd65733f9e591d6569e97a9374444918475099087f8056e696a97c9be24e38eb737e2304c2
+        HEAD_REF master
+)
+
+vcpkg_find_acquire_program(BAZEL)
+vcpkg_execute_build_process(
+        COMMAND bazel build //ryu
+        WORKING_DIRECTORY ${SOURCE_PATH}
+        LOGNAME build-${TARGET_TRIPLET}-rel
+)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE-Boost DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/ryu/ryu.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/)
+file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/ryuConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu.a DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
+file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
diff --git a/ports/ryu/ryuConfig.cmake b/ports/ryu/ryuConfig.cmake
new file mode 100644
index 00000000000000..3b161dc73a0fef
--- /dev/null
+++ b/ports/ryu/ryuConfig.cmake
@@ -0,0 +1,16 @@
+function(set_library_target NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR)
+    add_library(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED)
+    set_target_properties(${NAMESPACE}::${LIB_NAME} PROPERTIES
+                          IMPORTED_CONFIGURATIONS "RELEASE;DEBUG"
+                          IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}"
+                          IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}"
+                          INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}"
+                          )
+    set(${NAMESPACE}_${LIB_NAME}_FOUND 1)
+endfunction()
+
+get_filename_component(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(ROOT "${ROOT}" PATH)
+get_filename_component(ROOT "${ROOT}" PATH)
+
+set_library_target("RYU" "ryu" "${ROOT}/debug/lib/libryu.a" "${ROOT}/lib/libryu.a" "${ROOT}/include/")
\ No newline at end of file
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index b31beb8138a00b..f340bc5c3a0bdd 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1544,8 +1544,10 @@ rpclib:x86-windows=ignore
 rpclib:x64-windows-static=ignore
 rttr:arm-uwp=fail
 rttr:x64-uwp=fail
-rxspencer:x64-uwp=fail  
+rxspencer:x64-uwp=fail
 rxspencer:arm-uwp=fail
+ryu:arm-uwp=fail
+ryu:x64-uwp=fail
 scintilla:arm-uwp=fail
 scintilla:x64-linux=fail
 scintilla:x64-osx=fail

From 043f0b7106cfd1bebd46033cf120070d1dc1b2d8 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Tue, 25 Feb 2020 06:02:57 -0800
Subject: [PATCH 2/7] Add tool bazel in OSX

---
 scripts/cmake/vcpkg_find_acquire_program.cmake | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index 303737078faf03..104a0700fe7237 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -281,6 +281,12 @@ function(vcpkg_find_acquire_program VAR)
       set(ARCHIVE "bazel-${BAZEL_VERSION}-linux-x86_64")
       set(NOEXTRACT ON)
       set(HASH db4a583cf2996aeb29fd008261b12fe39a4a5faf0fbf96f7124e6d3ffeccf6d9655d391378e68dd0915bc91c9e146a51fd9661963743857ca25179547feceab1)
+    elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
+      set(_vfa_SUPPORTED ON)
+      set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-darwin-x86_64") 
+      set(ARCHIVE "bazel-${BAZEL_VERSION}-darwin-x86_64")
+      set(NOEXTRACT ON)
+      set(HASH 420a37081e6ee76441b0d92ff26d1715ce647737ce888877980d0665197b5a619d6afe6102f2e7edfb5062c9b40630a10b2539585e35479b780074ada978d23c)
     else()
       set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-windows-x86_64.zip") 
       set(ARCHIVE "bazel-${BAZEL_VERSION}-windows-x86_64.zip")

From f746855fbf4e3a17555fb585c1030143f8161fd5 Mon Sep 17 00:00:00 2001
From: kreuzerkrieg <kreuzerkrieg@gmail.com>
Date: Sun, 1 Mar 2020 08:18:59 +0200
Subject: [PATCH 3/7] wip

---
 ports/ryu/portfile.cmake | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/ports/ryu/portfile.cmake b/ports/ryu/portfile.cmake
index 5907f89317f90b..6056a474b40757 100644
--- a/ports/ryu/portfile.cmake
+++ b/ports/ryu/portfile.cmake
@@ -9,11 +9,30 @@ vcpkg_from_github(
 )
 
 vcpkg_find_acquire_program(BAZEL)
-vcpkg_execute_build_process(
-        COMMAND bazel build //ryu
-        WORKING_DIRECTORY ${SOURCE_PATH}
-        LOGNAME build-${TARGET_TRIPLET}-rel
-)
+get_filename_component(BAZEL_DIR "${BAZEL}" DIRECTORY)
+vcpkg_add_to_path(PREPEND ${BAZEL_DIR})
+set(ENV{BAZEL_BIN_PATH} "${BAZEL}")
+
+if (CMAKE_HOST_WIN32)
+    vcpkg_acquire_msys(MSYS_ROOT PACKAGES unzip patch diffutils git)
+    set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
+    set(ENV{BAZEL_SH} ${MSYS_ROOT}/usr/bin/bash.exe)
+
+    set(ENV{BAZEL_VS} $ENV{VSInstallDir})
+    set(ENV{BAZEL_VC} $ENV{VCInstallDir})
+
+    vcpkg_execute_build_process(
+            COMMAND ${BASH} --noprofile --norc -c "${BAZEL} build --verbose_failures ///ryu"
+            WORKING_DIRECTORY ${SOURCE_PATH}
+            LOGNAME build-${TARGET_TRIPLET}-rel
+    )
+else ()
+    vcpkg_execute_build_process(
+            COMMAND bazel build --verbose_failures //ryu
+            WORKING_DIRECTORY ${SOURCE_PATH}
+            LOGNAME build-${TARGET_TRIPLET}-rel
+    )
+endif ()
 
 file(INSTALL ${SOURCE_PATH}/LICENSE-Boost DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 file(INSTALL ${SOURCE_PATH}/ryu/ryu.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/)

From 6bc8a0b9aae365830e0fb2bf68e954886d7932dc Mon Sep 17 00:00:00 2001
From: kreuzerkrieg <kreuzerkrieg@gmail.com>
Date: Sun, 1 Mar 2020 17:27:03 +0200
Subject: [PATCH 4/7] wip

---
 ports/ryu/portfile.cmake  | 27 ++++++++++++---------------
 ports/ryu/ryuConfig.cmake |  6 +++++-
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/ports/ryu/portfile.cmake b/ports/ryu/portfile.cmake
index 6056a474b40757..17d1357da6ea4c 100644
--- a/ports/ryu/portfile.cmake
+++ b/ports/ryu/portfile.cmake
@@ -14,28 +14,25 @@ vcpkg_add_to_path(PREPEND ${BAZEL_DIR})
 set(ENV{BAZEL_BIN_PATH} "${BAZEL}")
 
 if (CMAKE_HOST_WIN32)
-    vcpkg_acquire_msys(MSYS_ROOT PACKAGES unzip patch diffutils git)
-    set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
-    set(ENV{BAZEL_SH} ${MSYS_ROOT}/usr/bin/bash.exe)
-
     set(ENV{BAZEL_VS} $ENV{VSInstallDir})
     set(ENV{BAZEL_VC} $ENV{VCInstallDir})
+endif ()
 
-    vcpkg_execute_build_process(
-            COMMAND ${BASH} --noprofile --norc -c "${BAZEL} build --verbose_failures ///ryu"
-            WORKING_DIRECTORY ${SOURCE_PATH}
-            LOGNAME build-${TARGET_TRIPLET}-rel
-    )
-else ()
-    vcpkg_execute_build_process(
-            COMMAND bazel build --verbose_failures //ryu
+vcpkg_execute_build_process(
+            COMMAND ${BAZEL} build --verbose_failures //ryu
             WORKING_DIRECTORY ${SOURCE_PATH}
             LOGNAME build-${TARGET_TRIPLET}-rel
     )
-endif ()
+
+if (CMAKE_HOST_WIN32)
+    file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
+    file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)    
+else()
+    file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu.a DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
+    file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
+endif()
 
 file(INSTALL ${SOURCE_PATH}/LICENSE-Boost DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 file(INSTALL ${SOURCE_PATH}/ryu/ryu.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/)
 file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/ryuConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu.a DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
-file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/)
+
diff --git a/ports/ryu/ryuConfig.cmake b/ports/ryu/ryuConfig.cmake
index 3b161dc73a0fef..ae5e08cb2d9fec 100644
--- a/ports/ryu/ryuConfig.cmake
+++ b/ports/ryu/ryuConfig.cmake
@@ -13,4 +13,8 @@ get_filename_component(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH)
 get_filename_component(ROOT "${ROOT}" PATH)
 get_filename_component(ROOT "${ROOT}" PATH)
 
-set_library_target("RYU" "ryu" "${ROOT}/debug/lib/libryu.a" "${ROOT}/lib/libryu.a" "${ROOT}/include/")
\ No newline at end of file
+if (CMAKE_HOST_WIN32)
+set_library_target("RYU" "ryu" "${ROOT}/debug/lib/ryu.lib" "${ROOT}/lib/ryu.lib" "${ROOT}/include/")
+else()
+set_library_target("RYU" "ryu" "${ROOT}/debug/lib/libryu.a" "${ROOT}/lib/libryu.a" "${ROOT}/include/")
+endif()
\ No newline at end of file

From f10925101da31891b7463b29f578d3d80669f761 Mon Sep 17 00:00:00 2001
From: kreuzerkrieg <kreuzerkrieg@gmail.com>
Date: Sun, 1 Mar 2020 17:39:18 +0200
Subject: [PATCH 5/7] wip

---
 scripts/ci.baseline.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index f340bc5c3a0bdd..090bf0f37287db 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1548,6 +1548,8 @@ rxspencer:x64-uwp=fail
 rxspencer:arm-uwp=fail
 ryu:arm-uwp=fail
 ryu:x64-uwp=fail
+ryu:x64-windows-static=fail
+ryu:x86-windows=fail
 scintilla:arm-uwp=fail
 scintilla:x64-linux=fail
 scintilla:x64-osx=fail

From c3f54c902e93cabb493b7e1237ef47d81c20c90e Mon Sep 17 00:00:00 2001
From: kreuzerkrieg <kreuzerkrieg@gmail.com>
Date: Sun, 1 Mar 2020 17:44:47 +0200
Subject: [PATCH 6/7] wip

---
 scripts/ci.baseline.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 090bf0f37287db..0256f67845acb0 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1550,6 +1550,7 @@ ryu:arm-uwp=fail
 ryu:x64-uwp=fail
 ryu:x64-windows-static=fail
 ryu:x86-windows=fail
+ryu::arm64-windows=fail
 scintilla:arm-uwp=fail
 scintilla:x64-linux=fail
 scintilla:x64-osx=fail

From d215a4473003a5495f2de6a4d6d8ea5dd5363bd2 Mon Sep 17 00:00:00 2001
From: kreuzerkrieg <kreuzerkrieg@gmail.com>
Date: Mon, 2 Mar 2020 23:53:06 +0200
Subject: [PATCH 7/7] wip

---
 scripts/ci.baseline.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 0256f67845acb0..0c1571efd5d9e8 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1544,7 +1544,7 @@ rpclib:x86-windows=ignore
 rpclib:x64-windows-static=ignore
 rttr:arm-uwp=fail
 rttr:x64-uwp=fail
-rxspencer:x64-uwp=fail
+rxspencer:x64-uwp=fail  
 rxspencer:arm-uwp=fail
 ryu:arm-uwp=fail
 ryu:x64-uwp=fail