aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgeorg-emg <71000124+georg-emg@users.noreply.github.com>2021-02-18 21:58:41 +0100
committerGitHub <noreply@github.com>2021-02-18 12:58:41 -0800
commitd112d7cc067ee4b5459023450d26579577e7c2f3 (patch)
treeb09af959e17ee8a2a20e02c5a0f9c8797403427b
parent787fe1418ea968913cc6daf11855ffd8b0b5e9d4 (diff)
downloadvcpkg-d112d7cc067ee4b5459023450d26579577e7c2f3.tar.gz
vcpkg-d112d7cc067ee4b5459023450d26579577e7c2f3.zip
[ryu] added ryu_printf (#16238)
* activated libraries generic_128 and ryu_printf * updated version for ryu * Fixed port version * updated port version info for ryu * removed generic_128 again, because it doesn't build under Windows * updated version info * - replaced CONTROL file with manifest file - corrected version string and port version * updated versions with "vcpkg x-add-version ryu" * corrected formatting of ryu manifest file * ran vcpkg --x-add-version again
-rw-r--r--ports/ryu/CONTROL5
-rw-r--r--ports/ryu/portfile.cmake8
-rw-r--r--ports/ryu/ryuConfig.cmake2
-rw-r--r--ports/ryu/vcpkg.json8
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/r-/ryu.json5
6 files changed, 23 insertions, 9 deletions
diff --git a/ports/ryu/CONTROL b/ports/ryu/CONTROL
deleted file mode 100644
index 916d6e839..000000000
--- a/ports/ryu/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: ryu
-Version: 2.0-2
-Homepage: https://github.com/ulfjack/ryu
-Description: Ryu generates the shortest decimal representation of a floating point number that maintains round-trip safety.
-Supports: !(uwp|arm|x86)
diff --git a/ports/ryu/portfile.cmake b/ports/ryu/portfile.cmake
index f26b01b98..332de8d31 100644
--- a/ports/ryu/portfile.cmake
+++ b/ports/ryu/portfile.cmake
@@ -19,7 +19,7 @@ if (CMAKE_HOST_WIN32)
endif ()
vcpkg_execute_build_process(
- COMMAND ${BAZEL} build --verbose_failures --strategy=CppCompile=standalone //ryu
+ COMMAND ${BAZEL} build --verbose_failures --strategy=CppCompile=standalone //ryu //ryu:ryu_printf
WORKING_DIRECTORY ${SOURCE_PATH}
LOGNAME build-${TARGET_TRIPLET}-rel
)
@@ -27,12 +27,16 @@ vcpkg_execute_build_process(
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/)
+ file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu_printf.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
+ file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/ryu_printf.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/)
+ file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu_printf.a DESTINATION ${CURRENT_PACKAGES_DIR}/lib/)
+ file(INSTALL ${SOURCE_PATH}/bazel-bin/ryu/libryu_printf.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/ryu/)
+file(INSTALL ${SOURCE_PATH}/ryu/ryu2.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/ryu/)
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/ryuConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-
diff --git a/ports/ryu/ryuConfig.cmake b/ports/ryu/ryuConfig.cmake
index ae5e08cb2..43421ff9e 100644
--- a/ports/ryu/ryuConfig.cmake
+++ b/ports/ryu/ryuConfig.cmake
@@ -15,6 +15,8 @@ get_filename_component(ROOT "${ROOT}" PATH)
if (CMAKE_HOST_WIN32)
set_library_target("RYU" "ryu" "${ROOT}/debug/lib/ryu.lib" "${ROOT}/lib/ryu.lib" "${ROOT}/include/")
+set_library_target("RYU" "ryu_printf" "${ROOT}/debug/lib/ryu_printf.lib" "${ROOT}/lib/ryu_printf.lib" "${ROOT}/include/")
else()
set_library_target("RYU" "ryu" "${ROOT}/debug/lib/libryu.a" "${ROOT}/lib/libryu.a" "${ROOT}/include/")
+set_library_target("RYU" "ryu_printf" "${ROOT}/debug/lib/libryu_printf.a" "${ROOT}/lib/libryu_printf.a" "${ROOT}/include/")
endif() \ No newline at end of file
diff --git a/ports/ryu/vcpkg.json b/ports/ryu/vcpkg.json
new file mode 100644
index 000000000..e7d7619aa
--- /dev/null
+++ b/ports/ryu/vcpkg.json
@@ -0,0 +1,8 @@
+{
+ "name": "ryu",
+ "version-string": "2.0",
+ "port-version": 3,
+ "description": "Ryu generates the shortest decimal representation of a floating point number that maintains round-trip safety.",
+ "homepage": "https://github.com/ulfjack/ryu",
+ "supports": "!(uwp | arm | x86)"
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 27cafe558..be074cd8f 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5217,8 +5217,8 @@
"port-version": 0
},
"ryu": {
- "baseline": "2.0-2",
- "port-version": 0
+ "baseline": "2.0",
+ "port-version": 3
},
"safeint": {
"baseline": "3.24",
diff --git a/versions/r-/ryu.json b/versions/r-/ryu.json
index afd24d472..0576a5182 100644
--- a/versions/r-/ryu.json
+++ b/versions/r-/ryu.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "faaef55aea17b88d0328989a64d948d8a09d7559",
+ "version-string": "2.0",
+ "port-version": 3
+ },
+ {
"git-tree": "ab26061ca3f9435c12bc97f8f20308042eebdb20",
"version-string": "2.0-2",
"port-version": 0