aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Shaw <t-dansha@microsoft.com>2017-08-01 15:17:42 -0700
committerDaniel Shaw <t-dansha@microsoft.com>2017-08-01 15:21:49 -0700
commit957cb214e92f45069f142d8b6ccf2a6425df9c51 (patch)
tree5f6c4b83d78b5f082cdc9171daf598bcf56e76c0
parentc22ab980bcab362134ef3e5db329a81c1767c2c9 (diff)
downloadvcpkg-957cb214e92f45069f142d8b6ccf2a6425df9c51.tar.gz
vcpkg-957cb214e92f45069f142d8b6ccf2a6425df9c51.zip
change qualifier bracket to parens
-rw-r--r--ports/cpprestsdk/CONTROL2
-rw-r--r--ports/harfbuzz/CONTROL2
-rw-r--r--ports/mongo-c-driver/CONTROL2
-rw-r--r--ports/tiff/CONTROL2
-rw-r--r--toolsrc/src/SourceParagraph.cpp2
-rw-r--r--toolsrc/src/tests_dependencies.cpp4
-rw-r--r--toolsrc/src/tests_paragraph.cpp2
7 files changed, 8 insertions, 8 deletions
diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL
index f284f2b53..f34f1ad4a 100644
--- a/ports/cpprestsdk/CONTROL
+++ b/ports/cpprestsdk/CONTROL
@@ -1,5 +1,5 @@
Source: cpprestsdk
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
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. \ No newline at end of file
diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL
index 5ed9e68b8..acc0b6c7d 100644
--- a/ports/harfbuzz/CONTROL
+++ b/ports/harfbuzz/CONTROL
@@ -1,4 +1,4 @@
Source: harfbuzz
Version: 1.4.6-1
Description: HarfBuzz OpenType text shaping engine
-Build-Depends: freetype, glib [windows]
+Build-Depends: freetype, glib (windows)
diff --git a/ports/mongo-c-driver/CONTROL b/ports/mongo-c-driver/CONTROL
index 8d77eeca5..a460b313c 100644
--- a/ports/mongo-c-driver/CONTROL
+++ b/ports/mongo-c-driver/CONTROL
@@ -1,4 +1,4 @@
Source: mongo-c-driver
Version: 1.6.2
-Build-Depends: libbson, openssl [uwp]
+Build-Depends: libbson, openssl (uwp)
Description: Client library written in C for MongoDB. \ No newline at end of file
diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL
index 28452b794..f5727b475 100644
--- a/ports/tiff/CONTROL
+++ b/ports/tiff/CONTROL
@@ -1,4 +1,4 @@
Source: tiff
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
diff --git a/toolsrc/src/SourceParagraph.cpp b/toolsrc/src/SourceParagraph.cpp
index 9289edb38..cb7aeb33e 100644
--- a/toolsrc/src/SourceParagraph.cpp
+++ b/toolsrc/src/SourceParagraph.cpp
@@ -160,7 +160,7 @@ namespace vcpkg
// expect of the form "\w+ \[\w+\]"
Dependency dep;
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.
return {depend_string, ""};
diff --git a/toolsrc/src/tests_dependencies.cpp b/toolsrc/src/tests_dependencies.cpp
index 995d46873..7a49bdbd0 100644
--- a/toolsrc/src/tests_dependencies.cpp
+++ b/toolsrc/src/tests_dependencies.cpp
@@ -15,7 +15,7 @@ namespace UnitTest1
{
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("libA", v[0].name.c_str());
Assert::AreEqual("windows", v[0].qualifier.c_str());
@@ -23,7 +23,7 @@ namespace UnitTest1
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);
Assert::AreEqual(size_t(2), v.size());
Assert::AreEqual("libA", v[0].c_str());
diff --git a/toolsrc/src/tests_paragraph.cpp b/toolsrc/src/tests_paragraph.cpp
index dd9a40160..920e58c02 100644
--- a/toolsrc/src/tests_paragraph.cpp
+++ b/toolsrc/src/tests_paragraph.cpp
@@ -112,7 +112,7 @@ namespace UnitTest1
{
auto m_pgh =
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());
auto& pgh = *m_pgh.get();