From 8780989f37349802412f28b04134d65e639784c4 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Wed, 26 Oct 2016 19:35:24 -0700 Subject: [rxcpp] Mark as header-only library --- ports/rxcpp/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ports/rxcpp') diff --git a/ports/rxcpp/portfile.cmake b/ports/rxcpp/portfile.cmake index 15d0dc15c..65062c360 100644 --- a/ports/rxcpp/portfile.cmake +++ b/ports/rxcpp/portfile.cmake @@ -1,4 +1,4 @@ -include(${CMAKE_TRIPLET_FILE}) +#header-only library include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/RxCpp-2.3.0) vcpkg_download_distfile(ARCHIVE_FILE -- cgit v1.2.3 From 1794eec16dd4f329a2d751b7be0f1e33d2a02124 Mon Sep 17 00:00:00 2001 From: flysha Date: Sat, 26 Nov 2016 09:58:03 +0800 Subject: [rxcpp] Upgrade to latest 3.0.0 --- ports/rxcpp/CONTROL | 2 +- ports/rxcpp/portfile.cmake | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'ports/rxcpp') diff --git a/ports/rxcpp/CONTROL b/ports/rxcpp/CONTROL index b4440da35..02b873816 100644 --- a/ports/rxcpp/CONTROL +++ b/ports/rxcpp/CONTROL @@ -1,3 +1,3 @@ Source: rxcpp -Version: 2.3.0 +Version: 3.0.0 Description: Reactive Extensions for C++ \ No newline at end of file diff --git a/ports/rxcpp/portfile.cmake b/ports/rxcpp/portfile.cmake index 65062c360..440c7ccf3 100644 --- a/ports/rxcpp/portfile.cmake +++ b/ports/rxcpp/portfile.cmake @@ -1,12 +1,12 @@ #header-only library include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/RxCpp-2.3.0) -vcpkg_download_distfile(ARCHIVE_FILE - URLS "https://github.com/Reactive-Extensions/RxCpp/archive/v2.3.0.tar.gz" - FILENAME "RxCpp-2.3.0.tar.gz" - SHA512 180cf36777b0c14e989b4b79f01fcda7ecabfe4b3cee3ad7343138497578af02745de63f74941ec228eac3fccca4a7dfdfdd1c4d16a89438022dca6f9968953f +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/RxCpp-3.0.0) +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/Reactive-Extensions/RxCpp/archive/v3.0.0.tar.gz" + FILENAME "v3.0.0.tar.gz" + SHA512 6d810b6163d0920d531f32a13729e290c81b47d5fc9c3e3d3d8a25d27a6f0671fec097d091bef7383b7e556e9e5471db087bb955e7f4fd9a5fdc9e7b06050844 ) -vcpkg_extract_source_archive(${ARCHIVE_FILE}) +vcpkg_extract_source_archive(${ARCHIVE}) file(INSTALL ${SOURCE_PATH}/Rx/v2/src/rxcpp -- cgit v1.2.3 From 420795eed17f103db1c2597f939d14bcabb2173e Mon Sep 17 00:00:00 2001 From: Kirk Shoop Date: Fri, 25 Nov 2016 19:27:07 -0800 Subject: update rxcpp to 3.0.0 --- ports/rxcpp/CONTROL | 2 +- ports/rxcpp/portfile.cmake | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) (limited to 'ports/rxcpp') diff --git a/ports/rxcpp/CONTROL b/ports/rxcpp/CONTROL index b4440da35..02b873816 100644 --- a/ports/rxcpp/CONTROL +++ b/ports/rxcpp/CONTROL @@ -1,3 +1,3 @@ Source: rxcpp -Version: 2.3.0 +Version: 3.0.0 Description: Reactive Extensions for C++ \ No newline at end of file diff --git a/ports/rxcpp/portfile.cmake b/ports/rxcpp/portfile.cmake index 65062c360..8180c2051 100644 --- a/ports/rxcpp/portfile.cmake +++ b/ports/rxcpp/portfile.cmake @@ -1,20 +1,15 @@ #header-only library include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/RxCpp-2.3.0) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/RxCpp-3.0.0) vcpkg_download_distfile(ARCHIVE_FILE - URLS "https://github.com/Reactive-Extensions/RxCpp/archive/v2.3.0.tar.gz" - FILENAME "RxCpp-2.3.0.tar.gz" - SHA512 180cf36777b0c14e989b4b79f01fcda7ecabfe4b3cee3ad7343138497578af02745de63f74941ec228eac3fccca4a7dfdfdd1c4d16a89438022dca6f9968953f + URLS "https://github.com/Reactive-Extensions/RxCpp/archive/v3.0.0.tar.gz" + FILENAME "RxCpp-3.0.0.tar.gz" + SHA512 f30f71cefee25f86297d66a49e752a44bdb8ad9a1a92249bf944101afd91b432564e9b8c9e8853f7042608030bffaa4d58d294f18a61f394701cee347f42bcbb ) vcpkg_extract_source_archive(${ARCHIVE_FILE}) file(INSTALL - ${SOURCE_PATH}/Rx/v2/src/rxcpp - DESTINATION ${CURRENT_PACKAGES_DIR}/include -) - -file(INSTALL - ${SOURCE_PATH}/Ix/CPP/src/cpplinq + ${SOURCE_PATH}/Rx/v2/src DESTINATION ${CURRENT_PACKAGES_DIR}/include ) -- cgit v1.2.3 From bff67a592def0047547237ec2b0e6420e055dba6 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 25 Nov 2016 21:44:01 -0800 Subject: Revert "Merge pull request #348 from kirkshoop/rxcpp3.0.0" This reverts commit 82c29e0dc5f7a19f6294b2b654acf2c7b5bae60d, reversing changes made to a5b1ed784aafd000a9e14dfc2c6ed228d5fe2952. --- ports/rxcpp/portfile.cmake | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'ports/rxcpp') diff --git a/ports/rxcpp/portfile.cmake b/ports/rxcpp/portfile.cmake index f767d8a3b..440c7ccf3 100644 --- a/ports/rxcpp/portfile.cmake +++ b/ports/rxcpp/portfile.cmake @@ -3,16 +3,21 @@ include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/RxCpp-3.0.0) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/Reactive-Extensions/RxCpp/archive/v3.0.0.tar.gz" - FILENAME "RxCpp-v3.0.0.tar.gz" + FILENAME "v3.0.0.tar.gz" SHA512 6d810b6163d0920d531f32a13729e290c81b47d5fc9c3e3d3d8a25d27a6f0671fec097d091bef7383b7e556e9e5471db087bb955e7f4fd9a5fdc9e7b06050844 ) vcpkg_extract_source_archive(${ARCHIVE}) file(INSTALL - ${SOURCE_PATH}/Rx/v2/src + ${SOURCE_PATH}/Rx/v2/src/rxcpp DESTINATION ${CURRENT_PACKAGES_DIR}/include ) file(INSTALL - ${SOURCE_PATH}/license.md - DESTINATION ${CURRENT_PACKAGES_DIR}/share/rxcpp RENAME copyright) \ No newline at end of file + ${SOURCE_PATH}/Ix/CPP/src/cpplinq + DESTINATION ${CURRENT_PACKAGES_DIR}/include +) + +file(INSTALL + ${SOURCE_PATH}/license.md + DESTINATION ${CURRENT_PACKAGES_DIR}/share/rxcpp RENAME copyright) \ No newline at end of file -- cgit v1.2.3 From cdba9a5e4904af960362614d1222ee47a29c21a7 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 25 Nov 2016 21:45:41 -0800 Subject: [rxcpp] Renaming downloaded file back to RxCpp-v3.0.0.tar.gz to avoid collisions with other libraries --- ports/rxcpp/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ports/rxcpp') diff --git a/ports/rxcpp/portfile.cmake b/ports/rxcpp/portfile.cmake index 440c7ccf3..4a321222d 100644 --- a/ports/rxcpp/portfile.cmake +++ b/ports/rxcpp/portfile.cmake @@ -3,7 +3,7 @@ include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/RxCpp-3.0.0) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/Reactive-Extensions/RxCpp/archive/v3.0.0.tar.gz" - FILENAME "v3.0.0.tar.gz" + FILENAME "RxCpp-v3.0.0.tar.gz" SHA512 6d810b6163d0920d531f32a13729e290c81b47d5fc9c3e3d3d8a25d27a6f0671fec097d091bef7383b7e556e9e5471db087bb955e7f4fd9a5fdc9e7b06050844 ) vcpkg_extract_source_archive(${ARCHIVE}) -- cgit v1.2.3