From 4ecf9aa09e05d59e56bf2d53ac267fc81626f603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ernesto=20Basc=C3=B3n=20Pantoja?= Date: Tue, 11 Apr 2017 00:18:20 -0400 Subject: Added picojson 1.3.1 --- ports/picojson/CONTROL | 4 ++++ ports/picojson/portfile.cmake | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 ports/picojson/CONTROL create mode 100644 ports/picojson/portfile.cmake diff --git a/ports/picojson/CONTROL b/ports/picojson/CONTROL new file mode 100644 index 000000000..8128aa099 --- /dev/null +++ b/ports/picojson/CONTROL @@ -0,0 +1,4 @@ +Source: picojson +Version: 1.3.1 +Description: A header-file-only, JSON parser serializer in C++. + diff --git a/ports/picojson/portfile.cmake b/ports/picojson/portfile.cmake new file mode 100644 index 000000000..91f2f2aa5 --- /dev/null +++ b/ports/picojson/portfile.cmake @@ -0,0 +1,18 @@ + +include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/picojson-master) +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/kazuho/picojson/archive/master.zip" + FILENAME "picojson-1.3.1.zip" + SHA512 961138c1233ee960c8810cd0e53af27b42956ec0ed4017085b2330417833f91ba728dd76e64ece019a37eb5f8a857cc57d36c3370a27707d995091ab409c4819 +) +vcpkg_extract_source_archive(${ARCHIVE}) + +# Put the licence file where vcpkg expects it +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/picojson) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/picojson/LICENSE ${CURRENT_PACKAGES_DIR}/share/picojson/copyright) + +# Copy the header files +file(INSTALL ${SOURCE_PATH}/picojson.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/picojson) + +vcpkg_copy_pdbs() -- cgit v1.2.3 From ed6930bd618d909fecacacffcd6765d45fb91d61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ernesto=20Basc=C3=B3n=20Pantoja?= Date: Thu, 13 Apr 2017 01:22:02 -0400 Subject: Using 1.3.0 instead of master as suggested by ras0219-msft --- ports/picojson/CONTROL | 2 +- ports/picojson/portfile.cmake | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ports/picojson/CONTROL b/ports/picojson/CONTROL index 8128aa099..a871ae3d4 100644 --- a/ports/picojson/CONTROL +++ b/ports/picojson/CONTROL @@ -1,4 +1,4 @@ Source: picojson -Version: 1.3.1 +Version: 1.3.0 Description: A header-file-only, JSON parser serializer in C++. diff --git a/ports/picojson/portfile.cmake b/ports/picojson/portfile.cmake index 91f2f2aa5..c155275d3 100644 --- a/ports/picojson/portfile.cmake +++ b/ports/picojson/portfile.cmake @@ -1,10 +1,10 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/picojson-master) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/picojson-rel-v1.3.0) vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/kazuho/picojson/archive/master.zip" - FILENAME "picojson-1.3.1.zip" - SHA512 961138c1233ee960c8810cd0e53af27b42956ec0ed4017085b2330417833f91ba728dd76e64ece019a37eb5f8a857cc57d36c3370a27707d995091ab409c4819 + URLS "https://github.com/kazuho/picojson/archive/rel/v1.3.0.zip" + FILENAME "picojson-1.3.0.zip" + SHA512 d1da5748b6a03e92ca4fa475a918842f5eede955f747359fa4d9d85f9ed9efac8b3748a306c2f9f71b9924099ba5e1f8f949e50cdf6f26bc3778865121725ddf ) vcpkg_extract_source_archive(${ARCHIVE}) @@ -16,3 +16,4 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/picojson/LICENSE ${CURRENT_PACKAGES_DI file(INSTALL ${SOURCE_PATH}/picojson.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/picojson) vcpkg_copy_pdbs() + -- cgit v1.2.3 From c92623216d0cda5e665439cc778667fd521eefeb Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 13 Apr 2017 02:15:42 -0700 Subject: Revert "Use Util::keep_if()" This reverts commit 3739e8e0b998b14c0f320c21618057e50698c51d. --- toolsrc/src/commands_build.cpp | 11 ++++++----- toolsrc/src/commands_hash.cpp | 3 +-- toolsrc/src/commands_integrate.cpp | 9 ++++----- toolsrc/src/vcpkg_Dependencies.cpp | 8 ++++---- toolsrc/src/vcpkg_Strings.cpp | 9 ++++----- toolsrc/src/vcpkglib.cpp | 11 ++++++----- 6 files changed, 25 insertions(+), 26 deletions(-) diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp index c7db764de..c3ebd7de8 100644 --- a/toolsrc/src/commands_build.cpp +++ b/toolsrc/src/commands_build.cpp @@ -10,7 +10,6 @@ #include "metrics.h" #include "vcpkg_Enums.h" #include "Paragraphs.h" -#include "vcpkg_Util.h" namespace vcpkg::Commands::Build { @@ -150,10 +149,12 @@ namespace vcpkg::Commands::Build if (result == BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES) { std::vector unmet_dependencies = Dependencies::create_install_plan(paths, { spec }, status_db); - Util::keep_if(unmet_dependencies, [&spec](const InstallPlanAction& p) - { - return (p.spec != spec) && (p.plan_type != InstallPlanType::ALREADY_INSTALLED); - }); + unmet_dependencies.erase( + std::remove_if(unmet_dependencies.begin(), unmet_dependencies.end(), [&spec](const InstallPlanAction& p) + { + return (p.spec == spec) || (p.plan_type == InstallPlanType::ALREADY_INSTALLED); + }), + unmet_dependencies.end()); Checks::check_exit(VCPKG_LINE_INFO, !unmet_dependencies.empty()); System::println(System::Color::error, "The build command requires all dependencies to be already installed."); diff --git a/toolsrc/src/commands_hash.cpp b/toolsrc/src/commands_hash.cpp index a9024d9e7..2ffa3a9aa 100644 --- a/toolsrc/src/commands_hash.cpp +++ b/toolsrc/src/commands_hash.cpp @@ -1,7 +1,6 @@ #include "pch.h" #include "vcpkg_Commands.h" #include "vcpkg_System.h" -#include "vcpkg_Util.h" namespace vcpkg::Commands::Hash { @@ -21,7 +20,7 @@ namespace vcpkg::Commands::Hash Checks::check_exit(VCPKG_LINE_INFO, end != std::string::npos, "Unexpected output format from command: %s", Strings::utf16_to_utf8(cmd_line)); auto hash = output.substr(start, end - start); - Util::keep_if(hash, [](char c) {return !isspace(c); }); + hash.erase(std::remove_if(hash.begin(), hash.end(), isspace), hash.end()); System::println(hash); } diff --git a/toolsrc/src/commands_integrate.cpp b/toolsrc/src/commands_integrate.cpp index e51b1637e..256c3ad1d 100644 --- a/toolsrc/src/commands_integrate.cpp +++ b/toolsrc/src/commands_integrate.cpp @@ -3,7 +3,6 @@ #include "vcpkg_Checks.h" #include "vcpkg_System.h" #include "vcpkg_Files.h" -#include "vcpkg_Util.h" namespace vcpkg::Commands::Integrate { @@ -67,10 +66,10 @@ namespace vcpkg::Commands::Integrate dir_id.erase(1, 1); // Erasing the ":" // NuGet id cannot have invalid characters. We will only use alphanumeric and dot. - Util::keep_if(dir_id, [](char c) - { - return isalnum(c) || (c == '.'); - }); + dir_id.erase(std::remove_if(dir_id.begin(), dir_id.end(), [](char c) + { + return !isalnum(c) && (c != '.'); + }), dir_id.end()); const std::string nuget_id = "vcpkg." + dir_id; return nuget_id; diff --git a/toolsrc/src/vcpkg_Dependencies.cpp b/toolsrc/src/vcpkg_Dependencies.cpp index 5e2a1214c..9ecf57023 100644 --- a/toolsrc/src/vcpkg_Dependencies.cpp +++ b/toolsrc/src/vcpkg_Dependencies.cpp @@ -143,10 +143,10 @@ namespace vcpkg::Dependencies const std::unordered_set specs_as_set(specs.cbegin(), specs.cend()); std::vector toposort = Graphs::topological_sort(specs, InstallAdjacencyProvider{ paths, status_db, specs_as_set }); - Util::keep_if(toposort, [](const InstallPlanAction& p) - { - return !(p.request_type == RequestType::AUTO_SELECTED && p.plan_type == InstallPlanType::ALREADY_INSTALLED); - }); + toposort.erase(std::remove_if(toposort.begin(), toposort.end(), [](const InstallPlanAction& p) + { + return p.request_type == RequestType::AUTO_SELECTED && p.plan_type == InstallPlanType::ALREADY_INSTALLED; + }), toposort.end()); return toposort; } diff --git a/toolsrc/src/vcpkg_Strings.cpp b/toolsrc/src/vcpkg_Strings.cpp index 3d9895436..26dc6388b 100644 --- a/toolsrc/src/vcpkg_Strings.cpp +++ b/toolsrc/src/vcpkg_Strings.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "vcpkg_Strings.h" -#include "vcpkg_Util.h" namespace vcpkg::Strings::details { @@ -99,10 +98,10 @@ namespace vcpkg::Strings trim(&s); } - Util::keep_if(*strings, [](const std::string& s)-> bool - { - return s != ""; - }); + strings->erase(std::remove_if(strings->begin(), strings->end(), [](const std::string& s)-> bool + { + return s == ""; + }), strings->end()); } std::vector split(const std::string& s, const std::string& delimiter) diff --git a/toolsrc/src/vcpkglib.cpp b/toolsrc/src/vcpkglib.cpp index fb1f39256..5e847019f 100644 --- a/toolsrc/src/vcpkglib.cpp +++ b/toolsrc/src/vcpkglib.cpp @@ -4,7 +4,6 @@ #include "Paragraphs.h" #include "metrics.h" #include "vcpkg_Strings.h" -#include "vcpkg_Util.h" namespace vcpkg { @@ -202,10 +201,12 @@ namespace vcpkg upgrade_to_slash_terminated_sorted_format(&installed_files_of_current_pgh, listfile_path); // Remove the directories - Util::keep_if(installed_files_of_current_pgh, [](const std::string& file) -> bool - { - return file.back() != '/'; - }); + installed_files_of_current_pgh.erase( + std::remove_if(installed_files_of_current_pgh.begin(), installed_files_of_current_pgh.end(), [](const std::string& file) -> bool + { + return file.back() == '/'; + } + ), installed_files_of_current_pgh.end()); StatusParagraphAndAssociatedFiles pgh_and_files = { *pgh, SortedVector(std::move(installed_files_of_current_pgh)) }; installed_files.push_back(std::move(pgh_and_files)); -- cgit v1.2.3 From 294159bfd1a25fbffac8051bdf76f2cb88add0fd Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Thu, 13 Apr 2017 15:37:24 -0700 Subject: keep_if (wrong name) renamed to erase_remove_if --- toolsrc/include/vcpkg_Util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolsrc/include/vcpkg_Util.h b/toolsrc/include/vcpkg_Util.h index fedf93c7a..06cac21ad 100644 --- a/toolsrc/include/vcpkg_Util.h +++ b/toolsrc/include/vcpkg_Util.h @@ -23,7 +23,7 @@ namespace vcpkg::Util } template - void keep_if(Container& cont, Pred pred) + void erase_remove_if(Container& cont, Pred pred) { cont.erase(std::remove_if(cont.begin(), cont.end(), pred), cont.end()); } -- cgit v1.2.3 From 46999d38beb6f34f2c484f51e5421a8cabc23a07 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Thu, 13 Apr 2017 15:49:33 -0700 Subject: Use Util::erase_remove_if() --- toolsrc/src/commands_build.cpp | 11 +++++------ toolsrc/src/commands_hash.cpp | 3 ++- toolsrc/src/commands_integrate.cpp | 6 ++---- toolsrc/src/vcpkg_Dependencies.cpp | 4 ++-- toolsrc/src/vcpkg_Strings.cpp | 6 ++---- toolsrc/src/vcpkglib.cpp | 8 ++------ 6 files changed, 15 insertions(+), 23 deletions(-) diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp index c3ebd7de8..710e108b0 100644 --- a/toolsrc/src/commands_build.cpp +++ b/toolsrc/src/commands_build.cpp @@ -10,6 +10,7 @@ #include "metrics.h" #include "vcpkg_Enums.h" #include "Paragraphs.h" +#include "vcpkg_Util.h" namespace vcpkg::Commands::Build { @@ -149,12 +150,10 @@ namespace vcpkg::Commands::Build if (result == BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES) { std::vector unmet_dependencies = Dependencies::create_install_plan(paths, { spec }, status_db); - unmet_dependencies.erase( - std::remove_if(unmet_dependencies.begin(), unmet_dependencies.end(), [&spec](const InstallPlanAction& p) - { - return (p.spec == spec) || (p.plan_type == InstallPlanType::ALREADY_INSTALLED); - }), - unmet_dependencies.end()); + Util::erase_remove_if(unmet_dependencies, [&spec](const InstallPlanAction& p) + { + return (p.spec == spec) || (p.plan_type == InstallPlanType::ALREADY_INSTALLED); + }); Checks::check_exit(VCPKG_LINE_INFO, !unmet_dependencies.empty()); System::println(System::Color::error, "The build command requires all dependencies to be already installed."); diff --git a/toolsrc/src/commands_hash.cpp b/toolsrc/src/commands_hash.cpp index 2ffa3a9aa..b6355dfbd 100644 --- a/toolsrc/src/commands_hash.cpp +++ b/toolsrc/src/commands_hash.cpp @@ -1,6 +1,7 @@ #include "pch.h" #include "vcpkg_Commands.h" #include "vcpkg_System.h" +#include "vcpkg_Util.h" namespace vcpkg::Commands::Hash { @@ -20,7 +21,7 @@ namespace vcpkg::Commands::Hash Checks::check_exit(VCPKG_LINE_INFO, end != std::string::npos, "Unexpected output format from command: %s", Strings::utf16_to_utf8(cmd_line)); auto hash = output.substr(start, end - start); - hash.erase(std::remove_if(hash.begin(), hash.end(), isspace), hash.end()); + Util::erase_remove_if(hash, isspace); System::println(hash); } diff --git a/toolsrc/src/commands_integrate.cpp b/toolsrc/src/commands_integrate.cpp index 256c3ad1d..ea0682e1f 100644 --- a/toolsrc/src/commands_integrate.cpp +++ b/toolsrc/src/commands_integrate.cpp @@ -3,6 +3,7 @@ #include "vcpkg_Checks.h" #include "vcpkg_System.h" #include "vcpkg_Files.h" +#include "vcpkg_Util.h" namespace vcpkg::Commands::Integrate { @@ -66,10 +67,7 @@ namespace vcpkg::Commands::Integrate dir_id.erase(1, 1); // Erasing the ":" // NuGet id cannot have invalid characters. We will only use alphanumeric and dot. - dir_id.erase(std::remove_if(dir_id.begin(), dir_id.end(), [](char c) - { - return !isalnum(c) && (c != '.'); - }), dir_id.end()); + Util::erase_remove_if(dir_id, [](char c) { return !isalnum(c) && (c != '.'); }); const std::string nuget_id = "vcpkg." + dir_id; return nuget_id; diff --git a/toolsrc/src/vcpkg_Dependencies.cpp b/toolsrc/src/vcpkg_Dependencies.cpp index 9ecf57023..cff61b449 100644 --- a/toolsrc/src/vcpkg_Dependencies.cpp +++ b/toolsrc/src/vcpkg_Dependencies.cpp @@ -143,10 +143,10 @@ namespace vcpkg::Dependencies const std::unordered_set specs_as_set(specs.cbegin(), specs.cend()); std::vector toposort = Graphs::topological_sort(specs, InstallAdjacencyProvider{ paths, status_db, specs_as_set }); - toposort.erase(std::remove_if(toposort.begin(), toposort.end(), [](const InstallPlanAction& p) + Util::erase_remove_if(toposort, [](const InstallPlanAction& p) { return p.request_type == RequestType::AUTO_SELECTED && p.plan_type == InstallPlanType::ALREADY_INSTALLED; - }), toposort.end()); + }); return toposort; } diff --git a/toolsrc/src/vcpkg_Strings.cpp b/toolsrc/src/vcpkg_Strings.cpp index 26dc6388b..5f46af6d2 100644 --- a/toolsrc/src/vcpkg_Strings.cpp +++ b/toolsrc/src/vcpkg_Strings.cpp @@ -1,5 +1,6 @@ #include "pch.h" #include "vcpkg_Strings.h" +#include "vcpkg_Util.h" namespace vcpkg::Strings::details { @@ -98,10 +99,7 @@ namespace vcpkg::Strings trim(&s); } - strings->erase(std::remove_if(strings->begin(), strings->end(), [](const std::string& s)-> bool - { - return s == ""; - }), strings->end()); + Util::erase_remove_if(*strings, [](const std::string& s) { return s == ""; }); } std::vector split(const std::string& s, const std::string& delimiter) diff --git a/toolsrc/src/vcpkglib.cpp b/toolsrc/src/vcpkglib.cpp index 5e847019f..253c0c7ea 100644 --- a/toolsrc/src/vcpkglib.cpp +++ b/toolsrc/src/vcpkglib.cpp @@ -4,6 +4,7 @@ #include "Paragraphs.h" #include "metrics.h" #include "vcpkg_Strings.h" +#include "vcpkg_Util.h" namespace vcpkg { @@ -201,12 +202,7 @@ namespace vcpkg upgrade_to_slash_terminated_sorted_format(&installed_files_of_current_pgh, listfile_path); // Remove the directories - installed_files_of_current_pgh.erase( - std::remove_if(installed_files_of_current_pgh.begin(), installed_files_of_current_pgh.end(), [](const std::string& file) -> bool - { - return file.back() == '/'; - } - ), installed_files_of_current_pgh.end()); + Util::erase_remove_if(installed_files_of_current_pgh, [](const std::string& file) { return file.back() == '/'; }); StatusParagraphAndAssociatedFiles pgh_and_files = { *pgh, SortedVector(std::move(installed_files_of_current_pgh)) }; installed_files.push_back(std::move(pgh_and_files)); -- cgit v1.2.3 From bfb76e52a4fabf18301ccecd778dbd47ef06f930 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 13 Apr 2017 18:59:13 -0700 Subject: [vcpkg] Fix getWindowsSDK to correctly handle the new optional c++ desktop deployment of the Windows SDK. --- scripts/getWindowsSDK.ps1 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/getWindowsSDK.ps1 b/scripts/getWindowsSDK.ps1 index 90ca1b06b..7902707cb 100644 --- a/scripts/getWindowsSDK.ps1 +++ b/scripts/getWindowsSDK.ps1 @@ -44,8 +44,16 @@ foreach ($ProgramFiles in $CandidateProgramFiles) Write-Verbose "$windowsheader - Not Found" continue } - Write-Verbose "$windowsheader - Found" + + $ddkheader = "$folder\$win10sdkV\shared\sdkddkver.h" + if (!(Test-Path $ddkheader)) + { + Write-Verbose "$ddkheader - Not Found" + continue + } + + Write-Verbose "$ddkheader - Found" $win10sdkVersionString = $win10sdkV.ToString() Write-Verbose "Found $win10sdkVersionString" $validInstances.Add($win10sdkVersionString) > $null -- cgit v1.2.3 From 0074703e9a253490ea39e60da53628190b755552 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 13 Apr 2017 19:00:15 -0700 Subject: [libbson] [mongo-c-driver] [mongo-cxx-driver] Update to latest (1.6.2/1.6.2/3.1.1) --- ports/libbson/CONTROL | 2 +- ports/libbson/portfile.cmake | 8 ++++---- ports/mongo-c-driver/CONTROL | 2 +- ports/mongo-c-driver/bson.patch | 25 ++++++++++++------------- ports/mongo-c-driver/portfile.cmake | 9 +++++---- ports/mongo-cxx-driver/CONTROL | 2 +- ports/mongo-cxx-driver/portfile.cmake | 8 ++++---- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/ports/libbson/CONTROL b/ports/libbson/CONTROL index 7ad8cb25b..0edf7847c 100644 --- a/ports/libbson/CONTROL +++ b/ports/libbson/CONTROL @@ -1,3 +1,3 @@ Source: libbson -Version: 1.5.1-3 +Version: 1.6.2 Description: libbson is a library providing useful routines related to building, parsing, and iterating BSON documents. \ No newline at end of file diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index 1292dd9a3..58513498e 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -1,10 +1,10 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libbson-1.5.1) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libbson-1.6.2) vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/mongodb/libbson/archive/1.5.1.tar.gz" - FILENAME "libbson-1.5.1.tar.gz" - SHA512 b641e23ca041e532fe566167ad0292d12934e0fae2c110f81bf6ca3b71b5d01b651a604a7ce6da0d1b54b98cd95674ef331ef4e23c2dedfc706f371eac4efaec + URLS "https://github.com/mongodb/libbson/archive/1.6.2.tar.gz" + FILENAME "libbson-1.6.2.tar.gz" + SHA512 c5848984d5db5ab62e698a0185139b20834d83fd7befef72336997097f639ef13e81053531385e96c7ba1fe3f3fe4ded517f5b8ee58f0914c5c807a9cb43766d ) vcpkg_extract_source_archive(${ARCHIVE}) diff --git a/ports/mongo-c-driver/CONTROL b/ports/mongo-c-driver/CONTROL index f509493ee..8d77eeca5 100644 --- a/ports/mongo-c-driver/CONTROL +++ b/ports/mongo-c-driver/CONTROL @@ -1,4 +1,4 @@ Source: mongo-c-driver -Version: 1.5.1-1 +Version: 1.6.2 Build-Depends: libbson, openssl [uwp] Description: Client library written in C for MongoDB. \ No newline at end of file diff --git a/ports/mongo-c-driver/bson.patch b/ports/mongo-c-driver/bson.patch index 83291d699..6ef5451b8 100644 --- a/ports/mongo-c-driver/bson.patch +++ b/ports/mongo-c-driver/bson.patch @@ -1,24 +1,23 @@ diff --git a/build/cmake/FindBSON.cmake b/build/cmake/FindBSON.cmake -index 4ac39ea..d11aa1f 100644 +index 06fd82e..3ac549d 100644 --- a/build/cmake/FindBSON.cmake +++ b/build/cmake/FindBSON.cmake -@@ -12,6 +12,7 @@ endif () +@@ -11,15 +11,15 @@ endif () + find_path(BSON_INCLUDE_DIR NAMES - libbson-1.0/bson.h -+ bson.h +- libbson-1.0/bson.h ++ bson.h HINTS ${BSON_ROOT_DIR} - ${_BSON_INCLUDEDIR} -@@ -19,7 +20,10 @@ find_path(BSON_INCLUDE_DIR + PATH_SUFFIXES include ++ libbson-1.0 ++ include/libbson-1.0 ) -set(BSON_INCLUDE_DIR "${BSON_INCLUDE_DIR}/libbson-1.0") -+set(BSON_INCLUDE_DIR "${BSON_INCLUDE_DIR}") -+if (NOT EXISTS ${BSON_INCLUDE_DIR}/bson.h) -+ set(BSON_INCLUDE_DIR "${BSON_INCLUDE_DIR}/libbson-1.0") -+endif() - - if(WIN32 AND NOT CYGWIN) - if(MSVC) +- + find_library(BSON + NAMES + "bson-1.0" diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index 0cdb9611b..4376f324a 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -1,15 +1,16 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-c-driver-1.5.1) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-c-driver-1.6.2) vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/mongodb/mongo-c-driver/archive/1.5.1.tar.gz" - FILENAME "mongo-c-driver-1.5.1.tar.gz" - SHA512 2977e6e1fb3c45256161d2c9bd711fea69b9f8c9ff15362fa636068e0a347c42e10d72fed5649504b552c8212f21cb1ae74d2dc8ca3d1388f49e63b2baf6e16d + URLS "https://github.com/mongodb/mongo-c-driver/archive/1.6.2.tar.gz" + FILENAME "mongo-c-driver-1.6.2.tar.gz" + SHA512 3533fed665c70b71f0e9473156bab1575f60b0b3db412f19c0a625e1e35683a3077f96b8a0ba337fd755675029f47b68dc3a5fc8f39254bb0be589da57cffad3 ) vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA PATCHES ${CMAKE_CURRENT_LIST_DIR}/bson.patch ${CMAKE_CURRENT_LIST_DIR}/fix-uwp.patch diff --git a/ports/mongo-cxx-driver/CONTROL b/ports/mongo-cxx-driver/CONTROL index ba3b1c7e0..9b7e29ba3 100644 --- a/ports/mongo-cxx-driver/CONTROL +++ b/ports/mongo-cxx-driver/CONTROL @@ -1,4 +1,4 @@ Source: mongo-cxx-driver -Version: 3.0.3-2 +Version: 3.1.1 Build-Depends: boost, libbson, mongo-c-driver Description: MongoDB C++ Driver. \ No newline at end of file diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake index e024c9a21..fd978a271 100644 --- a/ports/mongo-cxx-driver/portfile.cmake +++ b/ports/mongo-cxx-driver/portfile.cmake @@ -1,10 +1,10 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-cxx-driver-r3.1.0) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-cxx-driver-r3.1.1) vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/mongodb/mongo-cxx-driver/archive/r3.1.0.tar.gz" - FILENAME "mongo-cxx-driver-r3.1.0.tar.gz" - SHA512 2c9323f5e28304057b6ed6fc8bf33aad14db1313e234eaa74a96fb4cf93e99d24fd8c7c3f20b4b29cda7b1fe5c58f08dcb5cddcffbf62259c08334312fda4fba + URLS "https://github.com/mongodb/mongo-cxx-driver/archive/r3.1.1.tar.gz" + FILENAME "mongo-cxx-driver-r3.1.1.tar.gz" + SHA512 ba8a735e5645cbce4497df71a4577e891d507f577dbd5270ec8a82e54c39c2806bf2ff4848b621f18b36d31fb6031e5b4211972b661c43009bff0ed7ab6cf338 ) vcpkg_extract_source_archive(${ARCHIVE}) -- cgit v1.2.3 From b3541eff15847b2cc90736a609b8c6f99ce74a9d Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 13 Apr 2017 19:11:04 -0700 Subject: [uwebsockets] Update to 0.14.2 --- ports/uwebsockets/CONTROL | 2 +- ports/uwebsockets/portfile.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/uwebsockets/CONTROL b/ports/uwebsockets/CONTROL index 8387b72e4..39441586b 100644 --- a/ports/uwebsockets/CONTROL +++ b/ports/uwebsockets/CONTROL @@ -1,4 +1,4 @@ Source: uwebsockets -Version: 0.14.1 +Version: 0.14.2 Build-Depends: libuv, openssl, zlib, boost Description: Highly scalable cross-platform WebSocket & HTTP library for C++11 and Node.js diff --git a/ports/uwebsockets/portfile.cmake b/ports/uwebsockets/portfile.cmake index e435f0204..1de6762d4 100644 --- a/ports/uwebsockets/portfile.cmake +++ b/ports/uwebsockets/portfile.cmake @@ -1,10 +1,10 @@ include(vcpkg_common_functions) -set(VERSION 0.14.1) +set(VERSION 0.14.2) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/uwebsockets-${VERSION}) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/uWebSockets/uWebSockets/archive/v${VERSION}.zip" FILENAME "uwebsockets-v${VERSION}.zip" - SHA512 1fb798ba49b45c48991ef3c657da9ef8f46d18009c77d9a2c6b98345f97ad7d7806e5490dc478dd5d05bc92bbeb849ac5a300fb91028f786274da89587c04c6e + SHA512 b6389a00a310d77ec55273c1b9499679b13f5e430c31fbc5dd5847780455115d95d5a439cd82dddc537d85c4afb5db4cacefb6db5b3f9681ff142d6ab9ef5024 ) vcpkg_extract_source_archive(${ARCHIVE}) -- cgit v1.2.3