Merge pull request #1144 from STEllAR-GROUP/add_policy

Adding policy ALLOW_OBSOLETE_MSVCRT suppressing dependency check for msvcrt.dll

2 files changed, 49 insertions, 27 deletions

diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/PostBuildLint.cpp
index 0d2f556c1..4491f3f2e 100644
--- a/toolsrc/src/PostBuildLint.cpp
+++ b/toolsrc/src/PostBuildLint.cpp
@@ -37,30 +37,6 @@ namespace vcpkg::PostBuildLint
         }
     };
 
-    const std::vector<OutdatedDynamicCrt>& get_outdated_dynamic_crts()
-    {
-        static const std::vector<OutdatedDynamicCrt> v = {{"msvcp100.dll", R"(msvcp100\.dll)"},
-                                                          {"msvcp100d.dll", R"(msvcp100d\.dll)"},
-                                                          {"msvcp110.dll", R"(msvcp110\.dll)"},
-                                                          {"msvcp110_win.dll", R"(msvcp110_win\.dll)"},
-                                                          {"msvcp120.dll", R"(msvcp120\.dll)"},
-                                                          {"msvcp120_clr0400.dll", R"(msvcp120_clr0400\.dll)"},
-                                                          {"msvcp60.dll", R"(msvcp60\.dll)"},
-                                                          {"msvcp60.dll", R"(msvcp60\.dll)"},
-
-                                                          {"msvcr100.dll", R"(msvcr100\.dll)"},
-                                                          {"msvcr100d.dll", R"(msvcr100d\.dll)"},
-                                                          {"msvcr100_clr0400.dll", R"(msvcr100_clr0400\.dll)"},
-                                                          {"msvcr110.dll", R"(msvcr110\.dll)"},
-                                                          {"msvcr120.dll", R"(msvcr120\.dll)"},
-                                                          {"msvcr120_clr0400.dll", R"(msvcr120_clr0400\.dll)"},
-                                                          {"msvcrt.dll", R"(msvcrt\.dll)"},
-                                                          {"msvcrt20.dll", R"(msvcrt20\.dll)"},
-                                                          {"msvcrt40.dll", R"(msvcrt40\.dll)"}};
-
-        return v;
-    }
-
     template<class T>
     static bool contains_and_enabled(const std::map<T, bool> map, const T& key)
     {
@@ -70,6 +46,41 @@ namespace vcpkg::PostBuildLint
         return false;
     }
 
+    const std::vector<OutdatedDynamicCrt>& get_outdated_dynamic_crts(const std::map<BuildPolicies, bool>& policies)
+    {
+        static const std::vector<OutdatedDynamicCrt> v_no_msvcrt = {
+            {"msvcp100.dll", R"(msvcp100\.dll)"},
+            {"msvcp100d.dll", R"(msvcp100d\.dll)"},
+            {"msvcp110.dll", R"(msvcp110\.dll)"},
+            {"msvcp110_win.dll", R"(msvcp110_win\.dll)"},
+            {"msvcp120.dll", R"(msvcp120\.dll)"},
+            {"msvcp120_clr0400.dll", R"(msvcp120_clr0400\.dll)"},
+            {"msvcp60.dll", R"(msvcp60\.dll)"},
+            {"msvcp60.dll", R"(msvcp60\.dll)"},
+
+            {"msvcr100.dll", R"(msvcr100\.dll)"},
+            {"msvcr100d.dll", R"(msvcr100d\.dll)"},
+            {"msvcr100_clr0400.dll", R"(msvcr100_clr0400\.dll)"},
+            {"msvcr110.dll", R"(msvcr110\.dll)"},
+            {"msvcr120.dll", R"(msvcr120\.dll)"},
+            {"msvcr120_clr0400.dll", R"(msvcr120_clr0400\.dll)"},
+            {"msvcrt20.dll", R"(msvcrt20\.dll)"},
+            {"msvcrt40.dll", R"(msvcrt40\.dll)"}};
+
+        static const std::vector<OutdatedDynamicCrt> v = [&]() {
+            auto ret = v_no_msvcrt;
+            ret.push_back(OutdatedDynamicCrt{"msvcrt.dll", R"(msvcrt\.dll)"});
+            return ret;
+        }();
+
+        if (contains_and_enabled(policies, BuildPoliciesC::ALLOW_OBSOLETE_MSVCRT))
+        {
+            return v_no_msvcrt;
+        }
+
+        return v;
+    }
+
     static LintStatus check_for_files_in_include_directory(const Files::Filesystem& fs,
                                                            const std::map<BuildPolicies, bool>& policies,
                                                            const fs::path& package_dir)
@@ -656,9 +667,11 @@ namespace vcpkg::PostBuildLint
         OutdatedDynamicCrt_and_file() = delete;
     };
 
-    static LintStatus check_outdated_crt_linkage_of_dlls(const std::vector<fs::path>& dlls, const fs::path dumpbin_exe)
+    static LintStatus check_outdated_crt_linkage_of_dlls(const std::vector<fs::path>& dlls,
+                                                         const fs::path dumpbin_exe,
+                                                         const BuildInfo& build_info)
     {
-        const std::vector<OutdatedDynamicCrt>& outdated_crts = get_outdated_dynamic_crts();
+        const std::vector<OutdatedDynamicCrt>& outdated_crts = get_outdated_dynamic_crts(build_info.policies);
 
         std::vector<OutdatedDynamicCrt_and_file> dlls_with_outdated_crt;
 
@@ -798,7 +811,7 @@ namespace vcpkg::PostBuildLint
                 error_count += check_uwp_bit_of_dlls(pre_build_info.cmake_system_name, dlls, toolset.dumpbin);
                 error_count += check_dll_architecture(pre_build_info.target_architecture, dlls);
 
-                error_count += check_outdated_crt_linkage_of_dlls(dlls, toolset.dumpbin);
+                error_count += check_outdated_crt_linkage_of_dlls(dlls, toolset.dumpbin, build_info);
                 break;
             }
             case LinkageType::BackingEnum::STATIC:
diff --git a/toolsrc/src/PostBuildLint_BuildPolicies.cpp b/toolsrc/src/PostBuildLint_BuildPolicies.cpp
index 001ba31e7..d2189e20d 100644
--- a/toolsrc/src/PostBuildLint_BuildPolicies.cpp
+++ b/toolsrc/src/PostBuildLint_BuildPolicies.cpp
@@ -12,6 +12,7 @@ namespace vcpkg::PostBuildLint
     static const std::string NAME_DLLS_WITHOUT_LIBS = "PolicyDLLsWithoutLIBs";
     static const std::string NAME_ONLY_RELEASE_CRT = "PolicyOnlyReleaseCRT";
     static const std::string NAME_EMPTY_INCLUDE_FOLDER = "PolicyEmptyIncludeFolder";
+    static const std::string NAME_ALLOW_OBSOLETE_MSVCRT = "PolicyAllowObsoleteMsvcrt";
 
     BuildPolicies BuildPolicies::parse(const std::string& s)
     {
@@ -35,6 +36,11 @@ namespace vcpkg::PostBuildLint
             return BuildPoliciesC::EMPTY_INCLUDE_FOLDER;
         }
 
+        if (s == NAME_ALLOW_OBSOLETE_MSVCRT)
+        {
+            return BuildPoliciesC::ALLOW_OBSOLETE_MSVCRT;
+        }
+
         return BuildPoliciesC::NULLVALUE;
     }
 
@@ -46,6 +52,7 @@ namespace vcpkg::PostBuildLint
             case BuildPoliciesC::DLLS_WITHOUT_LIBS: return NAME_DLLS_WITHOUT_LIBS;
             case BuildPoliciesC::ONLY_RELEASE_CRT: return NAME_ONLY_RELEASE_CRT;
             case BuildPoliciesC::EMPTY_INCLUDE_FOLDER: return NAME_EMPTY_INCLUDE_FOLDER;
+            case BuildPoliciesC::ALLOW_OBSOLETE_MSVCRT: return NAME_ALLOW_OBSOLETE_MSVCRT;
             case BuildPoliciesC::NULLVALUE: return NULLVALUE_STRING;
             default: Checks::unreachable(VCPKG_LINE_INFO);
         }
@@ -57,6 +64,7 @@ namespace vcpkg::PostBuildLint
         static const std::string CMAKE_VARIABLE_DLLS_WITHOUT_LIBS = "VCPKG_POLICY_DLLS_WITHOUT_LIBS";
         static const std::string CMAKE_VARIABLE_ONLY_RELEASE_CRT = "VCPKG_POLICY_ONLY_RELEASE_CRT";
         static const std::string CMAKE_VARIABLE_EMPTY_INCLUDE_FOLDER = "VCPKG_POLICY_EMPTY_INCLUDE_FOLDER";
+        static const std::string CMAKE_VARIABLE_ALLOW_OBSOLETE_MSVCRT = "VCPKG_POLICY_ALLOW_OBSOLETE_MSVCRT";
 
         switch (this->backing_enum)
         {
@@ -64,6 +72,7 @@ namespace vcpkg::PostBuildLint
             case BuildPoliciesC::DLLS_WITHOUT_LIBS: return CMAKE_VARIABLE_DLLS_WITHOUT_LIBS;
             case BuildPoliciesC::ONLY_RELEASE_CRT: return CMAKE_VARIABLE_ONLY_RELEASE_CRT;
             case BuildPoliciesC::EMPTY_INCLUDE_FOLDER: return CMAKE_VARIABLE_EMPTY_INCLUDE_FOLDER;
+            case BuildPoliciesC::ALLOW_OBSOLETE_MSVCRT: return CMAKE_VARIABLE_ALLOW_OBSOLETE_MSVCRT;
             case BuildPoliciesC::NULLVALUE: Enums::nullvalue_used(VCPKG_LINE_INFO, BuildPoliciesC::ENUM_NAME);
             default: Checks::unreachable(VCPKG_LINE_INFO);
         }