From f8c00adbf7f2c8e536df9244ebd371b95a950fc3 Mon Sep 17 00:00:00 2001 From: Brennan Conroy Date: Mon, 25 Nov 2019 09:55:05 -0800 Subject: [PATCH 1/8] Add microsoft-signalr package --- ports/microsoft-signalr/CONTROL | 8 ++++++ ports/microsoft-signalr/portfile.cmake | 35 ++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 ports/microsoft-signalr/CONTROL create mode 100644 ports/microsoft-signalr/portfile.cmake diff --git a/ports/microsoft-signalr/CONTROL b/ports/microsoft-signalr/CONTROL new file mode 100644 index 00000000000000..2d985f6100b97d --- /dev/null +++ b/ports/microsoft-signalr/CONTROL @@ -0,0 +1,8 @@ +Source: microsoft-signalr +Version: 0.1.0-alpha1 +Description: C++ Client for ASP.NET Core SignalR. +Default-Features: cpprestsdk + +Feature: cpprestsdk +Description: Add default Http and WebSocket implementations using CppRestSDK +Build-Depends: cpprestsdk, openssl \ No newline at end of file diff --git a/ports/microsoft-signalr/portfile.cmake b/ports/microsoft-signalr/portfile.cmake new file mode 100644 index 00000000000000..54c1cbb04b8bd6 --- /dev/null +++ b/ports/microsoft-signalr/portfile.cmake @@ -0,0 +1,35 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO aspnet/SignalR-Client-Cpp + REF v0.1.0-alpha1 + SHA512 1677b4c4eefc77f35e60d19153a386992001edfdaa8f629fe7a3d1aed025ed8bdd04e7a5a4560716e8d57c47e44e3e933835d1ebf67aad6670a892c725c63686 + HEAD_REF master +) + +if("cpprestsdk" IN_LIST FEATURES) + set(USE_CPPRESTSDK true) +else() + set(USE_CPPRESTSDK false) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF + -DUSE_CPPRESTSDK=${USE_CPPRESTSDK} + -DWALL=OFF +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/microsoft-signalr) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/microsoft-signalr/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/microsoft-signalr/copyright) + +file(COPY ${SOURCE_PATH}/third-party-notices.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/microsoft-signalr) + +vcpkg_copy_pdbs() \ No newline at end of file From 435cf57d084f3e1c92d52de7505bffccae681016 Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Wed, 15 Apr 2020 23:47:36 -0700 Subject: [PATCH 2/8] fb --- ports/microsoft-signalr/CONTROL | 1 + ports/microsoft-signalr/portfile.cmake | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ports/microsoft-signalr/CONTROL b/ports/microsoft-signalr/CONTROL index 2d985f6100b97d..7a58323753205a 100644 --- a/ports/microsoft-signalr/CONTROL +++ b/ports/microsoft-signalr/CONTROL @@ -2,6 +2,7 @@ Source: microsoft-signalr Version: 0.1.0-alpha1 Description: C++ Client for ASP.NET Core SignalR. Default-Features: cpprestsdk +Homepage: https://github.com/aspnet/SignalR-Client-Cpp Feature: cpprestsdk Description: Add default Http and WebSocket implementations using CppRestSDK diff --git a/ports/microsoft-signalr/portfile.cmake b/ports/microsoft-signalr/portfile.cmake index 54c1cbb04b8bd6..dd3b52ad76172b 100644 --- a/ports/microsoft-signalr/portfile.cmake +++ b/ports/microsoft-signalr/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aspnet/SignalR-Client-Cpp @@ -27,9 +25,7 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/microsoft-signalr) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/microsoft-signalr/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/microsoft-signalr/copyright) - +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(COPY ${SOURCE_PATH}/third-party-notices.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/microsoft-signalr) vcpkg_copy_pdbs() \ No newline at end of file From 5f33bfe2b256e5baddfae326af7e9efc4673b10e Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Fri, 24 Apr 2020 12:04:21 -0700 Subject: [PATCH 3/8] websockets --- ports/microsoft-signalr/CONTROL | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/microsoft-signalr/CONTROL b/ports/microsoft-signalr/CONTROL index 7a58323753205a..52561d76c6bc78 100644 --- a/ports/microsoft-signalr/CONTROL +++ b/ports/microsoft-signalr/CONTROL @@ -6,4 +6,5 @@ Homepage: https://github.com/aspnet/SignalR-Client-Cpp Feature: cpprestsdk Description: Add default Http and WebSocket implementations using CppRestSDK -Build-Depends: cpprestsdk, openssl \ No newline at end of file +Build-Depends: cpprestsdk[default-features,websockets] +Supports: !uwp \ No newline at end of file From 0fec802c4a714662cdbf42632b31bb7ed9bf9637 Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Sun, 26 Apr 2020 01:18:55 -0700 Subject: [PATCH 4/8] remove supports --- ports/microsoft-signalr/CONTROL | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/microsoft-signalr/CONTROL b/ports/microsoft-signalr/CONTROL index 52561d76c6bc78..6555fa2e6ecc0b 100644 --- a/ports/microsoft-signalr/CONTROL +++ b/ports/microsoft-signalr/CONTROL @@ -6,5 +6,4 @@ Homepage: https://github.com/aspnet/SignalR-Client-Cpp Feature: cpprestsdk Description: Add default Http and WebSocket implementations using CppRestSDK -Build-Depends: cpprestsdk[default-features,websockets] -Supports: !uwp \ No newline at end of file +Build-Depends: cpprestsdk[default-features,websockets] \ No newline at end of file From 601c6e2e098c3773e9a465ebbee904e64b68fdd8 Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Sun, 26 Apr 2020 10:13:49 -0700 Subject: [PATCH 5/8] depends --- ports/microsoft-signalr/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/microsoft-signalr/CONTROL b/ports/microsoft-signalr/CONTROL index 6555fa2e6ecc0b..70b7070a2f3749 100644 --- a/ports/microsoft-signalr/CONTROL +++ b/ports/microsoft-signalr/CONTROL @@ -6,4 +6,4 @@ Homepage: https://github.com/aspnet/SignalR-Client-Cpp Feature: cpprestsdk Description: Add default Http and WebSocket implementations using CppRestSDK -Build-Depends: cpprestsdk[default-features,websockets] \ No newline at end of file +Build-Depends: cpprestsdk[default-features,websockets] (!uwp) \ No newline at end of file From 6b9c7206eb03e4653f61231153e2dcbd0c8d5748 Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Sun, 26 Apr 2020 10:24:39 -0700 Subject: [PATCH 6/8] uwp --- ports/microsoft-signalr/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/microsoft-signalr/portfile.cmake b/ports/microsoft-signalr/portfile.cmake index dd3b52ad76172b..d1ddae267dcbdd 100644 --- a/ports/microsoft-signalr/portfile.cmake +++ b/ports/microsoft-signalr/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( HEAD_REF master ) -if("cpprestsdk" IN_LIST FEATURES) +if("cpprestsdk" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_UWP) set(USE_CPPRESTSDK true) else() set(USE_CPPRESTSDK false) From 5e06879ca6c378ae6c0872a8e6d3546d54eb5de4 Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Mon, 4 May 2020 17:49:22 -0700 Subject: [PATCH 7/8] update --- ports/microsoft-signalr/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/microsoft-signalr/portfile.cmake b/ports/microsoft-signalr/portfile.cmake index d1ddae267dcbdd..fbf646a1d00220 100644 --- a/ports/microsoft-signalr/portfile.cmake +++ b/ports/microsoft-signalr/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aspnet/SignalR-Client-Cpp REF v0.1.0-alpha1 - SHA512 1677b4c4eefc77f35e60d19153a386992001edfdaa8f629fe7a3d1aed025ed8bdd04e7a5a4560716e8d57c47e44e3e933835d1ebf67aad6670a892c725c63686 + SHA512 d37eea194b0352a08dd89ac7622bdd6224312ad48a31d8ab36627a8aaff5e795e3513ad010eed516703f6da842a95119c1a4a290b145a43e91ff80a37fff8676 HEAD_REF master ) From db42efeeede56368cbcdc08ad215413b61e55abe Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Tue, 12 May 2020 16:43:15 -0700 Subject: [PATCH 8/8] fb --- ports/microsoft-signalr/CONTROL | 8 ++++++-- ports/microsoft-signalr/portfile.cmake | 14 +++++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ports/microsoft-signalr/CONTROL b/ports/microsoft-signalr/CONTROL index 70b7070a2f3749..73f10bb2ba973e 100644 --- a/ports/microsoft-signalr/CONTROL +++ b/ports/microsoft-signalr/CONTROL @@ -1,9 +1,13 @@ Source: microsoft-signalr Version: 0.1.0-alpha1 Description: C++ Client for ASP.NET Core SignalR. -Default-Features: cpprestsdk +Default-Features: default-features Homepage: https://github.com/aspnet/SignalR-Client-Cpp +Feature: default-features +Build-Depends: microsoft-signalr[cpprestsdk] (!uwp) +Description: Features installed by default + Feature: cpprestsdk Description: Add default Http and WebSocket implementations using CppRestSDK -Build-Depends: cpprestsdk[default-features,websockets] (!uwp) \ No newline at end of file +Build-Depends: cpprestsdk[default-features,websockets] \ No newline at end of file diff --git a/ports/microsoft-signalr/portfile.cmake b/ports/microsoft-signalr/portfile.cmake index fbf646a1d00220..e566f594e49a3b 100644 --- a/ports/microsoft-signalr/portfile.cmake +++ b/ports/microsoft-signalr/portfile.cmake @@ -6,10 +6,14 @@ vcpkg_from_github( HEAD_REF master ) -if("cpprestsdk" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_UWP) - set(USE_CPPRESTSDK true) -else() - set(USE_CPPRESTSDK false) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cpprestsdk USE_CPPRESTSDK +) + +if("cpprestsdk" IN_LIST FEATURES AND VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "microsoft-signalr[cpprestsdk] is not supported on UWP, use microsoft-signalr[core] instead") endif() vcpkg_configure_cmake( @@ -17,7 +21,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF - -DUSE_CPPRESTSDK=${USE_CPPRESTSDK} + ${FEATURE_OPTIONS} -DWALL=OFF )