From 8f1046a3b24517d9e8f96e2951366d76aaa3c88e Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Thu, 1 Mar 2018 15:47:03 -0500 Subject: [PATCH 01/64] Initial vcpkg support for ECSUtil. --- ports/ecsutil/CONTROL | 3 ++ ports/ecsutil/portfile.cmake | 67 ++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 ports/ecsutil/CONTROL create mode 100644 ports/ecsutil/portfile.cmake diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL new file mode 100644 index 0000000000..9737ad0a78 --- /dev/null +++ b/ports/ecsutil/CONTROL @@ -0,0 +1,3 @@ +Source: ecsutil +Version: 0.9.0.0 +Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake new file mode 100644 index 0000000000..f23bf277f8 --- /dev/null +++ b/ports/ecsutil/portfile.cmake @@ -0,0 +1,67 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) + +set(ECSUtil_HASH c25095edf6975706356485314e3a3fcab924a45cd18b28744f62c8b8d6451a705fb37877ee778b1d9dc426e3bc80b4323fe8ba7fabd7d119d7fe245a55252e55) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) + +#architecture detection +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(ECSUtil_ARCH Win32) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ECSUtil_ARCH x64) +else() + message(FATAL_ERROR "unsupported architecture") +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE Release) + set(ECSUtil_CONFIGURATION_DEBUG Debug) +else() + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") +endif() + +vcpkg_download_distfile(ARCHIVE + URLS "http://kskskszlib.net/zlib-1.2.11.tar.gz" + FILENAME "ecs-object-client-windows-cpp.zip" + SHA512 ${ECSUtil_HASH} +) +vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_build_msbuild( + PROJECT_PATH ${SOURCE_PATH}/ECSUtil.sln + TARGET ECSUtil + RELEASE_CONFIGURATION ${ECSUtil_CONFIGURATION_RELEASE} + DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG} +) + +file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +endif() + +# Handle copyright +file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecsutil/copyright) + +vcpkg_copy_pdbs() From 52c25583647fac3ffcae2a24fa1f490321ca9eeb Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Wed, 7 Mar 2018 16:43:58 -0500 Subject: [PATCH 02/64] add x86/x64-windows-static-md configurations --- ports/ecsutil/portfile.cmake | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index f23bf277f8..6c897ce8c5 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,7 +12,8 @@ include(vcpkg_common_functions) -set(ECSUtil_HASH c25095edf6975706356485314e3a3fcab924a45cd18b28744f62c8b8d6451a705fb37877ee778b1d9dc426e3bc80b4323fe8ba7fabd7d119d7fe245a55252e55) +set(ECSUTIL_VERSION "0.9.0.1") +set(ECSUtil_HASH 871ec138bdde0e6bc2fd3fa1bcade925651c0ac4ec30ce07eae95788c09c5f32494b218e059ab7fb755ee5937a6d696cf211569a5c0999d3b47b37db781a5ad5) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection @@ -28,13 +29,18 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(ECSUtil_CONFIGURATION_RELEASE Release) set(ECSUtil_CONFIGURATION_DEBUG Debug) else() - set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") - set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib") + else() + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") + endif() endif() vcpkg_download_distfile(ARCHIVE - URLS "http://kskskszlib.net/zlib-1.2.11.tar.gz" - FILENAME "ecs-object-client-windows-cpp.zip" + URLS "http://bobk2824.github.io/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" + FILENAME "ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" SHA512 ${ECSUtil_HASH} ) vcpkg_extract_source_archive(${ARCHIVE}) @@ -55,10 +61,17 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + file(COPY "${SOURCE_PATH}/Debug Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + else() + file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + endif() endif() # Handle copyright From 68a72652b40697c7c4e92dc5a83352e027fb89c3 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 26 Mar 2018 16:09:02 -0400 Subject: [PATCH 03/64] 0.9.0.2 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 9737ad0a78..abee106dea 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.0 +Version: 0.9.0.2 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 6c897ce8c5..45174f1cdf 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.1") -set(ECSUtil_HASH 871ec138bdde0e6bc2fd3fa1bcade925651c0ac4ec30ce07eae95788c09c5f32494b218e059ab7fb755ee5937a6d696cf211569a5c0999d3b47b37db781a5ad5) +set(ECSUTIL_VERSION "0.9.0.2") +set(ECSUtil_HASH 0a6102375ef765e68b6afb30412773aab1ae32f6ad6e2d9a5044140e6078fb531c8931f5d84a2159a3a88e46b02615d8ad0889b6ab86068d248e1f7e3f94fe5c) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From 69a5fdbe9836b857c4e30f21c7b59c250890c749 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 26 Mar 2018 16:41:15 -0400 Subject: [PATCH 04/64] 0.9.0.3 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index abee106dea..f497f165e9 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.2 +Version: 0.9.0.3 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 45174f1cdf..173b8bf46e 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.2") -set(ECSUtil_HASH 0a6102375ef765e68b6afb30412773aab1ae32f6ad6e2d9a5044140e6078fb531c8931f5d84a2159a3a88e46b02615d8ad0889b6ab86068d248e1f7e3f94fe5c) +set(ECSUTIL_VERSION "0.9.0.3") +set(ECSUtil_HASH 4047312544b26a29493612bcf56dd715a94ee198315277c6d72dd0aa64288f8c5856912cbdfdd79cb0ab8f3996cc02e09bc94d6aa3afc364845d104eb6d9d28d) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From dff20e586563724bcf2dca9fc58009c8b8d537dc Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 27 Mar 2018 10:20:11 -0400 Subject: [PATCH 05/64] 0.9.0.4 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index f497f165e9..8c786e2aa6 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.3 +Version: 0.9.0.4 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 173b8bf46e..86728eb184 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.3") -set(ECSUtil_HASH 4047312544b26a29493612bcf56dd715a94ee198315277c6d72dd0aa64288f8c5856912cbdfdd79cb0ab8f3996cc02e09bc94d6aa3afc364845d104eb6d9d28d) +set(ECSUTIL_VERSION "0.9.0.4") +set(ECSUtil_HASH 6cbd9789045bb72ac23f720de60fccb3aae4503d4d49c972afca87d5adba90ecea27709bb1412f557105acc5c281cc0ba3135715e1b3bc9fbbe4717f3a9ebfe8) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From ab3d68d2ce85a5c1d473dc6a3c62f1f3c259e1e4 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 24 Apr 2018 10:12:48 -0400 Subject: [PATCH 06/64] 0.9.0.5 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 8c786e2aa6..3bf8a51c1c 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.4 +Version: 0.9.0.5 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 86728eb184..56c8df347e 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.4") -set(ECSUtil_HASH 6cbd9789045bb72ac23f720de60fccb3aae4503d4d49c972afca87d5adba90ecea27709bb1412f557105acc5c281cc0ba3135715e1b3bc9fbbe4717f3a9ebfe8) +set(ECSUTIL_VERSION "0.9.0.5") +set(ECSUtil_HASH 104fe777ed5eff9e6bf18bad4dbb482e0898c0f493862e06f676db0670a785378d36bd79fc9744a6b573c05dcf3f0362ba0b5922cae9b4d4f586bfc0f281c5c7) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From 05d1ad47ae1890038c084bbc08094e2b7b0d9617 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 25 Jun 2018 14:29:51 -0400 Subject: [PATCH 07/64] ecsutil 0.9.0.6 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 3bf8a51c1c..a147161b76 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.5 +Version: 0.9.0.6 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 56c8df347e..c135c0758b 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.5") -set(ECSUtil_HASH 104fe777ed5eff9e6bf18bad4dbb482e0898c0f493862e06f676db0670a785378d36bd79fc9744a6b573c05dcf3f0362ba0b5922cae9b4d4f586bfc0f281c5c7) +set(ECSUTIL_VERSION "0.9.0.6") +set(ECSUtil_HASH 5c609275a1f7b4d31890a63fd2a19b4abb8e3aeaef09bd0e8617f50a2922564f68461c6cf7d0f044a2e3749ebe549cd47fed5852193f1763748d7e4c2bd763da) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From fb4feebf73081fbda1130beade099c3c192765b1 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 2 Jul 2018 14:55:42 -0400 Subject: [PATCH 08/64] ECSUtil 0.9.0.7 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index a147161b76..4252939952 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.6 +Version: 0.9.0.7 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index c135c0758b..cc72d01b82 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.6") -set(ECSUtil_HASH 5c609275a1f7b4d31890a63fd2a19b4abb8e3aeaef09bd0e8617f50a2922564f68461c6cf7d0f044a2e3749ebe549cd47fed5852193f1763748d7e4c2bd763da) +set(ECSUTIL_VERSION "0.9.0.7") +set(ECSUtil_HASH f3f28c12f959dbbd8d4413bb4e7cca26933677d87078faf995a7db92d78fba51300d901b376a2ff2633fb0b02af6a46654e042afa5e24f14a2ace3b7ec205468) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From 4de205b2e05f696a57190f4456d78cffabdc06b5 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 3 Jul 2018 16:01:29 -0400 Subject: [PATCH 09/64] 0.9.0.8 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 4252939952..7ae64ce963 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.7 +Version: 0.9.0.8 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index cc72d01b82..0f5887c228 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.7") -set(ECSUtil_HASH f3f28c12f959dbbd8d4413bb4e7cca26933677d87078faf995a7db92d78fba51300d901b376a2ff2633fb0b02af6a46654e042afa5e24f14a2ace3b7ec205468) +set(ECSUTIL_VERSION "0.9.0.8") +set(ECSUtil_HASH 898d0c8a715d196d1fc92a99237fd56b7b783d09813223a0a126560e92fafe80ceeefb9b02c321298ce8faab33115b20574d014aa434e4e32c8c3cfdfe9fc8a2) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From bb4a90e74363daf77ac754c73105523779a0e55a Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 10 Jul 2018 10:06:13 -0400 Subject: [PATCH 10/64] ECSUtil 0.9.0.9 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 7ae64ce963..a0567a54a1 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.8 +Version: 0.9.0.9 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 0f5887c228..140ff8e245 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.8") -set(ECSUtil_HASH 898d0c8a715d196d1fc92a99237fd56b7b783d09813223a0a126560e92fafe80ceeefb9b02c321298ce8faab33115b20574d014aa434e4e32c8c3cfdfe9fc8a2) +set(ECSUTIL_VERSION "0.9.0.9") +set(ECSUtil_HASH 69163ecc1333a5e926bb333a99c32ac86ddf61b57834b776c23cd1e638222d7959108c7f7606a59918129a894c63aa86047afcc54399d160c93d1e1a6a292f11) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From ce11d147adc1757e149b3f7da498043042958cd6 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Wed, 1 Aug 2018 13:53:46 -0400 Subject: [PATCH 11/64] Update to ECSUtil v1.0.0.1 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index a0567a54a1..d00da86f02 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.9 +Version: 1.0.0.1 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 140ff8e245..2c470a2488 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.9") -set(ECSUtil_HASH 69163ecc1333a5e926bb333a99c32ac86ddf61b57834b776c23cd1e638222d7959108c7f7606a59918129a894c63aa86047afcc54399d160c93d1e1a6a292f11) +set(ECSUTIL_VERSION "1.0.0.1") +set(ECSUtil_HASH 02e1e507f4a91622e5f8c15a46c46648f013c7416417562093cd48318ff091dce2b7f8b2b6f470e5f24a48ebdf3d1120b6e2634b619ce769ca4e5706f41a9c1a) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection @@ -39,7 +39,7 @@ else() endif() vcpkg_download_distfile(ARCHIVE - URLS "http://bobk2824.github.io/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" + URLS "https://github.com/EMCECS/ecs-object-client-windows-cpp/releases/download/${ECSUTIL_VERSION}/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" FILENAME "ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" SHA512 ${ECSUtil_HASH} ) From 1ecad1b0db22af82a5c7887dd216538127b90da6 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 7 Aug 2018 13:57:28 -0400 Subject: [PATCH 12/64] ECSUtil 1.0.0.2 release --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index d00da86f02..976aa98333 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 1.0.0.1 +Version: 1.0.0.2 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 2c470a2488..2f3d7849bc 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "1.0.0.1") -set(ECSUtil_HASH 02e1e507f4a91622e5f8c15a46c46648f013c7416417562093cd48318ff091dce2b7f8b2b6f470e5f24a48ebdf3d1120b6e2634b619ce769ca4e5706f41a9c1a) +set(ECSUTIL_VERSION "1.0.0.2") +set(ECSUtil_HASH 98ee2b22123d0cca27561f98509f6738e1eb9d5af5f654dd59662a973a7200660bd43ec3cd8d16b0be210ba3aef4b938afca20d28e0180acd9183b608e07b801) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From 55b7ec23f96511af8e7fe572486f4e22ad590164 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Thu, 1 Mar 2018 15:47:03 -0500 Subject: [PATCH 13/64] Initial vcpkg support for ECSUtil. --- ports/ecsutil/CONTROL | 3 ++ ports/ecsutil/portfile.cmake | 67 ++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 ports/ecsutil/CONTROL create mode 100644 ports/ecsutil/portfile.cmake diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL new file mode 100644 index 0000000000..9737ad0a78 --- /dev/null +++ b/ports/ecsutil/CONTROL @@ -0,0 +1,3 @@ +Source: ecsutil +Version: 0.9.0.0 +Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake new file mode 100644 index 0000000000..f23bf277f8 --- /dev/null +++ b/ports/ecsutil/portfile.cmake @@ -0,0 +1,67 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) + +set(ECSUtil_HASH c25095edf6975706356485314e3a3fcab924a45cd18b28744f62c8b8d6451a705fb37877ee778b1d9dc426e3bc80b4323fe8ba7fabd7d119d7fe245a55252e55) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) + +#architecture detection +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(ECSUtil_ARCH Win32) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ECSUtil_ARCH x64) +else() + message(FATAL_ERROR "unsupported architecture") +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE Release) + set(ECSUtil_CONFIGURATION_DEBUG Debug) +else() + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") +endif() + +vcpkg_download_distfile(ARCHIVE + URLS "http://kskskszlib.net/zlib-1.2.11.tar.gz" + FILENAME "ecs-object-client-windows-cpp.zip" + SHA512 ${ECSUtil_HASH} +) +vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_build_msbuild( + PROJECT_PATH ${SOURCE_PATH}/ECSUtil.sln + TARGET ECSUtil + RELEASE_CONFIGURATION ${ECSUtil_CONFIGURATION_RELEASE} + DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG} +) + +file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +endif() + +# Handle copyright +file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecsutil/copyright) + +vcpkg_copy_pdbs() From 93759be2fa2a7dd26345fd6cd2759a181d689223 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Wed, 7 Mar 2018 16:43:58 -0500 Subject: [PATCH 14/64] add x86/x64-windows-static-md configurations --- ports/ecsutil/portfile.cmake | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index f23bf277f8..6c897ce8c5 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,7 +12,8 @@ include(vcpkg_common_functions) -set(ECSUtil_HASH c25095edf6975706356485314e3a3fcab924a45cd18b28744f62c8b8d6451a705fb37877ee778b1d9dc426e3bc80b4323fe8ba7fabd7d119d7fe245a55252e55) +set(ECSUTIL_VERSION "0.9.0.1") +set(ECSUtil_HASH 871ec138bdde0e6bc2fd3fa1bcade925651c0ac4ec30ce07eae95788c09c5f32494b218e059ab7fb755ee5937a6d696cf211569a5c0999d3b47b37db781a5ad5) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection @@ -28,13 +29,18 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(ECSUtil_CONFIGURATION_RELEASE Release) set(ECSUtil_CONFIGURATION_DEBUG Debug) else() - set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") - set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib") + else() + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") + endif() endif() vcpkg_download_distfile(ARCHIVE - URLS "http://kskskszlib.net/zlib-1.2.11.tar.gz" - FILENAME "ecs-object-client-windows-cpp.zip" + URLS "http://bobk2824.github.io/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" + FILENAME "ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" SHA512 ${ECSUtil_HASH} ) vcpkg_extract_source_archive(${ARCHIVE}) @@ -55,10 +61,17 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + file(COPY "${SOURCE_PATH}/Debug Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + else() + file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + endif() endif() # Handle copyright From a908b2506ff2790c8c27fd02277a7006ad52ee13 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 26 Mar 2018 16:09:02 -0400 Subject: [PATCH 15/64] 0.9.0.2 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 9737ad0a78..abee106dea 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.0 +Version: 0.9.0.2 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 6c897ce8c5..45174f1cdf 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.1") -set(ECSUtil_HASH 871ec138bdde0e6bc2fd3fa1bcade925651c0ac4ec30ce07eae95788c09c5f32494b218e059ab7fb755ee5937a6d696cf211569a5c0999d3b47b37db781a5ad5) +set(ECSUTIL_VERSION "0.9.0.2") +set(ECSUtil_HASH 0a6102375ef765e68b6afb30412773aab1ae32f6ad6e2d9a5044140e6078fb531c8931f5d84a2159a3a88e46b02615d8ad0889b6ab86068d248e1f7e3f94fe5c) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From 74cf390368eedab8e51acd2f3111eed275777204 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 26 Mar 2018 16:41:15 -0400 Subject: [PATCH 16/64] 0.9.0.3 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index abee106dea..f497f165e9 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.2 +Version: 0.9.0.3 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 45174f1cdf..173b8bf46e 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.2") -set(ECSUtil_HASH 0a6102375ef765e68b6afb30412773aab1ae32f6ad6e2d9a5044140e6078fb531c8931f5d84a2159a3a88e46b02615d8ad0889b6ab86068d248e1f7e3f94fe5c) +set(ECSUTIL_VERSION "0.9.0.3") +set(ECSUtil_HASH 4047312544b26a29493612bcf56dd715a94ee198315277c6d72dd0aa64288f8c5856912cbdfdd79cb0ab8f3996cc02e09bc94d6aa3afc364845d104eb6d9d28d) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From f3590c096a49e182030053d1cb97609339abcc7a Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 27 Mar 2018 10:20:11 -0400 Subject: [PATCH 17/64] 0.9.0.4 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index f497f165e9..8c786e2aa6 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.3 +Version: 0.9.0.4 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 173b8bf46e..86728eb184 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.3") -set(ECSUtil_HASH 4047312544b26a29493612bcf56dd715a94ee198315277c6d72dd0aa64288f8c5856912cbdfdd79cb0ab8f3996cc02e09bc94d6aa3afc364845d104eb6d9d28d) +set(ECSUTIL_VERSION "0.9.0.4") +set(ECSUtil_HASH 6cbd9789045bb72ac23f720de60fccb3aae4503d4d49c972afca87d5adba90ecea27709bb1412f557105acc5c281cc0ba3135715e1b3bc9fbbe4717f3a9ebfe8) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From 341eabc0d1f5cac4e837eefe2662484185fe4375 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 24 Apr 2018 10:12:48 -0400 Subject: [PATCH 18/64] 0.9.0.5 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 8c786e2aa6..3bf8a51c1c 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.4 +Version: 0.9.0.5 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 86728eb184..56c8df347e 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.4") -set(ECSUtil_HASH 6cbd9789045bb72ac23f720de60fccb3aae4503d4d49c972afca87d5adba90ecea27709bb1412f557105acc5c281cc0ba3135715e1b3bc9fbbe4717f3a9ebfe8) +set(ECSUTIL_VERSION "0.9.0.5") +set(ECSUtil_HASH 104fe777ed5eff9e6bf18bad4dbb482e0898c0f493862e06f676db0670a785378d36bd79fc9744a6b573c05dcf3f0362ba0b5922cae9b4d4f586bfc0f281c5c7) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From bc0e12251729e20e8418ae635bdbfded58ffd73e Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 25 Jun 2018 14:29:51 -0400 Subject: [PATCH 19/64] ecsutil 0.9.0.6 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 3bf8a51c1c..a147161b76 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.5 +Version: 0.9.0.6 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 56c8df347e..c135c0758b 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.5") -set(ECSUtil_HASH 104fe777ed5eff9e6bf18bad4dbb482e0898c0f493862e06f676db0670a785378d36bd79fc9744a6b573c05dcf3f0362ba0b5922cae9b4d4f586bfc0f281c5c7) +set(ECSUTIL_VERSION "0.9.0.6") +set(ECSUtil_HASH 5c609275a1f7b4d31890a63fd2a19b4abb8e3aeaef09bd0e8617f50a2922564f68461c6cf7d0f044a2e3749ebe549cd47fed5852193f1763748d7e4c2bd763da) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From ac49561986caf6561f872f8cd5b8ef12dbde9300 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 2 Jul 2018 14:55:42 -0400 Subject: [PATCH 20/64] ECSUtil 0.9.0.7 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index a147161b76..4252939952 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.6 +Version: 0.9.0.7 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index c135c0758b..cc72d01b82 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.6") -set(ECSUtil_HASH 5c609275a1f7b4d31890a63fd2a19b4abb8e3aeaef09bd0e8617f50a2922564f68461c6cf7d0f044a2e3749ebe549cd47fed5852193f1763748d7e4c2bd763da) +set(ECSUTIL_VERSION "0.9.0.7") +set(ECSUtil_HASH f3f28c12f959dbbd8d4413bb4e7cca26933677d87078faf995a7db92d78fba51300d901b376a2ff2633fb0b02af6a46654e042afa5e24f14a2ace3b7ec205468) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From 1cf6af248ff93a3aca6f9fa0b72b18e7f017a332 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 3 Jul 2018 16:01:29 -0400 Subject: [PATCH 21/64] 0.9.0.8 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 4252939952..7ae64ce963 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.7 +Version: 0.9.0.8 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index cc72d01b82..0f5887c228 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.7") -set(ECSUtil_HASH f3f28c12f959dbbd8d4413bb4e7cca26933677d87078faf995a7db92d78fba51300d901b376a2ff2633fb0b02af6a46654e042afa5e24f14a2ace3b7ec205468) +set(ECSUTIL_VERSION "0.9.0.8") +set(ECSUtil_HASH 898d0c8a715d196d1fc92a99237fd56b7b783d09813223a0a126560e92fafe80ceeefb9b02c321298ce8faab33115b20574d014aa434e4e32c8c3cfdfe9fc8a2) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From d0077a0183d46cf683282e7b2d62b5cde91d1219 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 10 Jul 2018 10:06:13 -0400 Subject: [PATCH 22/64] ECSUtil 0.9.0.9 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 7ae64ce963..a0567a54a1 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.8 +Version: 0.9.0.9 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 0f5887c228..140ff8e245 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.8") -set(ECSUtil_HASH 898d0c8a715d196d1fc92a99237fd56b7b783d09813223a0a126560e92fafe80ceeefb9b02c321298ce8faab33115b20574d014aa434e4e32c8c3cfdfe9fc8a2) +set(ECSUTIL_VERSION "0.9.0.9") +set(ECSUtil_HASH 69163ecc1333a5e926bb333a99c32ac86ddf61b57834b776c23cd1e638222d7959108c7f7606a59918129a894c63aa86047afcc54399d160c93d1e1a6a292f11) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From 4fe0eebb97005b600be9f35949906038730c6f14 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Wed, 1 Aug 2018 13:53:46 -0400 Subject: [PATCH 23/64] Update to ECSUtil v1.0.0.1 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index a0567a54a1..d00da86f02 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.9 +Version: 1.0.0.1 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 140ff8e245..2c470a2488 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.9") -set(ECSUtil_HASH 69163ecc1333a5e926bb333a99c32ac86ddf61b57834b776c23cd1e638222d7959108c7f7606a59918129a894c63aa86047afcc54399d160c93d1e1a6a292f11) +set(ECSUTIL_VERSION "1.0.0.1") +set(ECSUtil_HASH 02e1e507f4a91622e5f8c15a46c46648f013c7416417562093cd48318ff091dce2b7f8b2b6f470e5f24a48ebdf3d1120b6e2634b619ce769ca4e5706f41a9c1a) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection @@ -39,7 +39,7 @@ else() endif() vcpkg_download_distfile(ARCHIVE - URLS "http://bobk2824.github.io/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" + URLS "https://github.com/EMCECS/ecs-object-client-windows-cpp/releases/download/${ECSUTIL_VERSION}/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" FILENAME "ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" SHA512 ${ECSUtil_HASH} ) From cdffc66b408763278f20aae2417f857f336787e6 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 7 Aug 2018 13:57:28 -0400 Subject: [PATCH 24/64] ECSUtil 1.0.0.2 release --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index d00da86f02..976aa98333 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 1.0.0.1 +Version: 1.0.0.2 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 2c470a2488..2f3d7849bc 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "1.0.0.1") -set(ECSUtil_HASH 02e1e507f4a91622e5f8c15a46c46648f013c7416417562093cd48318ff091dce2b7f8b2b6f470e5f24a48ebdf3d1120b6e2634b619ce769ca4e5706f41a9c1a) +set(ECSUTIL_VERSION "1.0.0.2") +set(ECSUtil_HASH 98ee2b22123d0cca27561f98509f6738e1eb9d5af5f654dd59662a973a7200660bd43ec3cd8d16b0be210ba3aef4b938afca20d28e0180acd9183b608e07b801) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From 8c6e0761305326b08224250292e7ed50538e281c Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Thu, 1 Mar 2018 15:47:03 -0500 Subject: [PATCH 25/64] Initial vcpkg support for ECSUtil. --- ports/ecsutil/CONTROL | 3 ++ ports/ecsutil/portfile.cmake | 67 ++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 ports/ecsutil/CONTROL create mode 100644 ports/ecsutil/portfile.cmake diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL new file mode 100644 index 0000000000..9737ad0a78 --- /dev/null +++ b/ports/ecsutil/CONTROL @@ -0,0 +1,3 @@ +Source: ecsutil +Version: 0.9.0.0 +Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake new file mode 100644 index 0000000000..f23bf277f8 --- /dev/null +++ b/ports/ecsutil/portfile.cmake @@ -0,0 +1,67 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) + +set(ECSUtil_HASH c25095edf6975706356485314e3a3fcab924a45cd18b28744f62c8b8d6451a705fb37877ee778b1d9dc426e3bc80b4323fe8ba7fabd7d119d7fe245a55252e55) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) + +#architecture detection +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(ECSUtil_ARCH Win32) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ECSUtil_ARCH x64) +else() + message(FATAL_ERROR "unsupported architecture") +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE Release) + set(ECSUtil_CONFIGURATION_DEBUG Debug) +else() + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") +endif() + +vcpkg_download_distfile(ARCHIVE + URLS "http://kskskszlib.net/zlib-1.2.11.tar.gz" + FILENAME "ecs-object-client-windows-cpp.zip" + SHA512 ${ECSUtil_HASH} +) +vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_build_msbuild( + PROJECT_PATH ${SOURCE_PATH}/ECSUtil.sln + TARGET ECSUtil + RELEASE_CONFIGURATION ${ECSUtil_CONFIGURATION_RELEASE} + DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG} +) + +file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +endif() + +# Handle copyright +file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecsutil/copyright) + +vcpkg_copy_pdbs() From f3c9c1537e506cfe90cdd5721d3a9841fa397380 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Wed, 7 Mar 2018 16:43:58 -0500 Subject: [PATCH 26/64] add x86/x64-windows-static-md configurations --- ports/ecsutil/portfile.cmake | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index f23bf277f8..6c897ce8c5 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,7 +12,8 @@ include(vcpkg_common_functions) -set(ECSUtil_HASH c25095edf6975706356485314e3a3fcab924a45cd18b28744f62c8b8d6451a705fb37877ee778b1d9dc426e3bc80b4323fe8ba7fabd7d119d7fe245a55252e55) +set(ECSUTIL_VERSION "0.9.0.1") +set(ECSUtil_HASH 871ec138bdde0e6bc2fd3fa1bcade925651c0ac4ec30ce07eae95788c09c5f32494b218e059ab7fb755ee5937a6d696cf211569a5c0999d3b47b37db781a5ad5) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection @@ -28,13 +29,18 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(ECSUtil_CONFIGURATION_RELEASE Release) set(ECSUtil_CONFIGURATION_DEBUG Debug) else() - set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") - set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib") + else() + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") + endif() endif() vcpkg_download_distfile(ARCHIVE - URLS "http://kskskszlib.net/zlib-1.2.11.tar.gz" - FILENAME "ecs-object-client-windows-cpp.zip" + URLS "http://bobk2824.github.io/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" + FILENAME "ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" SHA512 ${ECSUtil_HASH} ) vcpkg_extract_source_archive(${ARCHIVE}) @@ -55,10 +61,17 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + file(COPY "${SOURCE_PATH}/Debug Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + else() + file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + endif() endif() # Handle copyright From 8fc4fb5f50b610fc2f4b04423a184e4c4d47c041 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 26 Mar 2018 16:09:02 -0400 Subject: [PATCH 27/64] 0.9.0.2 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 9737ad0a78..abee106dea 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.0 +Version: 0.9.0.2 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 6c897ce8c5..45174f1cdf 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.1") -set(ECSUtil_HASH 871ec138bdde0e6bc2fd3fa1bcade925651c0ac4ec30ce07eae95788c09c5f32494b218e059ab7fb755ee5937a6d696cf211569a5c0999d3b47b37db781a5ad5) +set(ECSUTIL_VERSION "0.9.0.2") +set(ECSUtil_HASH 0a6102375ef765e68b6afb30412773aab1ae32f6ad6e2d9a5044140e6078fb531c8931f5d84a2159a3a88e46b02615d8ad0889b6ab86068d248e1f7e3f94fe5c) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From 0b13d211024945818d1cc622454449de139bec3c Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 26 Mar 2018 16:41:15 -0400 Subject: [PATCH 28/64] 0.9.0.3 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index abee106dea..f497f165e9 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.2 +Version: 0.9.0.3 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 45174f1cdf..173b8bf46e 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.2") -set(ECSUtil_HASH 0a6102375ef765e68b6afb30412773aab1ae32f6ad6e2d9a5044140e6078fb531c8931f5d84a2159a3a88e46b02615d8ad0889b6ab86068d248e1f7e3f94fe5c) +set(ECSUTIL_VERSION "0.9.0.3") +set(ECSUtil_HASH 4047312544b26a29493612bcf56dd715a94ee198315277c6d72dd0aa64288f8c5856912cbdfdd79cb0ab8f3996cc02e09bc94d6aa3afc364845d104eb6d9d28d) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From e28ea26d80a543f284075bc87c043290a8ef1a94 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 27 Mar 2018 10:20:11 -0400 Subject: [PATCH 29/64] 0.9.0.4 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index f497f165e9..8c786e2aa6 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.3 +Version: 0.9.0.4 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 173b8bf46e..86728eb184 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.3") -set(ECSUtil_HASH 4047312544b26a29493612bcf56dd715a94ee198315277c6d72dd0aa64288f8c5856912cbdfdd79cb0ab8f3996cc02e09bc94d6aa3afc364845d104eb6d9d28d) +set(ECSUTIL_VERSION "0.9.0.4") +set(ECSUtil_HASH 6cbd9789045bb72ac23f720de60fccb3aae4503d4d49c972afca87d5adba90ecea27709bb1412f557105acc5c281cc0ba3135715e1b3bc9fbbe4717f3a9ebfe8) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From 6368e540428ea3ded157184d427d890cbca045fc Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 24 Apr 2018 10:12:48 -0400 Subject: [PATCH 30/64] 0.9.0.5 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 8c786e2aa6..3bf8a51c1c 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.4 +Version: 0.9.0.5 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 86728eb184..56c8df347e 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.4") -set(ECSUtil_HASH 6cbd9789045bb72ac23f720de60fccb3aae4503d4d49c972afca87d5adba90ecea27709bb1412f557105acc5c281cc0ba3135715e1b3bc9fbbe4717f3a9ebfe8) +set(ECSUTIL_VERSION "0.9.0.5") +set(ECSUtil_HASH 104fe777ed5eff9e6bf18bad4dbb482e0898c0f493862e06f676db0670a785378d36bd79fc9744a6b573c05dcf3f0362ba0b5922cae9b4d4f586bfc0f281c5c7) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From 20a64eb659a33ef37d4a630e9207b233555763f6 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 25 Jun 2018 14:29:51 -0400 Subject: [PATCH 31/64] ecsutil 0.9.0.6 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 3bf8a51c1c..a147161b76 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.5 +Version: 0.9.0.6 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 56c8df347e..c135c0758b 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.5") -set(ECSUtil_HASH 104fe777ed5eff9e6bf18bad4dbb482e0898c0f493862e06f676db0670a785378d36bd79fc9744a6b573c05dcf3f0362ba0b5922cae9b4d4f586bfc0f281c5c7) +set(ECSUTIL_VERSION "0.9.0.6") +set(ECSUtil_HASH 5c609275a1f7b4d31890a63fd2a19b4abb8e3aeaef09bd0e8617f50a2922564f68461c6cf7d0f044a2e3749ebe549cd47fed5852193f1763748d7e4c2bd763da) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From 6b37532d47f7cbd94e0bf5da127a808300178669 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 2 Jul 2018 14:55:42 -0400 Subject: [PATCH 32/64] ECSUtil 0.9.0.7 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index a147161b76..4252939952 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.6 +Version: 0.9.0.7 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index c135c0758b..cc72d01b82 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.6") -set(ECSUtil_HASH 5c609275a1f7b4d31890a63fd2a19b4abb8e3aeaef09bd0e8617f50a2922564f68461c6cf7d0f044a2e3749ebe549cd47fed5852193f1763748d7e4c2bd763da) +set(ECSUTIL_VERSION "0.9.0.7") +set(ECSUtil_HASH f3f28c12f959dbbd8d4413bb4e7cca26933677d87078faf995a7db92d78fba51300d901b376a2ff2633fb0b02af6a46654e042afa5e24f14a2ace3b7ec205468) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From 483b5463f0b0525ad08787a34e6a4d00b2d14dba Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 3 Jul 2018 16:01:29 -0400 Subject: [PATCH 33/64] 0.9.0.8 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 4252939952..7ae64ce963 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.7 +Version: 0.9.0.8 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index cc72d01b82..0f5887c228 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.7") -set(ECSUtil_HASH f3f28c12f959dbbd8d4413bb4e7cca26933677d87078faf995a7db92d78fba51300d901b376a2ff2633fb0b02af6a46654e042afa5e24f14a2ace3b7ec205468) +set(ECSUTIL_VERSION "0.9.0.8") +set(ECSUtil_HASH 898d0c8a715d196d1fc92a99237fd56b7b783d09813223a0a126560e92fafe80ceeefb9b02c321298ce8faab33115b20574d014aa434e4e32c8c3cfdfe9fc8a2) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From 839fe005e5adafe06ff248fc47ffd7417f0aa53e Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 10 Jul 2018 10:06:13 -0400 Subject: [PATCH 34/64] ECSUtil 0.9.0.9 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 7ae64ce963..a0567a54a1 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.8 +Version: 0.9.0.9 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 0f5887c228..140ff8e245 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.8") -set(ECSUtil_HASH 898d0c8a715d196d1fc92a99237fd56b7b783d09813223a0a126560e92fafe80ceeefb9b02c321298ce8faab33115b20574d014aa434e4e32c8c3cfdfe9fc8a2) +set(ECSUTIL_VERSION "0.9.0.9") +set(ECSUtil_HASH 69163ecc1333a5e926bb333a99c32ac86ddf61b57834b776c23cd1e638222d7959108c7f7606a59918129a894c63aa86047afcc54399d160c93d1e1a6a292f11) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From 99e3bba0e3535f82a84c6e7a21ad654f66c2ee5a Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Wed, 1 Aug 2018 13:53:46 -0400 Subject: [PATCH 35/64] Update to ECSUtil v1.0.0.1 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index a0567a54a1..d00da86f02 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 0.9.0.9 +Version: 1.0.0.1 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 140ff8e245..2c470a2488 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "0.9.0.9") -set(ECSUtil_HASH 69163ecc1333a5e926bb333a99c32ac86ddf61b57834b776c23cd1e638222d7959108c7f7606a59918129a894c63aa86047afcc54399d160c93d1e1a6a292f11) +set(ECSUTIL_VERSION "1.0.0.1") +set(ECSUtil_HASH 02e1e507f4a91622e5f8c15a46c46648f013c7416417562093cd48318ff091dce2b7f8b2b6f470e5f24a48ebdf3d1120b6e2634b619ce769ca4e5706f41a9c1a) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection @@ -39,7 +39,7 @@ else() endif() vcpkg_download_distfile(ARCHIVE - URLS "http://bobk2824.github.io/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" + URLS "https://github.com/EMCECS/ecs-object-client-windows-cpp/releases/download/${ECSUTIL_VERSION}/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" FILENAME "ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" SHA512 ${ECSUtil_HASH} ) From e3f354200754023e4f1e683e13330c009178e1b5 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 7 Aug 2018 13:57:28 -0400 Subject: [PATCH 36/64] ECSUtil 1.0.0.2 release --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index d00da86f02..976aa98333 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 1.0.0.1 +Version: 1.0.0.2 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 2c470a2488..2f3d7849bc 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "1.0.0.1") -set(ECSUtil_HASH 02e1e507f4a91622e5f8c15a46c46648f013c7416417562093cd48318ff091dce2b7f8b2b6f470e5f24a48ebdf3d1120b6e2634b619ce769ca4e5706f41a9c1a) +set(ECSUTIL_VERSION "1.0.0.2") +set(ECSUtil_HASH 98ee2b22123d0cca27561f98509f6738e1eb9d5af5f654dd59662a973a7200660bd43ec3cd8d16b0be210ba3aef4b938afca20d28e0180acd9183b608e07b801) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From d01501d1f50ce26a14275d81e2958cfe9b5021f6 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 25 Sep 2018 15:35:39 -0400 Subject: [PATCH 37/64] ECSUtil v1.0.1.1 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 976aa98333..7d0129b03c 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 1.0.0.2 +Version: 1.0.1.1 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 2f3d7849bc..cf4e79ddae 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "1.0.0.2") -set(ECSUtil_HASH 98ee2b22123d0cca27561f98509f6738e1eb9d5af5f654dd59662a973a7200660bd43ec3cd8d16b0be210ba3aef4b938afca20d28e0180acd9183b608e07b801) +set(ECSUTIL_VERSION "v1.0.1.1") +set(ECSUtil_HASH e396f672b2a6ec16a5f74f490f8383c67a869db950100d5139fee35302d183f1f45c96ffce783c1e573631a8a036e9f55ab2fac1d1a312f308b9f474fbde10ed) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From 3d1fbeb7de48a3d7a782be7b8722efb5015c7010 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 9 Oct 2018 14:54:40 -0400 Subject: [PATCH 38/64] ECSUtil 1.0.1.2 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 7d0129b03c..1a4eff9c2e 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,3 @@ Source: ecsutil -Version: 1.0.1.1 +Version: 1.0.1.2 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index cf4e79ddae..874759afc6 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -12,8 +12,8 @@ include(vcpkg_common_functions) -set(ECSUTIL_VERSION "v1.0.1.1") -set(ECSUtil_HASH e396f672b2a6ec16a5f74f490f8383c67a869db950100d5139fee35302d183f1f45c96ffce783c1e573631a8a036e9f55ab2fac1d1a312f308b9f474fbde10ed) +set(ECSUTIL_VERSION "v1.0.1.2") +set(ECSUtil_HASH 399aec10a625ee6eb8f7869005b9221a1e4930c7e8774c20467ddc0e86312e7e1224fb29a1b54d3c9669b78708a23db548195f8973a19eb5559338f600688888) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) #architecture detection From 1d59b34d6f97fadb015e4ca6baa76db9e1e8ab33 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 19 Oct 2018 02:34:26 -0700 Subject: [PATCH 39/64] [ecsutil] Initial commit of 1.0.1.2 --- ports/ecsutil/CONTROL | 3 ++ ports/ecsutil/portfile.cmake | 80 ++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 ports/ecsutil/CONTROL create mode 100644 ports/ecsutil/portfile.cmake diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL new file mode 100644 index 0000000000..1a4eff9c2e --- /dev/null +++ b/ports/ecsutil/CONTROL @@ -0,0 +1,3 @@ +Source: ecsutil +Version: 1.0.1.2 +Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake new file mode 100644 index 0000000000..874759afc6 --- /dev/null +++ b/ports/ecsutil/portfile.cmake @@ -0,0 +1,80 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +include(vcpkg_common_functions) + +set(ECSUTIL_VERSION "v1.0.1.2") +set(ECSUtil_HASH 399aec10a625ee6eb8f7869005b9221a1e4930c7e8774c20467ddc0e86312e7e1224fb29a1b54d3c9669b78708a23db548195f8973a19eb5559338f600688888) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) + +#architecture detection +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(ECSUtil_ARCH Win32) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ECSUtil_ARCH x64) +else() + message(FATAL_ERROR "unsupported architecture") +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE Release) + set(ECSUtil_CONFIGURATION_DEBUG Debug) +else() + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib") + else() + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") + endif() +endif() + +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/EMCECS/ecs-object-client-windows-cpp/releases/download/${ECSUTIL_VERSION}/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" + FILENAME "ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" + SHA512 ${ECSUtil_HASH} +) +vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_build_msbuild( + PROJECT_PATH ${SOURCE_PATH}/ECSUtil.sln + TARGET ECSUtil + RELEASE_CONFIGURATION ${ECSUtil_CONFIGURATION_RELEASE} + DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG} +) + +file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) +elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + file(COPY "${SOURCE_PATH}/Debug Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + else() + file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + endif() +endif() + +# Handle copyright +file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecsutil/copyright) + +vcpkg_copy_pdbs() From 13ec697c39ff6441393003f38635898b04d6d931 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 19 Oct 2018 02:55:52 -0700 Subject: [PATCH 40/64] [ecsutil] Simplify and use vcpkg_install_msbuild --- ports/ecsutil/CONTROL | 1 + ports/ecsutil/portfile.cmake | 89 ++++++++++++------------------------ 2 files changed, 30 insertions(+), 60 deletions(-) diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 1a4eff9c2e..baec5a3cbc 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,3 +1,4 @@ Source: ecsutil Version: 1.0.1.2 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. +Build-Depends: atlmfc diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index 874759afc6..dd29d0b938 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -1,80 +1,49 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# - include(vcpkg_common_functions) -set(ECSUTIL_VERSION "v1.0.1.2") -set(ECSUtil_HASH 399aec10a625ee6eb8f7869005b9221a1e4930c7e8774c20467ddc0e86312e7e1224fb29a1b54d3c9669b78708a23db548195f8973a19eb5559338f600688888) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src) - -#architecture detection if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(ECSUtil_ARCH Win32) + set(PLATFORM x86) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(ECSUtil_ARCH x64) + set(PLATFORM x64) else() - message(FATAL_ERROR "unsupported architecture") + message(FATAL_ERROR "Unsupported architecture") +endif() + +if(VCPKG_CMAKE_SYSTEM_NAME) + message(FATAL_ERROR "Unsupported platform. ECSUTIL currently only supports windows desktop.") endif() if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(ECSUtil_CONFIGURATION_RELEASE Release) set(ECSUtil_CONFIGURATION_DEBUG Debug) else() - if (VCPKG_CRT_LINKAGE STREQUAL dynamic) - set(ECSUtil_CONFIGURATION_RELEASE "Release Lib") - set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib") - else() - set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") - set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") - endif() + if (VCPKG_CRT_LINKAGE STREQUAL dynamic) + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib") + else() + set(ECSUtil_CONFIGURATION_RELEASE "Release Lib Static") + set(ECSUtil_CONFIGURATION_DEBUG "Debug Lib Static") + endif() endif() -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/EMCECS/ecs-object-client-windows-cpp/releases/download/${ECSUTIL_VERSION}/ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" - FILENAME "ecs-object-client-windows-cpp.${ECSUTIL_VERSION}.zip" - SHA512 ${ECSUtil_HASH} +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO EMCECS/ecs-object-client-windows-cpp + REF v1.0.1.2 + SHA512 ee6c9086111f9cb4a3b9b0645a6a8921bae1d3e8fba0d054d824935b0ff82a57db5c1476183202694afe33f89bfc47db1ef91696a739a1a43a1e2411e4361e6f + HEAD_REF master + PATCHES disable-setversion.patch ) -vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/ECSUtil.sln - TARGET ECSUtil +vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH ECSUtil.sln + PLATFORM ${PLATFORM} + LICENSE_SUBPATH license.txt + TARGET ECSUtil RELEASE_CONFIGURATION ${ECSUtil_CONFIGURATION_RELEASE} DEBUG_CONFIGURATION ${ECSUtil_CONFIGURATION_DEBUG} ) file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res) - -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(COPY ${SOURCE_PATH}/Debug/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(COPY ${SOURCE_PATH}/Release/${ECSUtil_ARCH}/ECSUtil.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) - if (VCPKG_CRT_LINKAGE STREQUAL dynamic) - file(COPY "${SOURCE_PATH}/Debug Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY "${SOURCE_PATH}/objDebug Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY "${SOURCE_PATH}/Release Lib/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(COPY "${SOURCE_PATH}/objRelease Lib/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - else() - file(COPY "${SOURCE_PATH}/Debug Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY "${SOURCE_PATH}/objDebug Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY "${SOURCE_PATH}/Release Lib Static/${ECSUtil_ARCH}/ECSUtil.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(COPY "${SOURCE_PATH}/objRelease Lib Static/${ECSUtil_ARCH}/ECSUtil/ECSUtil.pdb" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - endif() -endif() - -# Handle copyright -file(COPY ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ecsutil/copyright) - -vcpkg_copy_pdbs() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res ${CURRENT_PACKAGES_DIR}/tools) +file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/NatvisAddIn.dll ${CURRENT_PACKAGES_DIR}/debug/bin/NatvisAddIn.dll) From 9b21ff9612916e24f89c6839599d3d50446597d8 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 19 Oct 2018 03:00:39 -0700 Subject: [PATCH 41/64] [ecsutil] Commit missing patch --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/disable-setversion.patch | 36 ++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 ports/ecsutil/disable-setversion.patch diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index baec5a3cbc..fada181acb 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,4 +1,4 @@ Source: ecsutil -Version: 1.0.1.2 +Version: 1.0.1.2-1 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. Build-Depends: atlmfc diff --git a/ports/ecsutil/disable-setversion.patch b/ports/ecsutil/disable-setversion.patch new file mode 100644 index 0000000000..2899a01082 --- /dev/null +++ b/ports/ecsutil/disable-setversion.patch @@ -0,0 +1,36 @@ +diff --git a/ECSUtil/ECSUtil.vcxproj b/ECSUtil/ECSUtil.vcxproj +index 05c5726..f8ac64e 100644 +--- a/ECSUtil/ECSUtil.vcxproj ++++ b/ECSUtil/ECSUtil.vcxproj +@@ -274,7 +274,6 @@ + $(IntDir);%(AdditionalIncludeDirectories) + + +- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll + + + set version resource in DLL from source file +@@ -361,7 +360,6 @@ + $(IntDir);%(AdditionalIncludeDirectories) + + +- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll + + + set version resource in DLL from source file +@@ -445,7 +443,6 @@ + $(IntDir);%(AdditionalIncludeDirectories) + + +- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll + + + set version resource in DLL from source file +@@ -541,7 +538,6 @@ + $(IntDir);%(AdditionalIncludeDirectories) + + +- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll + + + set version resource in DLL from source file From ffa114aaa43e8bcdf880d6e2c47ee0ed46125070 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 24 Oct 2018 12:41:19 -0700 Subject: [PATCH 42/64] [ecsutil] Remove empty bin directories --- ports/ecsutil/portfile.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index dd29d0b938..4a8e48b2ba 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -47,3 +47,6 @@ vcpkg_install_msbuild( file(COPY ${SOURCE_PATH}/ECSUtil DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/ECSUtil/res ${CURRENT_PACKAGES_DIR}/tools) file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/NatvisAddIn.dll ${CURRENT_PACKAGES_DIR}/debug/bin/NatvisAddIn.dll) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() From 90f4901b23e6f75213637cb1f755d93eb3598566 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Tue, 13 Nov 2018 15:50:45 -0500 Subject: [PATCH 43/64] fixed setversion.exe so patch is not necessary --- ports/ecsutil/disable-setversion.patch | 36 -------------------------- 1 file changed, 36 deletions(-) delete mode 100644 ports/ecsutil/disable-setversion.patch diff --git a/ports/ecsutil/disable-setversion.patch b/ports/ecsutil/disable-setversion.patch deleted file mode 100644 index 2899a01082..0000000000 --- a/ports/ecsutil/disable-setversion.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/ECSUtil/ECSUtil.vcxproj b/ECSUtil/ECSUtil.vcxproj -index 05c5726..f8ac64e 100644 ---- a/ECSUtil/ECSUtil.vcxproj -+++ b/ECSUtil/ECSUtil.vcxproj -@@ -274,7 +274,6 @@ - $(IntDir);%(AdditionalIncludeDirectories) - - -- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll - - - set version resource in DLL from source file -@@ -361,7 +360,6 @@ - $(IntDir);%(AdditionalIncludeDirectories) - - -- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll - - - set version resource in DLL from source file -@@ -445,7 +443,6 @@ - $(IntDir);%(AdditionalIncludeDirectories) - - -- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll - - - set version resource in DLL from source file -@@ -541,7 +538,6 @@ - $(IntDir);%(AdditionalIncludeDirectories) - - -- $(SolutionDir)bin\setversion.exe /getversion "#define ECSUTIL_VERSION" "$(SolutionDir)ECSUtil\Version.h" $(OutDir)ECSUtil.dll - - - set version resource in DLL from source file From b79ad151244b6c11c3b2926b8e3881a5aec47c4d Mon Sep 17 00:00:00 2001 From: Ivy Snow Date: Thu, 15 Nov 2018 11:59:24 +0800 Subject: [PATCH 44/64] [gflags] Update to version 2.2.2. --- ports/gflags/CONTROL | 2 +- ports/gflags/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/gflags/CONTROL b/ports/gflags/CONTROL index 0a8d83aee7..bf0800eec0 100644 --- a/ports/gflags/CONTROL +++ b/ports/gflags/CONTROL @@ -1,3 +1,3 @@ Source: gflags -Version: 2.2.1-3 +Version: 2.2.2 Description: A C++ library that implements commandline flags processing diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake index 31ffeafa5d..11ef0cd935 100644 --- a/ports/gflags/portfile.cmake +++ b/ports/gflags/portfile.cmake @@ -7,8 +7,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gflags/gflags - REF v2.2.1 - SHA512 e919cbdcff1f993ddbfa9c06d8e595566a4717c27ff62f388a64c0e6b4683a93211c24ce78485eae84c2c76053341574064e6c56af185fc2782e2816b26e1fc9 + REF v2.2.2 + SHA512 98c4703aab24e81fe551f7831ab797fb73d0f7dfc516addb34b9ff6d0914e5fd398207889b1ae555bac039537b1d4677067dae403b64903577078d99c1bdb447 HEAD_REF master ) From 4e9c75d2056489346dfa07c751e68cd050fea084 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 19 Nov 2018 11:31:49 +0100 Subject: [PATCH 45/64] [ace] 6.5.3 * ports/ace/CONTROL: * ports/ace/portfile.cmake: --- ports/ace/CONTROL | 2 +- ports/ace/portfile.cmake | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL index 8323188d90..ed08a12c22 100644 --- a/ports/ace/CONTROL +++ b/ports/ace/CONTROL @@ -1,3 +1,3 @@ Source: ace -Version: 6.5.2 +Version: 6.5.3 Description: The ADAPTIVE Communication Environment diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 3f5df8868e..4ec2bc48c6 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -9,9 +9,8 @@ endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers/ace) vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_2/ACE.zip" - FILENAME "ACE-6.5.2.zip" - SHA512 ca8a55942b50628e851cad7074a249c480d82f916979a50bb24174432248037fb7a79ca055c7e6553d96aa58f14b97e8e8bf5dbc8671b72b8712e8a65f63ac98 + URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_3/ACE-6.5.3.zip" + SHA512 1c24c7a138b6580e0f2a71d3e797ed846a3c046854c19d10175198dc519b610b2ac684d6e0e3999705319304b6eee3f09405cb43ce48a869d2f1446342da469d ) vcpkg_extract_source_archive(${ARCHIVE}) From 08d6a499775d000c35daf5c94080fbfeac98dbe8 Mon Sep 17 00:00:00 2001 From: Josue Andrade Gomes Date: Thu, 29 Nov 2018 00:09:59 -0200 Subject: [PATCH 46/64] Update to GraphicsMagick 1.3.31 (#4847) --- ports/graphicsmagick/CONTROL | 2 +- ports/graphicsmagick/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/graphicsmagick/CONTROL b/ports/graphicsmagick/CONTROL index f8519040f4..7b89a8fd9a 100644 --- a/ports/graphicsmagick/CONTROL +++ b/ports/graphicsmagick/CONTROL @@ -1,5 +1,5 @@ Source: graphicsmagick Maintainer: josuegomes@gmail.com -Version: 1.3.30-1 +Version: 1.3.31 Build-Depends: zlib, bzip2, freetype, libjpeg-turbo, libpng, tiff Description: Image processing library diff --git a/ports/graphicsmagick/portfile.cmake b/ports/graphicsmagick/portfile.cmake index b04842eb13..87d03bd1f6 100644 --- a/ports/graphicsmagick/portfile.cmake +++ b/ports/graphicsmagick/portfile.cmake @@ -1,11 +1,11 @@ include(vcpkg_common_functions) -set(GM_VERSION 1.3.30) +set(GM_VERSION 1.3.31) vcpkg_download_distfile(ARCHIVE URLS "https://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/${GM_VERSION}/GraphicsMagick-${GM_VERSION}-windows-source.7z" FILENAME "GraphicsMagick-${GM_VERSION}-windows-source.7z" - SHA512 9e4cfff57ae547f133e6208033213d3aa790cd8c95a061c101c63b8ae8896e7504d02f302efdd20ff24f72c07760a0a5e2b32e21fe454717ed1deb2edeef159c + SHA512 ff67f5e6adf352527264e7a6a76d45ce34470263dc764760d876b9ab5d5078e3a46b9d9cb2e7ab52d53106ffe584d44c66b42f3d4d62c972662d488c86510881 ) vcpkg_extract_source_archive_ex( From 3e71750029740df700b46dfa3761c42509f08e54 Mon Sep 17 00:00:00 2001 From: Tsukasa Sugiura Date: Thu, 29 Nov 2018 11:20:09 +0900 Subject: [PATCH 47/64] [pcl] Update to PCL 1.9.1 (#4842) Update PCL port to PCL 1.9.1. --- ports/pcl/CONTROL | 2 +- ports/pcl/pcl_utils.patch | 36 +++++++++++++++++++++--------------- ports/pcl/portfile.cmake | 4 ++-- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL index 0a12f78c87..a9f23813d2 100644 --- a/ports/pcl/CONTROL +++ b/ports/pcl/CONTROL @@ -1,5 +1,5 @@ Source: pcl -Version: 1.9.0-1 +Version: 1.9.1-1 Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing. Build-Depends: eigen3, flann, qhull, vtk, libpng, boost-system, boost-filesystem, boost-thread, boost-date-time, boost-iostreams, boost-random, boost-foreach, boost-dynamic-bitset, boost-property-map, boost-graph, boost-multi-array, boost-signals2, boost-ptr-container, boost-uuid, boost-interprocess, boost-asio diff --git a/ports/pcl/pcl_utils.patch b/ports/pcl/pcl_utils.patch index 3f266cdfd3..9c12e4d05e 100644 --- a/ports/pcl/pcl_utils.patch +++ b/ports/pcl/pcl_utils.patch @@ -1,22 +1,28 @@ diff --git a/cmake/pcl_utils.cmake b/cmake/pcl_utils.cmake -index 41a64a269..a12718339 100644 +index f523dbc8c..a171b6d24 100644 --- a/cmake/pcl_utils.cmake +++ b/cmake/pcl_utils.cmake -@@ -105,7 +105,7 @@ macro(SET_INSTALL_DIRS) +@@ -97,21 +97,12 @@ macro(SET_INSTALL_DIRS) + if (NOT DEFINED LIB_INSTALL_DIR) + set(LIB_INSTALL_DIR "lib") endif (NOT DEFINED LIB_INSTALL_DIR) - if(NOT ANDROID) - set(INCLUDE_INSTALL_ROOT -- "include/${PROJECT_NAME_LOWER}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}") -+ "include") - else(NOT ANDROID) - set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir - endif(NOT ANDROID) -@@ -114,7 +114,7 @@ macro(SET_INSTALL_DIRS) +- if(NOT ANDROID) +- set(INCLUDE_INSTALL_ROOT +- "include/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}") +- else(NOT ANDROID) +- set(INCLUDE_INSTALL_ROOT "include") # Android, don't put into subdir +- endif(NOT ANDROID) ++ set(INCLUDE_INSTALL_ROOT "include") + set(INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_ROOT}/pcl") + set(DOC_INSTALL_DIR "share/doc/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}") set(BIN_INSTALL_DIR "bin") set(PKGCFG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig") - if(WIN32 AND NOT MINGW) +- if(WIN32 AND NOT MINGW) - set(PCLCONFIG_INSTALL_DIR "cmake") -+ set(PCLCONFIG_INSTALL_DIR "share/pcl") - else(WIN32 AND NOT MINGW) - set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}") - endif(WIN32 AND NOT MINGW) +- else(WIN32 AND NOT MINGW) +- set(PCLCONFIG_INSTALL_DIR "share/${PROJECT_NAME_LOWER}-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}") +- endif(WIN32 AND NOT MINGW) ++ set(PCLCONFIG_INSTALL_DIR "share/pcl") + endmacro(SET_INSTALL_DIRS) + + diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index 650e6de1af..4036d53468 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PointCloudLibrary/pcl - REF pcl-1.9.0 - SHA512 b2fb6cb1f8b4d203c711ac580e12946cacfba3f06bec95536e01705c63e709d488cee85d2a24b758c958972a0f4f3544a10a2c308ea637e9e23874e9de59becc + REF pcl-1.9.1 + SHA512 ca95028c23861ac2df0fa7e18fdd0202255cb2e49ab714325eb36c35289442c6eedbf489e6f9f232b30fa2a93eff4c9619f8a14d3fdfe58f353a4a6e26206bdf HEAD_REF master PATCHES pcl_utils.patch pcl_config.patch From fae3055effac47bda6f5eefaf5335309bd70816e Mon Sep 17 00:00:00 2001 From: Pavel Kisliak <37534137+PavelKisliak@users.noreply.github.com> Date: Thu, 29 Nov 2018 05:20:43 +0300 Subject: [PATCH 48/64] [bitserializer] Update to v0.8, split to two sub-libraries (#4841) --- ports/bitserializer-cpprestjson/CONTROL | 4 ++++ ports/bitserializer-cpprestjson/portfile.cmake | 13 +++++++++++++ ports/bitserializer-rapidjson/CONTROL | 4 ++++ ports/bitserializer-rapidjson/portfile.cmake | 13 +++++++++++++ ports/bitserializer/CONTROL | 5 ++--- ports/bitserializer/portfile.cmake | 6 +++--- 6 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 ports/bitserializer-cpprestjson/CONTROL create mode 100644 ports/bitserializer-cpprestjson/portfile.cmake create mode 100644 ports/bitserializer-rapidjson/CONTROL create mode 100644 ports/bitserializer-rapidjson/portfile.cmake diff --git a/ports/bitserializer-cpprestjson/CONTROL b/ports/bitserializer-cpprestjson/CONTROL new file mode 100644 index 0000000000..f75cd41a2d --- /dev/null +++ b/ports/bitserializer-cpprestjson/CONTROL @@ -0,0 +1,4 @@ +Source: bitserializer-cpprestjson +Version: 0.8 +Build-Depends: bitserializer, cpprestsdk +Description: This is an implementation of the BitSerializer archive for serialization JSON (based on CppRestSDK library). diff --git a/ports/bitserializer-cpprestjson/portfile.cmake b/ports/bitserializer-cpprestjson/portfile.cmake new file mode 100644 index 0000000000..28430d5908 --- /dev/null +++ b/ports/bitserializer-cpprestjson/portfile.cmake @@ -0,0 +1,13 @@ +include(vcpkg_common_functions) +vcpkg_from_bitbucket( + OUT_SOURCE_PATH SOURCE_PATH + REPO Pavel_Kisliak/BitSerializer + REF 0.8 + SHA512 6df5b3f7a472a55ba0aace22c44cb2adaf178fbc7f920dcaf7d7015f81badde98d64911ddb620e99a708214140d7c29561775c1b0fe60fef6f24d465a4eac093 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/archives/bitserializer_cpprest_json DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bitserializer-cpprestjson RENAME copyright) diff --git a/ports/bitserializer-rapidjson/CONTROL b/ports/bitserializer-rapidjson/CONTROL new file mode 100644 index 0000000000..db65c52aef --- /dev/null +++ b/ports/bitserializer-rapidjson/CONTROL @@ -0,0 +1,4 @@ +Source: bitserializer-rapidjson +Version: 0.8 +Build-Depends: bitserializer, rapidjson +Description: This is an implementation of the BitSerializer archive for serialization JSON (based on the RapidJson library). diff --git a/ports/bitserializer-rapidjson/portfile.cmake b/ports/bitserializer-rapidjson/portfile.cmake new file mode 100644 index 0000000000..4050b73bc9 --- /dev/null +++ b/ports/bitserializer-rapidjson/portfile.cmake @@ -0,0 +1,13 @@ +include(vcpkg_common_functions) +vcpkg_from_bitbucket( + OUT_SOURCE_PATH SOURCE_PATH + REPO Pavel_Kisliak/BitSerializer + REF 0.8 + SHA512 6df5b3f7a472a55ba0aace22c44cb2adaf178fbc7f920dcaf7d7015f81badde98d64911ddb620e99a708214140d7c29561775c1b0fe60fef6f24d465a4eac093 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/archives/bitserializer_rapidjson DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bitserializer-rapidjson RENAME copyright) diff --git a/ports/bitserializer/CONTROL b/ports/bitserializer/CONTROL index 95e36f5b9f..35e02fe030 100644 --- a/ports/bitserializer/CONTROL +++ b/ports/bitserializer/CONTROL @@ -1,4 +1,3 @@ Source: bitserializer -Version: 0.7 -Build-Depends: cpprestsdk -Description: The library for simple serialization of arbitrary C++ types to various output formats (currently just supported JSON based on CppRestSDK). +Version: 0.8 +Description: The core part of library for serialization of arbitrary C++ types to various output formats. diff --git a/ports/bitserializer/portfile.cmake b/ports/bitserializer/portfile.cmake index 5e59f0c71d..50eb93481b 100644 --- a/ports/bitserializer/portfile.cmake +++ b/ports/bitserializer/portfile.cmake @@ -2,12 +2,12 @@ include(vcpkg_common_functions) vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO Pavel_Kisliak/BitSerializer - REF 0.7 - SHA512 3a50b1b3077115f60d298f4257ae6a5a350c1d8b3d575af83b4f0746757ab3393da7c81ac9c7db4e30540fe94f1742b1d39de724b2dec080faf727b885bb19a4 + REF 0.8 + SHA512 6df5b3f7a472a55ba0aace22c44cb2adaf178fbc7f920dcaf7d7015f81badde98d64911ddb620e99a708214140d7c29561775c1b0fe60fef6f24d465a4eac093 HEAD_REF master ) -file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}) +file(INSTALL ${SOURCE_PATH}/core/bitserializer DESTINATION ${CURRENT_PACKAGES_DIR}/include) # Handle copyright file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bitserializer RENAME copyright) From f3b5ed1d24c79966158d20a03b019c4976a0215c Mon Sep 17 00:00:00 2001 From: Raynor Vliegendhart Date: Thu, 29 Nov 2018 03:22:05 +0100 Subject: [PATCH 49/64] Add IE Proxy fallback for Win7 (#4838) --- toolsrc/src/vcpkg/base/downloads.cpp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/toolsrc/src/vcpkg/base/downloads.cpp b/toolsrc/src/vcpkg/base/downloads.cpp index fad3ff1191..5715622447 100644 --- a/toolsrc/src/vcpkg/base/downloads.cpp +++ b/toolsrc/src/vcpkg/base/downloads.cpp @@ -42,6 +42,28 @@ namespace vcpkg::Downloads 0); Checks::check_exit(VCPKG_LINE_INFO, hSession, "WinHttpOpen() failed: %d", GetLastError()); + // Win7 IE Proxy fallback + if (IsWindows7OrGreater() && !IsWindows8Point1OrGreater()) { + // First check if any proxy has been found automatically + WINHTTP_PROXY_INFO proxyInfo; + DWORD proxyInfoSize = sizeof(WINHTTP_PROXY_INFO); + auto noProxyFound = + !WinHttpQueryOption(hSession, WINHTTP_OPTION_PROXY, &proxyInfo, &proxyInfoSize) + || proxyInfo.dwAccessType == WINHTTP_ACCESS_TYPE_NO_PROXY; + + // If no proxy was found automatically, use IE's proxy settings, if any + if (noProxyFound) { + WINHTTP_CURRENT_USER_IE_PROXY_CONFIG ieProxy; + if (WinHttpGetIEProxyConfigForCurrentUser(&ieProxy) && ieProxy.lpszProxy != nullptr) { + WINHTTP_PROXY_INFO proxy; + proxy.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; + proxy.lpszProxy = ieProxy.lpszProxy; + proxy.lpszProxyBypass = ieProxy.lpszProxyBypass; + WinHttpSetOption(hSession, WINHTTP_OPTION_PROXY, &proxy, sizeof(proxy)); + } + } + } + // Use Windows 10 defaults on Windows 7 DWORD secure_protocols(WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 | WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 | WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 | WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2); From e943161971653afba2fff5489158f8760ddc804a Mon Sep 17 00:00:00 2001 From: kyp Date: Thu, 29 Nov 2018 03:27:24 +0100 Subject: [PATCH 50/64] [folly] update to v2018.11.26 and fix linux build (#4832) --- ports/folly/CONTROL | 2 +- ports/folly/find-gflags.patch | 26 +++++++++++++------------- ports/folly/no-werror.patch | 24 ++++++++++++------------ ports/folly/portfile.cmake | 4 ++-- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL index f8842fec48..1711bda034 100644 --- a/ports/folly/CONTROL +++ b/ports/folly/CONTROL @@ -1,5 +1,5 @@ Source: folly -Version: 2018.11.05.00 +Version: 2018.11.26.00 Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread Default-Features: zlib diff --git a/ports/folly/find-gflags.patch b/ports/folly/find-gflags.patch index 986dd6d579..a3e0116832 100644 --- a/ports/folly/find-gflags.patch +++ b/ports/folly/find-gflags.patch @@ -1,13 +1,13 @@ -diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake -index 396fa6c..9d80d99 100644 ---- a/CMake/folly-deps.cmake -+++ b/CMake/folly-deps.cmake -@@ -22,7 +22,7 @@ list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY}) - list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR}) - - set(FOLLY_HAVE_LIBGFLAGS OFF) --find_package(GFlags CONFIG QUIET) -+find_package(gflags CONFIG REQUIRED) - if (gflags_FOUND) - message(STATUS "Found gflags from package config") - set(FOLLY_HAVE_LIBGFLAGS ON) +diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake +index 437c0cd..5530a35 100644 +--- a/CMake/folly-deps.cmake ++++ b/CMake/folly-deps.cmake +@@ -22,7 +22,7 @@ list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY}) + list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR}) + + set(FOLLY_HAVE_LIBGFLAGS OFF) +-find_package(gflags CONFIG QUIET) ++find_package(gflags CONFIG REQUIRED) + if (gflags_FOUND) + message(STATUS "Found gflags from package config") + set(FOLLY_HAVE_LIBGFLAGS ON) diff --git a/ports/folly/no-werror.patch b/ports/folly/no-werror.patch index e9ec920dce..32fbc94943 100644 --- a/ports/folly/no-werror.patch +++ b/ports/folly/no-werror.patch @@ -1,12 +1,12 @@ -diff --git a/CMake/FollyCompilerUnix.cmake b/CMake/FollyCompilerUnix.cmake -index b7d994b..a518cbe 100644 ---- a/CMake/FollyCompilerUnix.cmake -+++ b/CMake/FollyCompilerUnix.cmake -@@ -16,7 +16,6 @@ function(apply_folly_compile_options_to_target THETARGET) - -std=gnu++14 - -finput-charset=UTF-8 - -fsigned-char -- -Werror - -Wall - -Wno-deprecated - -Wdeprecated-declarations +diff --git a/CMake/FollyCompilerUnix.cmake b/CMake/FollyCompilerUnix.cmake +index a9cc2c1..de7d714 100644 +--- a/CMake/FollyCompilerUnix.cmake ++++ b/CMake/FollyCompilerUnix.cmake +@@ -34,7 +34,6 @@ function(apply_folly_compile_options_to_target THETARGET) + -std=${CXX_STD} + -finput-charset=UTF-8 + -fsigned-char +- -Werror + -Wall + -Wno-deprecated + -Wno-deprecated-declarations diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index bb15bf859d..c66599f7e2 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -17,8 +17,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF v2018.11.05.00 - SHA512 08eee201c2b1179a4e52398cc65964fb299abfb95934687f4ce3d72df1ff70493964835d5e52c8821c63553e0be0d578e1130e50e353a7eab6b0334532e4df2e + REF v2018.11.26.00 + SHA512 7a404df7287c9a3278bc47205023881ade188a1d3ade35748ae9ae4f35485faedc9f8c0264cfd0f3565b2d5891235deda0f515946a2c313570ef41751a3693ac HEAD_REF master PATCHES find-gflags.patch From 593d3af5b93284a4decb8f85d7b3f224acc9f5c7 Mon Sep 17 00:00:00 2001 From: Jelani Brandon Date: Wed, 28 Nov 2018 22:53:39 -0800 Subject: [PATCH 51/64] Update Azure Iot C SDK repo's SHA for the latest release (#4833) * Update Azure Iot C SDK repo's SHA for the latest release * [azure-uhttp-c] Fix hash --- ports/azure-c-shared-utility/CONTROL | 2 +- ports/azure-c-shared-utility/portfile.cmake | 4 ++-- ports/azure-iot-sdk-c/CONTROL | 2 +- ports/azure-iot-sdk-c/portfile.cmake | 4 ++-- ports/azure-uamqp-c/CONTROL | 2 +- ports/azure-uamqp-c/portfile.cmake | 4 ++-- ports/azure-uhttp-c/CONTROL | 2 +- ports/azure-uhttp-c/portfile.cmake | 4 ++-- ports/azure-umqtt-c/CONTROL | 2 +- ports/azure-umqtt-c/portfile.cmake | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL index 7a19242e97..c5e51adaf0 100644 --- a/ports/azure-c-shared-utility/CONTROL +++ b/ports/azure-c-shared-utility/CONTROL @@ -1,4 +1,4 @@ Source: azure-c-shared-utility -Version: 1.1.10-1 +Version: 1.1.11-1 Description: Azure C SDKs common code Build-Depends: curl (linux), openssl (linux) diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index 0d2d8a4930..838528ce4b 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF 68ede5bbc58c7d976f3bd68325edec181c254e5e - SHA512 97253c081cab90c7c879da9ecfa076be43d19fd0d442d91fcab8ab3149e792b868c363c56b5afc3e3880a18b400e663661d257237d2f1ef97544522a1cabcd5a + REF bcf6393b1ce3cecf0fcdf8988621fd6e4d414df3 + SHA512 e5ae3c895777df90e725da7686939b46fa4df19ce5626bbe13a5aaf1b844ee56c96ddf2a9ad8426a96cdc34e8be338c95b6759e618143e19445c5180fb0f7ed1 HEAD_REF master ) diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL index 69c813f3ce..9c9410bfef 100644 --- a/ports/azure-iot-sdk-c/CONTROL +++ b/ports/azure-iot-sdk-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-iot-sdk-c -Version: 1.2.10-1 +Version: 1.2.11-1 Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson Description: A C99 SDK for connecting devices to Microsoft Azure IoT services diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index 17893f17e3..6ec8ba3eb7 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-iot-sdk-c - REF 0ca9b92d4ff7f7a44fe1687e81f919bd7dcaa944 - SHA512 a4d43d5615d3571fda29f3d47467b816745f939941da899df799a0c4cf09c920c20b924aa29e2e2d6f4a19b81ff83969e773b6cf333bec9e2170376fe07b42ec + REF acff8b1677150cb165a7b111745144cf8fab76cc + SHA512 7e7e0679d48e76539a607a593b1c9ccc57eeb4f8bf33fb49051ad99203d1568f0ac2a38fe32ba0b3670cea32a2318e8c135c709ba5712f95cd8005ff21572e28 HEAD_REF master PATCHES improve-external-deps.patch ) diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL index f56ab20f3a..8f5f63c082 100644 --- a/ports/azure-uamqp-c/CONTROL +++ b/ports/azure-uamqp-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-uamqp-c -Version: 1.2.10-1 +Version: 1.2.11-1 Build-Depends: azure-c-shared-utility Description: AMQP library for C diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake index c2e08baf04..0f75910995 100644 --- a/ports/azure-uamqp-c/portfile.cmake +++ b/ports/azure-uamqp-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uamqp-c - REF ec107011716bc797d3d7a4a4a1141df4367038a3 - SHA512 db25018a6f93a29da4bae8426f6e021a0d823075375f69f617c6aba776f5ac6ed5107e055f0a436f22ede2057045d28fab15607a58703c6c43937abec87ab076 + REF 075b5a669f49b9d3b68b7bf9b465fe92e1c740aa + SHA512 54b7c9ebdaca13d44634e99a064aac54e9eadaedcbed723aabc62c70414ef54d62c5f58ddc836e8020eba4ca0d03d27c2d73391d4071f973fda228866215ec58 HEAD_REF master ) diff --git a/ports/azure-uhttp-c/CONTROL b/ports/azure-uhttp-c/CONTROL index be45af1100..e415436873 100644 --- a/ports/azure-uhttp-c/CONTROL +++ b/ports/azure-uhttp-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-uhttp-c -Version: 1.1.10-1 +Version: 1.1.11-2 Build-Depends: azure-c-shared-utility Description: Azure HTTP Library written in C diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake index a4bb1c67bf..de34ba4ddd 100644 --- a/ports/azure-uhttp-c/portfile.cmake +++ b/ports/azure-uhttp-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uhttp-c - REF 8ec55bb8596dae1154ae897b5064b8eba34c136c - SHA512 73b861409dede5c1936711ec04e76e8467dadc08acda6ac1b832046a4f9b2f6d35403c01acb818b5655c2c43f700d9f83edf11b8b00f7a565f260700a12c9f7c + REF ed7d104c4ab96aaa68e429066953874f12be70eb + SHA512 512f8fd46dbc40ff79ffdbc2ea881a29aaa72db4c36f16f96f30a224220183e295d8e39a4965d788f92f4976fa6d37b197c04b32bbd187d456d5c5d516b95c9f HEAD_REF master ) diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL index 3466cc49de..9a5f5e030f 100644 --- a/ports/azure-umqtt-c/CONTROL +++ b/ports/azure-umqtt-c/CONTROL @@ -1,4 +1,4 @@ Source: azure-umqtt-c -Version: 1.1.10-1 +Version: 1.1.11-1 Build-Depends: azure-c-shared-utility Description: General purpose library for communication over the mqtt protocol diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake index c2825a6814..cb14cfaa8a 100644 --- a/ports/azure-umqtt-c/portfile.cmake +++ b/ports/azure-umqtt-c/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF e5ab6b66ccba5a7ff7ed7421ffe0fa13ecabe000 - SHA512 19878f798d73f98afdee6ac574e136f1b2f8ddd3a7537ee666a98d04cade6ecd2526714eb74335af2eff05165492933ec90cb79a9cb914093fa96cfe35a84cb4 + REF ff05514c9b4742ae8d7785719a399a7fe6eac09b + SHA512 d750390d38555ab00e5d5cc5aa0b07ae452afd2e2af0dade5fc1c55f63ad367688b5ff7e97e65ab00f0153340b8bcc1e5039e80e5795b9f9c0cd2c48eedad081 HEAD_REF master ) From 09103d12a02ac588fe875235c3661ad4bc8cd46a Mon Sep 17 00:00:00 2001 From: Juha Sointusalo Date: Thu, 29 Nov 2018 08:55:18 +0200 Subject: [PATCH 52/64] [wxwidgets] move setup.h to include (#4846) * [wxwidgets] move setup.h to include Also remove lib/mswu and debug/lib/mswud. They only contain setup.h. Fixes #3180. Closes #4251. * [wxwidgets] remove include/msvc directory The only thing in include/msvc is include/msvc/wx/setup.h which is a "wrapper" around the real setup.h. The wrapper setup.h is hard-coded to include the real setup.h from lib but since the real setup.h is now in include/wx the wrapper has become useless. * [wxwidgets] Fix osx build. Slight modernization. --- ports/wxwidgets/CONTROL | 2 +- ports/wxwidgets/portfile.cmake | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ports/wxwidgets/CONTROL b/ports/wxwidgets/CONTROL index 48ceab120c..af985fa674 100644 --- a/ports/wxwidgets/CONTROL +++ b/ports/wxwidgets/CONTROL @@ -1,4 +1,4 @@ Source: wxwidgets -Version: 3.1.1 +Version: 3.1.1-2 Description: wxWidgets is a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. Build-Depends: zlib, libpng, tiff, expat diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index e18b8a6baa..0622389461 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -5,11 +5,7 @@ vcpkg_from_github( REF v3.1.1 SHA512 f6d8974e2f48bae7e96a8938df3ad5efc403036c1dcbe2b48edd276ee7923802ba3e95e3f3bd9db17985e427b8e4f78950df0cbba83ae99d508ed04633816c95 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/disable-platform-lib-dir.patch" + PATCHES disable-platform-lib-dir.patch ) vcpkg_configure_cmake( @@ -48,4 +44,11 @@ endif() # Handle copyright file(COPY ${SOURCE_PATH}/docs/licence.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxwidgets) file(RENAME ${CURRENT_PACKAGES_DIR}/share/wxwidgets/licence.txt ${CURRENT_PACKAGES_DIR}/share/wxwidgets/copyright) + +if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h ${CURRENT_PACKAGES_DIR}/include/wx/setup.h) +endif() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/mswu) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/mswud) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/msvc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) From 4c6950adcb4a442e24b43af6643720c41a80fdc8 Mon Sep 17 00:00:00 2001 From: Casey Carter Date: Thu, 29 Nov 2018 19:24:40 -0800 Subject: [PATCH 53/64] [range-v3] Update to cf8add9 (#4865) ...which works around LWG 3170. --- ports/range-v3/CONTROL | 2 +- ports/range-v3/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/range-v3/CONTROL b/ports/range-v3/CONTROL index 09afae49cf..076c712112 100644 --- a/ports/range-v3/CONTROL +++ b/ports/range-v3/CONTROL @@ -1,3 +1,3 @@ Source: range-v3 -Version: 0.4.0-20181122 +Version: 0.4.0-20181129 Description: Range library for C++11/14/17. diff --git a/ports/range-v3/portfile.cmake b/ports/range-v3/portfile.cmake index cbdf042275..f7577c9bb9 100644 --- a/ports/range-v3/portfile.cmake +++ b/ports/range-v3/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ericniebler/range-v3 - REF 00d4676502aa257a3ce934b50555211b4791ae05 - SHA512 a0067e1b0d1d2261c2f868ebc57278b74a081ccc00dcd65648b5c362317c6cd3321fb3b9936733d839cd9d48cf801d1f23710bce9e33edd9dfa8f32556d90526 + REF cf8add9f467aac695b9fa38e168b90df36b1a806 + SHA512 92b1c09a423f6672b710abfde886b28d789a030f0f5db1c340ab75eead4abcf1a8b213adeb197af92747678873b1cae62362ee878c2a6bb38e532b0e83ac7bb2 HEAD_REF master ) From 724ed8cf4e2f6d6c23bd42e36ef5326b7e829248 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Thu, 29 Nov 2018 19:00:40 +0800 Subject: [PATCH 54/64] [cpp-taskflow] Add new port --- ports/cpp-taskflow/CONTROL | 3 +++ ports/cpp-taskflow/portfile.cmake | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 ports/cpp-taskflow/CONTROL create mode 100644 ports/cpp-taskflow/portfile.cmake diff --git a/ports/cpp-taskflow/CONTROL b/ports/cpp-taskflow/CONTROL new file mode 100644 index 0000000000..4abf5457fc --- /dev/null +++ b/ports/cpp-taskflow/CONTROL @@ -0,0 +1,3 @@ +Source: cpp-taskflow +Version: 2018-11-30 +Description: Fast Parallel Tasking Programming Library using Modern C++. diff --git a/ports/cpp-taskflow/portfile.cmake b/ports/cpp-taskflow/portfile.cmake new file mode 100644 index 0000000000..1f596f0d49 --- /dev/null +++ b/ports/cpp-taskflow/portfile.cmake @@ -0,0 +1,29 @@ +# header-only library + +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO cpp-taskflow/cpp-taskflow + REF 97252f7d782c6e896122645175c08131ce10e649 + SHA512 df8ae9ea449663cb548f3c37346c2e0c785add2d86b9c618aea2741d81fe88c34b0d3d0e610a4b571973f9bc18631becedfe28e029ecf0c0cc87e4c35a280a29 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DTF_BUILD_EXAMPLES=OFF + -DTF_BUILD_TESTS=OFF + -DTF_BUILD_BENCHMARKS=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/cpp-taskflow/copyright COPYONLY) From 0dcfc13003da120b1365fedf0fb9c5e0f137aab0 Mon Sep 17 00:00:00 2001 From: kjpus <35301243+kjpus@users.noreply.github.com> Date: Fri, 30 Nov 2018 13:25:05 -0500 Subject: [PATCH 55/64] Update CMakeLists.txt to include hash/* --- ports/abseil/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/abseil/CMakeLists.txt b/ports/abseil/CMakeLists.txt index b4b8a646dd..d98914e604 100644 --- a/ports/abseil/CMakeLists.txt +++ b/ports/abseil/CMakeLists.txt @@ -62,6 +62,7 @@ add_sublibrary(algorithm) add_sublibrary(base) add_sublibrary(container) add_sublibrary(debugging) +add_sublibrary(hash) add_sublibrary(memory) add_sublibrary(meta) add_sublibrary(numeric) @@ -75,6 +76,7 @@ add_sublibrary(utility) target_link_public_libraries(algorithm base meta) target_link_public_libraries(container algorithm base memory) target_link_public_libraries(debugging base) +target_link_public_libraries(hash base) target_link_public_libraries(memory meta) target_link_public_libraries(meta base) target_link_public_libraries(numeric base) From 8b46548826864d5ab96264a127becc6a01f13cf5 Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Fri, 30 Nov 2018 16:01:31 -0800 Subject: [PATCH 56/64] patch missing @ in cmake config --- ports/gflags/CONTROL | 2 +- ports/gflags/fix_cmake_config.patch | 13 +++++++++++++ ports/gflags/portfile.cmake | 7 ++----- 3 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 ports/gflags/fix_cmake_config.patch diff --git a/ports/gflags/CONTROL b/ports/gflags/CONTROL index bf0800eec0..b090f2ba51 100644 --- a/ports/gflags/CONTROL +++ b/ports/gflags/CONTROL @@ -1,3 +1,3 @@ Source: gflags -Version: 2.2.2 +Version: 2.2.2-1 Description: A C++ library that implements commandline flags processing diff --git a/ports/gflags/fix_cmake_config.patch b/ports/gflags/fix_cmake_config.patch new file mode 100644 index 0000000000..bea561ecba --- /dev/null +++ b/ports/gflags/fix_cmake_config.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in +index a512c2a..e7f50d0 100644 +--- a/cmake/config.cmake.in ++++ b/cmake/config.cmake.in +@@ -78,7 +78,7 @@ if (NOT DEFINED @PACKAGE_PREFIX@_NOTHREADS) + else () + set (@PACKAGE_PREFIX@_NOTHREADS FALSE) + endif () +- elseif (TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}PACKAGE_NAME@_static OR TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_shared) ++ elseif (TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_static OR TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_shared) + set (@PACKAGE_PREFIX@_NOTHREADS FALSE) + else () + set (@PACKAGE_PREFIX@_NOTHREADS TRUE) diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake index 11ef0cd935..87053f8499 100644 --- a/ports/gflags/portfile.cmake +++ b/ports/gflags/portfile.cmake @@ -10,12 +10,9 @@ vcpkg_from_github( REF v2.2.2 SHA512 98c4703aab24e81fe551f7831ab797fb73d0f7dfc516addb34b9ff6d0914e5fd398207889b1ae555bac039537b1d4677067dae403b64903577078d99c1bdb447 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/0001-patch-dir.patch # gflags was estimating a wrong relative path between the gflags-config.cmake file and the include path; "../.." goes from share/gflags/ to the triplet root + 0001-patch-dir.patch # gflags was estimating a wrong relative path between the gflags-config.cmake file and the include path; "../.." goes from share/gflags/ to the triplet root + fix_cmake_config.patch ) vcpkg_configure_cmake( From 8346836471a672d536d7a41fd8a0814073c9848f Mon Sep 17 00:00:00 2001 From: Raphael Gozzo Date: Fri, 30 Nov 2018 22:37:54 -0200 Subject: [PATCH 57/64] [curl] Build openssl and schannel backends by default (#3932) * [curl] Split the OpenSSL and SChannel backends into separate features * [curl] Add mbedTLS backend as a feature * [curl] Make winssl the default for Windows. Remove need for compatibility workaround. * [curl] Continue to use openssl in UWP because PSecurityFunctionTableA is not available. --- ports/curl/CONTROL | 19 +++++++++++++++---- ports/curl/portfile.cmake | 31 ++++++++++++++++++++----------- 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 95040eba1f..f76c991245 100644 --- a/ports/curl/CONTROL +++ b/ports/curl/CONTROL @@ -1,9 +1,8 @@ Source: curl -Version: 7.61.1-1 +Version: 7.61.1-2 Build-Depends: zlib Description: A library for transferring data with URLs Default-Features: ssl -# For WINSSL add set(CURL_USE_WINSSL ON) to your triplet file Feature: tool Description: Builds curl executable @@ -16,9 +15,21 @@ Build-Depends: nghttp2, curl[ssl] Description: HTTP2 support Feature: ssl -Build-Depends: openssl -Description: SSL support +Build-Depends: curl[openssl] (!windows), curl[winssl] (windows) +Description: Default SSL backend Feature: ssh Build-Depends: libssh2, curl[non-http] Description: SSH support via libssh2 + +# SSL backends +Feature: openssl +Build-Depends: openssl +Description: SSL support (OpenSSL) + +Feature: winssl +Description: SSL support (Secure Channel / "WinSSL") + +Feature: mbedtls +Build-Depends: mbedtls +Description: SSL support (mbedTLS) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 0b156c4d08..534a54aea0 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -7,15 +7,15 @@ vcpkg_from_github( SHA512 09fa3c87f8d516eabe3241247a5094c32ee0481961cf85bf78ecb13acdf23bb2ec82f113d2660271d22742c79e76d73fb122730fa28e34c7f5477c05a4a6534c HEAD_REF master PATCHES - ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch - ${CMAKE_CURRENT_LIST_DIR}/0002_fix_uwp.patch - ${CMAKE_CURRENT_LIST_DIR}/0003_fix_libraries.patch - ${CMAKE_CURRENT_LIST_DIR}/0004_nghttp2_staticlib.patch + 0001_cmake.patch + 0002_fix_uwp.patch + 0003_fix_libraries.patch + 0004_nghttp2_staticlib.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB) -# Support HTTP2 TSL Download https://curl.haxx.se/ca/cacert.pem rename to curl-ca-bundle.crt, copy it to libcurl.dll location. +# Support HTTP2 TLS Download https://curl.haxx.se/ca/cacert.pem rename to curl-ca-bundle.crt, copy it to libcurl.dll location. set(HTTP2_OPTIONS) if("http2" IN_LIST FEATURES) set(HTTP2_OPTIONS -DUSE_NGHTTP2=ON) @@ -23,13 +23,21 @@ endif() # SSL set(USE_OPENSSL OFF) +if("openssl" IN_LIST FEATURES) + set(USE_OPENSSL ON) +endif() + set(USE_WINSSL OFF) -if("ssl" IN_LIST FEATURES) - if(CURL_USE_WINSSL) - set(USE_WINSSL ON) - else() - set(USE_OPENSSL ON) +if("winssl" IN_LIST FEATURES) + if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "winssl is not supported on non-Windows platforms") endif() + set(USE_WINSSL ON) +endif() + +set(USE_MBEDTLS OFF) +if("mbedtls" IN_LIST FEATURES) + set(USE_MBEDTLS ON) endif() # SSH @@ -64,7 +72,7 @@ endif() vcpkg_find_acquire_program(PERL) get_filename_component(PERL_PATH ${PERL} DIRECTORY) -set(ENV{PATH} "$ENV{PATH};${PERL_PATH}") +vcpkg_add_to_path(${PERL_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -78,6 +86,7 @@ vcpkg_configure_cmake( -DCURL_STATICLIB=${CURL_STATICLIB} -DCMAKE_USE_OPENSSL=${USE_OPENSSL} -DCMAKE_USE_WINSSL=${USE_WINSSL} + -DCMAKE_USE_MBEDTLS=${USE_MBEDTLS} -DCMAKE_USE_LIBSSH2=${USE_LIBSSH2} -DHTTP_ONLY=${USE_HTTP_ONLY} OPTIONS_RELEASE From 8dd8bc10df85c2f0e72e9bad3a9245cafd0b93fe Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 30 Nov 2018 16:48:21 -0800 Subject: [PATCH 58/64] [cpprestsdk] Update to v2.10.8 and add brotli feature. (#4617) The brotli feature is on by default for Windows only. We think it'll probably work on other platforms but haven't tested that extensively. --- ports/cpprestsdk/CONTROL | 12 ++++++++++-- ports/cpprestsdk/portfile.cmake | 20 +++++++++----------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL index 800d54d421..e5da66ef70 100644 --- a/ports/cpprestsdk/CONTROL +++ b/ports/cpprestsdk/CONTROL @@ -1,10 +1,18 @@ Source: cpprestsdk -Version: 2.10.6-3 +Version: 2.10.7 Build-Depends: zlib, openssl (!uwp&!windows), boost-system (!uwp&!windows), boost-date-time (!uwp&!windows), boost-regex (!uwp&!windows), boost-thread (!uwp&!windows), boost-filesystem (!uwp&!windows), boost-random (!uwp&!windows), boost-chrono (!uwp&!windows) Description: C++11 JSON, REST, and OAuth library The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services. -Default-Features: websockets +Default-Features: default-features + +Feature: default-features +Build-Depends: cpprestsdk[brotli] (windows), cpprestsdk[websockets] +Description: Features installed by default Feature: websockets Build-Depends: websocketpp (!uwp), openssl (!uwp), boost-system (!uwp), boost-date-time (!uwp), boost-regex (!uwp) Description: Websockets support + +Feature: brotli +Build-Depends: brotli +Description: Brotli compression support diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake index c94b01b806..d6390836cb 100644 --- a/ports/cpprestsdk/portfile.cmake +++ b/ports/cpprestsdk/portfile.cmake @@ -3,8 +3,8 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/cpprestsdk - REF v2.10.6 - SHA512 f0848f329df80ced68132600914f0f4ba1ed42c7c16188e0f2bd41cf0c50173c27ca42c8db72ff239ca881bc8789fa4d1e3189c492832f6c22d36d504b7ce8dd + REF v2.10.8 + SHA512 d80a7db59cfe81d8e0c645acff7bcc2ed9ad04e2f3d14dc4ab2a624290d0ea43a2c7adebb54b52a166fd07375352cfd5f1fe244d7c062ce94ec60b977437b2df HEAD_REF master ) @@ -21,6 +21,11 @@ if("websockets" IN_LIST FEATURES) set(CPPREST_EXCLUDE_WEBSOCKETS OFF) endif() +set(CPPREST_EXCLUDE_BROTLI ON) +if ("brotli" IN_LIST FEATURES) + set(CPPREST_EXCLUDE_BROTLI OFF) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/Release PREFER_NINJA @@ -37,18 +42,11 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -if (EXISTS "${CURRENT_PACKAGES_DIR}/lib/share") # transition - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/share/cpprestsdk) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/share ${CURRENT_PACKAGES_DIR}/lib/share) -else() - vcpkg_fixup_cmake_targets() # v2.10.6 and below -endif() - - +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/share/cpprestsdk) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/share ${CURRENT_PACKAGES_DIR}/lib/share) file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cpprestsdk RENAME copyright) vcpkg_copy_pdbs() - From a91d1538592ed7532a39a4532deac867ee13ed26 Mon Sep 17 00:00:00 2001 From: Force Charlie Date: Sat, 1 Dec 2018 09:46:45 +0800 Subject: [PATCH 59/64] [nghttp2] Update nghttp2 to 1.35.0 --- ports/nghttp2/CONTROL | 2 +- ports/nghttp2/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/nghttp2/CONTROL b/ports/nghttp2/CONTROL index eb070c132f..d68720137e 100644 --- a/ports/nghttp2/CONTROL +++ b/ports/nghttp2/CONTROL @@ -1,3 +1,3 @@ Source: nghttp2 -Version: 1.34.0 +Version: 1.35.0 Description: Implementation of the Hypertext Transfer Protocol version 2 in C diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake index cf80ecd669..52f754afb9 100644 --- a/ports/nghttp2/portfile.cmake +++ b/ports/nghttp2/portfile.cmake @@ -1,7 +1,7 @@ include(vcpkg_common_functions) set(LIB_NAME nghttp2) -set(LIB_VERSION 1.34.0) +set(LIB_VERSION 1.35.0) set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.gz) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION}) @@ -9,7 +9,7 @@ set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/nghttp2/nghttp2/releases/download/v${LIB_VERSION}/${LIB_FILENAME}" FILENAME "${LIB_FILENAME}" - SHA512 f027f8e043c58710ff34a65c705c0a76d91ffbf20f684606dbbbecc10f0e1fbc98a41047b8df5061af0bda6e8f89a9587e33c6549181f9317c4d3336e4a8b62e + SHA512 65889545684e2c8b4aeeb7084ca36e3f78927fa2b6d1df906af3970d8ce6c7c6093b56a5e0713f7bb54a98f06ad52d6e2b323e760297610702afe526b0fdd577 ) vcpkg_extract_source_archive(${ARCHIVE}) From cc0a70e4bbc7b12e6c0df7f9daaa76d1076ee993 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Sun, 2 Dec 2018 12:04:15 +0800 Subject: [PATCH 60/64] [libui] Add new port (#4810) * [libui] Add new port * [libui] Rename package to be unofficial-libui --- ports/libui/CONTROL | 3 +++ ports/libui/fix-cmake.patch | 46 +++++++++++++++++++++++++++++++++++++ ports/libui/portfile.cmake | 27 ++++++++++++++++++++++ 3 files changed, 76 insertions(+) create mode 100644 ports/libui/CONTROL create mode 100644 ports/libui/fix-cmake.patch create mode 100644 ports/libui/portfile.cmake diff --git a/ports/libui/CONTROL b/ports/libui/CONTROL new file mode 100644 index 0000000000..d1a70f0d52 --- /dev/null +++ b/ports/libui/CONTROL @@ -0,0 +1,3 @@ +Source: libui +Version: 2018-11-03 +Description: Simple and portable (but not inflexible) native GUI library in C. diff --git a/ports/libui/fix-cmake.patch b/ports/libui/fix-cmake.patch new file mode 100644 index 0000000000..3d206584bb --- /dev/null +++ b/ports/libui/fix-cmake.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c7193fbb..50c997f8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -152,8 +152,7 @@ add_subdirectory("common") + add_subdirectory("${_OSNAME}") + add_library(libui ${_LIBUI_SOURCES}) + target_include_directories(libui +- PUBLIC . +- PRIVATE ${_LIBUI_INCLUEDIRS}) ++ PUBLIC $) + target_compile_definitions(libui + PRIVATE ${_LIBUI_DEFS}) + # cmake produces this for us by default but only for shared libraries +@@ -229,10 +228,30 @@ macro(_add_exec _name) + # TODOfor some reason these don't propagate + if(NOT WIN32) + target_include_directories(${_name} +- PUBLIC .) ++ PUBLIC $) + target_compile_options(${_name} + PUBLIC ${_COMMON_CFLAGS}) + endif() + endmacro() + add_subdirectory("test") + add_subdirectory("examples") ++ ++if(BUILD_SHARED_LIBS) ++ install(TARGETS ${PROJECT_NAME} ++ EXPORT ${PROJECT_NAME}-config ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++else() ++ install(TARGETS ${PROJECT_NAME} ++ EXPORT ${PROJECT_NAME}-config ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++endif() ++ ++install(EXPORT ${PROJECT_NAME}-config ++ FILE unofficial-${PROJECT_NAME}-config.cmake ++ NAMESPACE unofficial::libui:: ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++) ++ ++install(FILES ui.h DESTINATION include) diff --git a/ports/libui/portfile.cmake b/ports/libui/portfile.cmake new file mode 100644 index 0000000000..4f543a89b5 --- /dev/null +++ b/ports/libui/portfile.cmake @@ -0,0 +1,27 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO andlabs/libui + REF 7138276ccfbde94873cb6e2db65642adcbd2ee19 + SHA512 3a9fb27d0c376479f58ba2fc5be3579efa5f462776a7e725313b92413ce78f3ca60897e63b580c419eeaee2cd2101de2be1ee5af80a547ef433c6284a3053d45 + HEAD_REF master + PATCHES + fix-cmake.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libui TARGET_PATH share/unofficial-libui) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +# Handle copyright +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/libui/copyright COPYONLY) + +vcpkg_copy_pdbs() From 59431acbc74cbd68f85cf06bc5f1895febd6a54e Mon Sep 17 00:00:00 2001 From: Simon Brand Date: Mon, 3 Dec 2018 08:44:24 +0000 Subject: [PATCH 61/64] [CTRE] New port --- ports/ctre/CONTROL | 3 +++ ports/ctre/portfile.cmake | 15 +++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 ports/ctre/CONTROL create mode 100644 ports/ctre/portfile.cmake diff --git a/ports/ctre/CONTROL b/ports/ctre/CONTROL new file mode 100644 index 0000000000..3351ecf258 --- /dev/null +++ b/ports/ctre/CONTROL @@ -0,0 +1,3 @@ +Source: ctre +Version: 2.2-1 +Description: A Compile time PCRE (almost) compatible regular expression matcher diff --git a/ports/ctre/portfile.cmake b/ports/ctre/portfile.cmake new file mode 100644 index 0000000000..76a4a7857d --- /dev/null +++ b/ports/ctre/portfile.cmake @@ -0,0 +1,15 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO hanickadot/compile-time-regular-expressions + REF v2.2 + SHA512 f6f18e3e5bc654ff94cd540a3b665615151678541575dfc8d4113c317fba5ea83f57694dc330c174110e6263c9b64a128f2a9234cc626a952e7518c423fda703 + HEAD_REF master +) + +# Install header files +file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ctre RENAME copyright) From 23384daca676eb97d612b63b2fae2761c74b9466 Mon Sep 17 00:00:00 2001 From: Bob Kast Date: Mon, 3 Dec 2018 12:24:45 -0500 Subject: [PATCH 62/64] Support ECSUtil 1.0.1.4 --- ports/ecsutil/CONTROL | 2 +- ports/ecsutil/NoLibSyms.patch | 41 +++++++++++++++++++++++++++++++++++ ports/ecsutil/portfile.cmake | 5 +++-- 3 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 ports/ecsutil/NoLibSyms.patch diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL index 4bcfb031b0..c96e1b0b8e 100644 --- a/ports/ecsutil/CONTROL +++ b/ports/ecsutil/CONTROL @@ -1,4 +1,4 @@ Source: ecsutil -Version: 1.0.1.3 +Version: 1.0.1.4 Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. Build-Depends: atlmfc diff --git a/ports/ecsutil/NoLibSyms.patch b/ports/ecsutil/NoLibSyms.patch new file mode 100644 index 0000000000..e4f7e77bdf --- /dev/null +++ b/ports/ecsutil/NoLibSyms.patch @@ -0,0 +1,41 @@ + ECSUtil/ECSUtil.vcxproj | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/ECSUtil/ECSUtil.vcxproj b/ECSUtil/ECSUtil.vcxproj +index 05c5726..4b5de57 100644 +--- a/ECSUtil/ECSUtil.vcxproj ++++ b/ECSUtil/ECSUtil.vcxproj +@@ -289,7 +289,7 @@ + true + false + false +- ProgramDatabase ++ None + + + Windows +@@ -317,7 +317,7 @@ + true + false + false +- ProgramDatabase ++ None + + + Windows +@@ -462,6 +462,7 @@ + true + false + false ++ None + + + Windows +@@ -493,6 +494,7 @@ + true + false + false ++ None + + + Windows diff --git a/ports/ecsutil/portfile.cmake b/ports/ecsutil/portfile.cmake index ff8d8a6b19..0dc5fa8fa2 100644 --- a/ports/ecsutil/portfile.cmake +++ b/ports/ecsutil/portfile.cmake @@ -28,9 +28,10 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO EMCECS/ecs-object-client-windows-cpp - REF v1.0.1.3 - SHA512 0c79e522c687aa942e018f5bab619522523b3efee6e421439bda2a93dfa8e2c2665e136a6aae9cba2f8637c296822b91127cd06053c2a39be4e3324cd1792dda + REF v1.0.1.4 + SHA512 796ed227268cd92fce3eba2a842260d552222900b1df1261200032a7678a48776388dd566f408df2ee4dbc0cee39b70090d524a99e6741e0c8f92594d207761a HEAD_REF master + PATCHES NoLibSyms.patch ) vcpkg_install_msbuild( From 5edd66af9b4105561816c595616a4445520b7c8f Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Tue, 4 Dec 2018 13:33:50 -0800 Subject: [PATCH 63/64] Add local FILENAME --- ports/ace/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 4ec2bc48c6..e10e82e0e2 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -10,6 +10,7 @@ include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers/ace) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_3/ACE-6.5.3.zip" + FILENAME ACE-6.5.3.zip SHA512 1c24c7a138b6580e0f2a71d3e797ed846a3c046854c19d10175198dc519b610b2ac684d6e0e3999705319304b6eee3f09405cb43ce48a869d2f1446342da469d ) vcpkg_extract_source_archive(${ARCHIVE}) From 8a71f22e88afe45b0c3efe3c2141a721ecaace6a Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Tue, 4 Dec 2018 14:28:14 -0800 Subject: [PATCH 64/64] [abseil] bump dash version number in CONTROL Bump dash version number so it will trigger a rebuild for those who already the package installed. --- ports/abseil/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL index f616b86083..95191fcf00 100644 --- a/ports/abseil/CONTROL +++ b/ports/abseil/CONTROL @@ -1,5 +1,5 @@ Source: abseil -Version: 2018-11-08 +Version: 2018-11-08-1 Description: an open-source collection designed to augment the C++ standard library. Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives. In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.