mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 18:32:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

change qualifier bracket to parens

Browse Source
This commit is contained in:
Daniel Shaw 2017-08-01 15:17:42 -07:00
parent c22ab980bc
commit 957cb214e9
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/cpprestsdk/CONTROL
View File

@ -1,5 +1,5 @@
Source: cpprestsdk Source: cpprestsdk
Version: 2.9.0-2 Version: 2.9.0-2
Build-Depends: zlib [windows], openssl [windows], boost [windows], websocketpp [windows] Build-Depends: zlib (windows), openssl (windows), boost (windows), websocketpp (windows)
Description: C++11 JSON, REST, and OAuth library 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. 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.

2
ports/harfbuzz/CONTROL
View File

@ -1,4 +1,4 @@
Source: harfbuzz Source: harfbuzz
Version: 1.4.6-1 Version: 1.4.6-1
Description: HarfBuzz OpenType text shaping engine Description: HarfBuzz OpenType text shaping engine
Build-Depends: freetype, glib [windows] Build-Depends: freetype, glib (windows)

2
ports/mongo-c-driver/CONTROL
View File

@ -1,4 +1,4 @@
Source: mongo-c-driver Source: mongo-c-driver
Version: 1.6.2 Version: 1.6.2
Build-Depends: libbson, openssl [uwp] Build-Depends: libbson, openssl (uwp)
Description: Client library written in C for MongoDB. Description: Client library written in C for MongoDB.

2
ports/tiff/CONTROL
View File

@ -1,4 +1,4 @@
Source: tiff Source: tiff
Version: 4.0.8 Version: 4.0.8
Build-Depends: zlib, libjpeg-turbo, liblzma [windows] Build-Depends: zlib, libjpeg-turbo, liblzma (windows)
Description: A library that supports the manipulation of TIFF image files Description: A library that supports the manipulation of TIFF image files

2
toolsrc/src/SourceParagraph.cpp
View File

@ -160,7 +160,7 @@ namespace vcpkg
// expect of the form "\w+ \[\w+\]" // expect of the form "\w+ \[\w+\]"
Dependency dep; Dependency dep;
dep.name = depend_string.substr(0, pos); dep.name = depend_string.substr(0, pos);
if (depend_string.c_str()[pos + 1] != '[' || depend_string[depend_string.size() - 1] != ']') if (depend_string.c_str()[pos + 1] != '(' || depend_string[depend_string.size() - 1] != ')')
{ {
// Error, but for now just slurp the entire string. // Error, but for now just slurp the entire string.
return {depend_string, ""}; return {depend_string, ""};

4
toolsrc/src/tests_dependencies.cpp
View File

@ -15,7 +15,7 @@ namespace UnitTest1
{ {
TEST_METHOD(parse_depends_one) TEST_METHOD(parse_depends_one)
{ {
auto v = expand_qualified_dependencies(parse_comma_list("libA [windows]")); auto v = expand_qualified_dependencies(parse_comma_list("libA (windows)"));
Assert::AreEqual(size_t(1), v.size()); Assert::AreEqual(size_t(1), v.size());
Assert::AreEqual("libA", v[0].name.c_str()); Assert::AreEqual("libA", v[0].name.c_str());
Assert::AreEqual("windows", v[0].qualifier.c_str()); Assert::AreEqual("windows", v[0].qualifier.c_str());
@ -23,7 +23,7 @@ namespace UnitTest1
TEST_METHOD(filter_depends) TEST_METHOD(filter_depends)
{ {
auto deps = expand_qualified_dependencies(parse_comma_list("libA [windows], libB, libC [uwp]")); auto deps = expand_qualified_dependencies(parse_comma_list("libA (windows), libB, libC (uwp)"));
auto v = filter_dependencies(deps, Triplet::X64_WINDOWS); auto v = filter_dependencies(deps, Triplet::X64_WINDOWS);
Assert::AreEqual(size_t(2), v.size()); Assert::AreEqual(size_t(2), v.size());
Assert::AreEqual("libA", v[0].c_str()); Assert::AreEqual("libA", v[0].c_str());

2
toolsrc/src/tests_paragraph.cpp
View File

@ -112,7 +112,7 @@ namespace UnitTest1
{ {
auto m_pgh = auto m_pgh =
vcpkg::SourceControlFile::parse_control_file(std::vector<std::unordered_map<std::string, std::string>>{{ vcpkg::SourceControlFile::parse_control_file(std::vector<std::unordered_map<std::string, std::string>>{{
{"Source", "zlib"}, {"Version", "1.2.8"}, {"Build-Depends", "libA [windows], libB [uwp]"}, {"Source", "zlib"}, {"Version", "1.2.8"}, {"Build-Depends", "libA (windows), libB (uwp)"},
}}); }});
Assert::IsTrue(m_pgh.has_value()); Assert::IsTrue(m_pgh.has_value());
auto& pgh = *m_pgh.get(); auto& pgh = *m_pgh.get();