Merge pull request #1582 from Microsoft/qualifier_change

change qualifier bracket to parens

7 files changed, 29 insertions, 14 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 a34167db7..a37567f3a 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..af4b55498 100644
--- a/toolsrc/src/tests_paragraph.cpp
+++ b/toolsrc/src/tests_paragraph.cpp
@@ -27,7 +27,8 @@ 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"},
+                    {"Source", "zlib"},
+                    {"Version", "1.2.8"},
                 }});
 
             Assert::IsTrue(m_pgh.has_value());
@@ -68,7 +69,9 @@ 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", "z, openssl"},
+                    {"Source", "zlib"},
+                    {"Version", "1.2.8"},
+                    {"Build-Depends", "z, openssl"},
                 }});
             Assert::IsTrue(m_pgh.has_value());
             auto& pgh = *m_pgh.get();
@@ -82,7 +85,9 @@ 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", "z, openssl, xyz"},
+                    {"Source", "zlib"},
+                    {"Version", "1.2.8"},
+                    {"Build-Depends", "z, openssl, xyz"},
                 }});
             Assert::IsTrue(m_pgh.has_value());
             auto& pgh = *m_pgh.get();
@@ -97,7 +102,9 @@ 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"}, {"Supports", "x64, windows, uwp"},
+                    {"Source", "zlib"},
+                    {"Version", "1.2.8"},
+                    {"Supports", "x64, windows, uwp"},
                 }});
             Assert::IsTrue(m_pgh.has_value());
             auto& pgh = *m_pgh.get();
@@ -112,7 +119,9 @@ 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();
@@ -131,7 +140,10 @@ namespace UnitTest1
         TEST_METHOD(BinaryParagraph_Construct_Minimum)
         {
             vcpkg::BinaryParagraph pgh({
-                {"Package", "zlib"}, {"Version", "1.2.8"}, {"Architecture", "x86-windows"}, {"Multi-Arch", "same"},
+                {"Package", "zlib"},
+                {"Version", "1.2.8"},
+                {"Architecture", "x86-windows"},
+                {"Multi-Arch", "same"},
             });
 
             Assert::AreEqual("zlib", pgh.spec.name().c_str());
@@ -320,7 +332,10 @@ namespace UnitTest1
         TEST_METHOD(BinaryParagraph_serialize_min)
         {
             vcpkg::BinaryParagraph pgh({
-                {"Package", "zlib"}, {"Version", "1.2.8"}, {"Architecture", "x86-windows"}, {"Multi-Arch", "same"},
+                {"Package", "zlib"},
+                {"Version", "1.2.8"},
+                {"Architecture", "x86-windows"},
+                {"Multi-Arch", "same"},
             });
             std::string ss = Strings::serialize(pgh);
             auto pghs = vcpkg::Paragraphs::parse_paragraphs(ss).value_or_exit(VCPKG_LINE_INFO);