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

2 files changed, 112 insertions, 85 deletions

diff --git a/toolsrc/src/BuildInfo.cpp b/toolsrc/src/BuildInfo.cpp
index 2e74eefc3..1f802869f 100644
--- a/toolsrc/src/BuildInfo.cpp
+++ b/toolsrc/src/BuildInfo.cpp
@@ -4,14 +4,31 @@
 
 namespace vcpkg
 {
-    std::string BuildType::toString() const
+    const ConfigurationType& BuildType::config() const
     {
-        return Strings::format("[%s,%s]", to_string(config), to_string(linkage));
+        return this->m_config;
+    }
+
+    const LinkageType& BuildType::linkage() const
+    {
+        return this->m_linkage;
+    }
+
+    const std::regex& BuildType::crt_regex() const
+    {
+        static const std::regex r(this->m_crt_regex_as_string, std::regex_constants::icase);
+        return r;
+    }
+
+    const std::string& BuildType::toString() const
+    {
+        static const std::string s = Strings::format("[%s,%s]", to_string(this->m_config), to_string(this->m_linkage));
+        return s;
     }
 
     bool operator==(const BuildType& lhs, const BuildType& rhs)
     {
-        return lhs.config == rhs.config && lhs.linkage == rhs.linkage;
+        return lhs.config() == rhs.config() && lhs.linkage() == rhs.linkage();
     }
 
     bool operator!=(const BuildType& lhs, const BuildType& rhs)
@@ -35,10 +52,10 @@ namespace vcpkg
         return build_info;
     }
 
-    const BuildType BuildType::DEBUG_STATIC = BuildType(ConfigurationType::DEBUG, LinkageType::STATIC);
-    const BuildType BuildType::DEBUG_DYNAMIC = BuildType(ConfigurationType::DEBUG, LinkageType::DYNAMIC);
-    const BuildType BuildType::RELEASE_STATIC = BuildType(ConfigurationType::RELEASE, LinkageType::STATIC);
-    const BuildType BuildType::RELEASE_DYNAMIC = BuildType(ConfigurationType::RELEASE, LinkageType::DYNAMIC);
+    const BuildType BuildType::DEBUG_STATIC = BuildType(ConfigurationType::DEBUG, LinkageType::STATIC, R"(/DEFAULTLIB:LIBCMTD)");
+    const BuildType BuildType::DEBUG_DYNAMIC = BuildType(ConfigurationType::DEBUG, LinkageType::DYNAMIC, R"(/DEFAULTLIB:MSVCRTD)");
+    const BuildType BuildType::RELEASE_STATIC = BuildType(ConfigurationType::RELEASE, LinkageType::STATIC, R"(/DEFAULTLIB:LIBCMT[^D])");
+    const BuildType BuildType::RELEASE_DYNAMIC = BuildType(ConfigurationType::RELEASE, LinkageType::DYNAMIC, R"(/DEFAULTLIB:MSVCRT[^D])");
 
     LinkageType linkage_type_value_of(const std::string& as_string)
 
@@ -70,7 +87,6 @@ namespace vcpkg
     }
 
     std::string to_string(const ConfigurationType& conf)
-
     {
         switch (conf)
         {
@@ -115,4 +131,34 @@ namespace vcpkg
 
         return BuildInfo::create(pghs[0]);
     }
+
+    const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP100_DLL = OutdatedDynamicCrt("msvcp100.dll", R"(msvcp100\.dll)");
+    const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP100D_DLL = OutdatedDynamicCrt("msvcp100d.dll", R"(msvcp100d\.dll)");
+    const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP110_DLL = OutdatedDynamicCrt("msvcp110.dll", R"(msvcp110\.dll)");
+    const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP110_WIN_DLL = OutdatedDynamicCrt("msvcp110_win.dll", R"(msvcp110_win\.dll)");
+    const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP120_DLL = OutdatedDynamicCrt("msvcp120.dll", R"(msvcp120\.dll)");
+    const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP120_CLR0400_DLL = OutdatedDynamicCrt("msvcp120_clr0400.dll", R"(msvcp120_clr0400\.dll)");
+    const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP60_DLL = OutdatedDynamicCrt("msvcp60.dll", R"(msvcp60\.dll)");
+    const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCP_WIN_DLL = OutdatedDynamicCrt("msvcp60.dll", R"(msvcp60\.dll)");;
+
+    const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCR100_DLL = OutdatedDynamicCrt("msvcr100.dll", R"(msvcr100\.dll)");
+    const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCR100D_DLL = OutdatedDynamicCrt("msvcr100d.dll", R"(msvcr100d\.dll)");
+    const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCR100_CLR0400_DLL = OutdatedDynamicCrt("msvcr100_clr0400.dll", R"(msvcr100_clr0400\.dll)");
+    const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCR110_DLL = OutdatedDynamicCrt("msvcr110.dll", R"(msvcr110\.dll)");
+    const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCR120_DLL = OutdatedDynamicCrt("msvcr120.dll", R"(msvcr120\.dll)");
+    const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCR120_CLR0400_DLL = OutdatedDynamicCrt("msvcr120_clr0400.dll", R"(msvcr120_clr0400\.dll)");
+    const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCRT_DLL = OutdatedDynamicCrt("msvcrt.dll", R"(msvcrt\.dll)");
+    const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCRT20_DLL = OutdatedDynamicCrt("msvcrt20.dll", R"(msvcrt20\.dll)");;
+    const OutdatedDynamicCrt OutdatedDynamicCrt::MSVCRT40_DLL = OutdatedDynamicCrt("msvcrt40.dll", R"(msvcrt40\.dll)");;
+
+    const std::regex& OutdatedDynamicCrt::crt_regex() const
+    {
+        static const std::regex r(this->m_crt_regex_as_string, std::regex_constants::icase);
+        return r;
+    }
+
+    const std::string& OutdatedDynamicCrt::toString() const
+    {
+        return this->m_dll_name;
+    }
 }
diff --git a/toolsrc/src/post_build_lint.cpp b/toolsrc/src/post_build_lint.cpp
index 9cd88bff1..1a5f22f0a 100644
--- a/toolsrc/src/post_build_lint.cpp
+++ b/toolsrc/src/post_build_lint.cpp
@@ -489,33 +489,18 @@ namespace vcpkg
         return lint_status::SUCCESS;
     }
 
-    struct BuildInfo_and_files
+    struct BuildType_and_file
     {
-        explicit BuildInfo_and_files(const BuildType& build_type) : build_type(build_type)
-        {
-        }
-
+        fs::path file;
         BuildType build_type;
-        std::vector<fs::path> files;
     };
 
     static lint_status check_crt_linkage_of_libs(const BuildType& expected_build_type, const std::vector<fs::path>& libs)
     {
-        static const std::regex DEBUG_STATIC_CRT(R"(/DEFAULTLIB:LIBCMTD)");
-        static const std::regex DEBUG_DYNAMIC_CRT(R"(/DEFAULTLIB:MSVCRTD)");
+        std::vector<BuildType> bad_build_types = BuildType::values();
+        bad_build_types.erase(std::remove(bad_build_types.begin(), bad_build_types.end(), expected_build_type), bad_build_types.end());
 
-        static const std::regex RELEASE_STATIC_CRT(R"(/DEFAULTLIB:LIBCMT[^D])");
-        static const std::regex RELEASE_DYNAMIC_CRT(R"(/DEFAULTLIB:MSVCRT[^D])");
-
-        lint_status output_status = lint_status::SUCCESS;
-
-        std::vector<fs::path> libs_with_no_crts;
-        std::vector<fs::path> libs_with_multiple_crts;
-
-        BuildInfo_and_files libs_with_debug_static_crt(BuildType::DEBUG_STATIC);
-        BuildInfo_and_files libs_with_debug_dynamic_crt(BuildType::DEBUG_DYNAMIC);
-        BuildInfo_and_files libs_with_release_static_crt(BuildType::RELEASE_STATIC);
-        BuildInfo_and_files libs_with_release_dynamic_crt(BuildType::RELEASE_DYNAMIC);
+        std::vector<BuildType_and_file> libs_with_invalid_crt;
 
         for (const fs::path& lib : libs)
         {
@@ -523,80 +508,76 @@ namespace vcpkg
             System::exit_code_and_output ec_data = System::cmd_execute_and_capture_output(cmd_line);
             Checks::check_exit(ec_data.exit_code == 0, "Running command:\n   %s\n failed", Strings::utf16_to_utf8(cmd_line));
 
-            bool found_debug_static_crt = std::regex_search(ec_data.output.cbegin(), ec_data.output.cend(), DEBUG_STATIC_CRT);
-            bool found_debug_dynamic_crt = std::regex_search(ec_data.output.cbegin(), ec_data.output.cend(), DEBUG_DYNAMIC_CRT);
-            bool found_release_static_crt = std::regex_search(ec_data.output.cbegin(), ec_data.output.cend(), RELEASE_STATIC_CRT);
-            bool found_release_dynamic_crt = std::regex_search(ec_data.output.cbegin(), ec_data.output.cend(), RELEASE_DYNAMIC_CRT);
-
-            const size_t crts_found_count = found_debug_static_crt + found_debug_dynamic_crt + found_release_static_crt + found_release_dynamic_crt;
-
-            if (crts_found_count == 0)
-            {
-                libs_with_no_crts.push_back(lib);
-                continue;
-            }
-
-            if (crts_found_count > 1)
-            {
-                libs_with_multiple_crts.push_back(lib);
-                continue;
-            }
-
-            // now we have exactly 1 crt
-            if (found_debug_static_crt)
-            {
-                libs_with_debug_static_crt.files.push_back(lib);
-                continue;
-            }
-            if (found_debug_dynamic_crt)
+            for (const BuildType& bad_build_type : bad_build_types)
             {
-                libs_with_debug_dynamic_crt.files.push_back(lib);
-                continue;
+                if (std::regex_search(ec_data.output.cbegin(), ec_data.output.cend(), bad_build_type.crt_regex()))
+                {
+                    libs_with_invalid_crt.push_back({lib, bad_build_type});
+                    break;
+                }
             }
+        }
 
-            if (found_release_static_crt)
+        if (!libs_with_invalid_crt.empty())
+        {
+            System::println(System::color::warning, "Expected %s crt linkage, but the following libs had invalid crt linkage:", expected_build_type.toString());
+            System::println("");
+            for (const BuildType_and_file btf : libs_with_invalid_crt)
             {
-                libs_with_release_static_crt.files.push_back(lib);
-                continue;
+                System::println("    %s: %s", btf.file.generic_string(), btf.build_type.toString());
             }
+            System::println("");
 
-            libs_with_release_dynamic_crt.files.push_back(lib);
+            System::println(System::color::warning, "To inspect the lib files, use:\n    dumpbin.exe /directives mylibfile.lib");
+            return lint_status::ERROR_DETECTED;
         }
 
-        if (!libs_with_no_crts.empty())
-        {
-            System::println(System::color::warning, "Could not detect the crt linkage in the following libs:");
-            print_vector_of_files(libs_with_no_crts);
-            output_status = lint_status::ERROR_DETECTED;
-        }
+        return lint_status::SUCCESS;
+    }
 
-        if (!libs_with_multiple_crts.empty())
-        {
-            System::println(System::color::warning, "Detected multiple crt linkages for the following libs:");
-            print_vector_of_files(libs_with_multiple_crts);
-            output_status = lint_status::ERROR_DETECTED;
-        }
+    struct OutdatedDynamicCrt_and_file
+    {
+        fs::path file;
+        OutdatedDynamicCrt outdated_crt;
+    };
+
+    static lint_status check_outdated_crt_linkage_of_dlls(const std::vector<fs::path>& dlls)
+    {
+        const std::vector<OutdatedDynamicCrt> outdated_crts = OutdatedDynamicCrt::values();
 
-        std::vector<BuildInfo_and_files> group_for_iteration = {
-            libs_with_debug_static_crt, libs_with_debug_dynamic_crt,
-            libs_with_release_static_crt, libs_with_release_dynamic_crt};
+        std::vector<OutdatedDynamicCrt_and_file> dlls_with_outdated_crt;
 
-        for (const BuildInfo_and_files& bif : group_for_iteration)
+        for (const fs::path& dll : dlls)
         {
-            if (!bif.files.empty() && bif.build_type != expected_build_type)
+            const std::wstring cmd_line = Strings::wformat(LR"("%s" /dependents "%s")", DUMPBIN_EXE.native(), dll.native());
+            System::exit_code_and_output ec_data = System::cmd_execute_and_capture_output(cmd_line);
+            Checks::check_exit(ec_data.exit_code == 0, "Running command:\n   %s\n failed", Strings::utf16_to_utf8(cmd_line));
+
+            for (const OutdatedDynamicCrt& outdated_crt : outdated_crts)
             {
-                System::println(System::color::warning, "Expected %s crt linkage, but the following libs had %s crt linkage:", expected_build_type.toString(), bif.build_type.toString());
-                print_vector_of_files(bif.files);
-                output_status = lint_status::ERROR_DETECTED;
+                if (std::regex_search(ec_data.output.cbegin(), ec_data.output.cend(), outdated_crt.crt_regex()))
+                {
+                    dlls_with_outdated_crt.push_back({dll, outdated_crt});
+                    break;
+                }
             }
         }
 
-        if (output_status == lint_status::ERROR_DETECTED)
+        if (!dlls_with_outdated_crt.empty())
         {
-            System::println(System::color::warning, "To inspect the lib files, use:\n    dumpbin.exe /directives mylibfile.lib");
+            System::println(System::color::warning, "Detected outdated dynamic CRT in the following files:");
+            System::println("");
+            for (const OutdatedDynamicCrt_and_file btf : dlls_with_outdated_crt)
+            {
+                System::println("    %s: %s", btf.file.generic_string(), btf.outdated_crt.toString());
+            }
+            System::println("");
+
+            System::println(System::color::warning, "To inspect the dll files, use:\n    dumpbin.exe /dependents mydllfile.dll");
+            return lint_status::ERROR_DETECTED;
         }
 
-        return output_status;
+        return lint_status::SUCCESS;
     }
 
     static void operator +=(size_t& left, const lint_status& right)
@@ -648,6 +629,8 @@ namespace vcpkg
                     error_count += check_exports_of_dlls(dlls);
                     error_count += check_uwp_bit_of_dlls(spec.target_triplet().system(), dlls);
                     error_count += check_dll_architecture(spec.target_triplet().architecture(), dlls);
+
+                    error_count += check_outdated_crt_linkage_of_dlls(dlls);
                     break;
                 }
             case LinkageType::STATIC:
@@ -658,10 +641,8 @@ namespace vcpkg
 
                     error_count += check_bin_folders_are_not_present_in_static_build(spec, paths);
 
-#if 0
                     error_count += check_crt_linkage_of_libs(BuildType::value_of(ConfigurationType::DEBUG, linkage_type_value_of(build_info.crt_linkage)), debug_libs);
                     error_count += check_crt_linkage_of_libs(BuildType::value_of(ConfigurationType::RELEASE, linkage_type_value_of(build_info.crt_linkage)), release_libs);
-#endif
                     break;
                 }
             case LinkageType::UNKNOWN: