Merge branch 'master' of https://github.com/Microsoft/vcpkg

4 files changed, 31 insertions, 22 deletions

diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL
index 94d36830f..74cf1d3bc 100644
--- a/ports/opencv/CONTROL
+++ b/ports/opencv/CONTROL
@@ -1,4 +1,4 @@
 Source: opencv
 Version: 3.1.0-1
-Build-Depends: zlib, libpng, libjpeg-turbo
+Build-Depends: zlib, libpng, libjpeg-turbo, tiff
 Description: computer vision library
diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake
index a40cc9e19..8842d6632 100644
--- a/ports/opencv/portfile.cmake
+++ b/ports/opencv/portfile.cmake
@@ -11,10 +11,15 @@ vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
     PATCHES "${CMAKE_CURRENT_LIST_DIR}/opencv-installation-options.patch"
 )
+file(REMOVE_RECURSE ${SOURCE_PATH}/3rdparty/libjpeg ${SOURCE_PATH}/3rdparty/libpng ${SOURCE_PATH}/3rdparty/zlib ${SOURCE_PATH}/3rdparty/libtiff)
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
         -DBUILD_ZLIB=OFF
+        -DBUILD_TIFF=OFF
+        -DBUILD_JPEG=OFF
+        -DBUILD_PNG=OFF
         -DINSTALL_CREATE_DISTRIB=ON
         -DBUILD_opencv_python2=OFF
         -DBUILD_opencv_python3=OFF
diff --git a/toolsrc/src/lib.cpp b/toolsrc/src/lib.cpp
index e9f12cd1b..2a9b06d4a 100644
--- a/toolsrc/src/lib.cpp
+++ b/toolsrc/src/lib.cpp
@@ -213,35 +213,40 @@ static void install_and_write_listfile(const vcpkg_paths& paths, const BinaryPar
 std::vector<std::string> vcpkg::get_unmet_package_dependencies(const vcpkg_paths& paths, const package_spec& spec, const StatusParagraphs& status_db)
 {
     std::vector<std::unordered_map<std::string, std::string>> pghs;
-    const fs::path packages_dir_control_file_path = paths.package_dir(spec) / "CONTROL";
+    {
+        const fs::path packages_dir_control_file_path = paths.package_dir(spec) / "CONTROL";
+
+        auto control_contents_maybe = Files::get_contents(packages_dir_control_file_path);
+        if (auto control_contents = control_contents_maybe.get())
+        {
+            try
+            {
+                pghs = parse_paragraphs(*control_contents);
+            }
+            catch (std::runtime_error)
+            {
+            }
+            Checks::check_exit(pghs.size() == 1, "Invalid control file at %s", packages_dir_control_file_path.string());
+            return BinaryParagraph(pghs[0]).depends;
+        }
+    }
 
-    if (fs::exists(packages_dir_control_file_path))
+    const fs::path ports_dir_control_file_path = paths.port_dir(spec) / "CONTROL";
+    auto control_contents_maybe = Files::get_contents(ports_dir_control_file_path);
+    if (auto control_contents = control_contents_maybe.get())
     {
         try
         {
-            pghs = get_paragraphs(packages_dir_control_file_path);
+            pghs = parse_paragraphs(*control_contents);
         }
         catch (std::runtime_error)
         {
-            // ??
         }
-
-        Checks::check_throw(pghs.size() == 1, "Invalid control file for package");
-        return BinaryParagraph(pghs[0]).depends;
-    }
-
-    const fs::path ports_dir_control_file_path = paths.port_dir(spec) / "CONTROL";
-    try
-    {
-        pghs = get_paragraphs(ports_dir_control_file_path);
-    }
-    catch (std::runtime_error)
-    {
-        // ??
+        Checks::check_exit(pghs.size() == 1, "Invalid control file at %s", ports_dir_control_file_path.string());
+        return SourceParagraph(pghs[0]).depends;
     }
 
-    Checks::check_exit(pghs.size() == 1, "Invalid control file for package %s", spec);
-    return SourceParagraph(pghs[0]).depends;
+    Checks::exit_with_message("Could not find package named %s", spec);
 }
 
 void vcpkg::install_package(const vcpkg_paths& paths, const BinaryParagraph& binary_paragraph, StatusParagraphs& status_db)
diff --git a/toolsrc/src/vcpkg_Checks.cpp b/toolsrc/src/vcpkg_Checks.cpp
index d5433b1f5..db6c03480 100644
--- a/toolsrc/src/vcpkg_Checks.cpp
+++ b/toolsrc/src/vcpkg_Checks.cpp
@@ -34,8 +34,7 @@ namespace vcpkg {namespace Checks
     {
         if (!expression)
         {
-            System::println(System::color::error, errorMessage);
-            exit(EXIT_FAILURE);
+            exit_with_message(errorMessage);
         }
     }
 }}