Add new Policy: Empty Package

4 files changed, 72 insertions, 41 deletions

diff --git a/scripts/ports.cmake b/scripts/ports.cmake
index cc01a0619..c03b005ea 100644
--- a/scripts/ports.cmake
+++ b/scripts/ports.cmake
@@ -79,6 +79,9 @@ if(CMD MATCHES "^BUILD$")
     if (DEFINED VCPKG_POLICY_DLLS_WITHOUT_LIBS)
         file(APPEND ${BUILD_INFO_FILE_PATH} "PolicyDLLsWithoutLIBs: ${VCPKG_POLICY_DLLS_WITHOUT_LIBS}\n")
     endif()
+    if (DEFINED VCPKG_POLICY_EMPTY_PACKAGE)
+        file(APPEND ${BUILD_INFO_FILE_PATH} "PolicyEmptyPackage: ${VCPKG_POLICY_EMPTY_PACKAGE}\n")
+    endif()
 elseif(CMD MATCHES "^CREATE$")
     file(TO_NATIVE_PATH ${VCPKG_ROOT_DIR} NATIVE_VCPKG_ROOT_DIR)
     file(TO_NATIVE_PATH ${DOWNLOADS} NATIVE_DOWNLOADS)
diff --git a/toolsrc/include/PostBuildLint_BuildPolicies.h b/toolsrc/include/PostBuildLint_BuildPolicies.h
index 8298ffe2d..187ba6d64 100644
--- a/toolsrc/include/PostBuildLint_BuildPolicies.h
+++ b/toolsrc/include/PostBuildLint_BuildPolicies.h
@@ -6,6 +6,7 @@ namespace vcpkg::PostBuildLint::BuildPolicies
     enum class backing_enum_t
     {
         UNKNOWN = 0,
+        EMPTY_PACKAGE,
         DLLS_WITHOUT_LIBS
     };
 
@@ -22,10 +23,12 @@ namespace vcpkg::PostBuildLint::BuildPolicies
         backing_enum_t backing_enum;
     };
 
-    static constexpr int value_count = 2;
+    static constexpr int value_count = 3;
     const std::vector<type>& values();
 
+
     static constexpr type UNKNOWN(backing_enum_t::UNKNOWN);
+    static constexpr type EMPTY_PACKAGE(backing_enum_t::EMPTY_PACKAGE);
     static constexpr type DLLS_WITHOUT_LIBS(backing_enum_t::DLLS_WITHOUT_LIBS);
 
     type parse(const std::string& s);
diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/PostBuildLint.cpp
index 5954089e9..533e28fcf 100644
--- a/toolsrc/src/PostBuildLint.cpp
+++ b/toolsrc/src/PostBuildLint.cpp
@@ -582,16 +582,21 @@ namespace vcpkg::PostBuildLint
         left += static_cast<size_t>(right);
     }
 
-    void perform_all_checks(const package_spec& spec, const vcpkg_paths& paths)
+    static size_t perform_all_checks_and_return_error_count(const package_spec& spec, const vcpkg_paths& paths)
     {
         const fs::path dumpbin_exe = Environment::get_dumpbin_exe(paths);
 
-        System::println("-- Performing post-build validation");
-
         BuildInfo build_info = read_build_info(paths.build_info_file_path(spec));
         const fs::path package_dir = paths.package_dir(spec);
 
         size_t error_count = 0;
+
+        auto it = build_info.policies.find(BuildPolicies::EMPTY_PACKAGE);
+        if (it != build_info.policies.cend() && it->second == opt_bool_t::ENABLED)
+        {
+            return error_count;
+        }
+
         error_count += check_for_files_in_include_directory(package_dir);
         error_count += check_for_files_in_debug_include_directory(package_dir);
         error_count += check_for_files_in_debug_share_directory(package_dir);
@@ -620,56 +625,65 @@ namespace vcpkg::PostBuildLint
 
         switch (linkage_type_value_of(build_info.library_linkage))
         {
-            case LinkageType::DYNAMIC:
-                {
-                    const std::vector<fs::path> debug_dlls = Files::recursive_find_files_with_extension_in_dir(debug_bin_dir, ".dll");
-                    const std::vector<fs::path> release_dlls = Files::recursive_find_files_with_extension_in_dir(release_bin_dir, ".dll");
+        case LinkageType::DYNAMIC:
+        {
+            const std::vector<fs::path> debug_dlls = Files::recursive_find_files_with_extension_in_dir(debug_bin_dir, ".dll");
+            const std::vector<fs::path> release_dlls = Files::recursive_find_files_with_extension_in_dir(release_bin_dir, ".dll");
 
-                    error_count += check_matching_debug_and_release_binaries(debug_dlls, release_dlls);
+            error_count += check_matching_debug_and_release_binaries(debug_dlls, release_dlls);
 
-                    error_count += check_lib_files_are_available_if_dlls_are_available(build_info.policies, debug_libs.size(), debug_dlls.size(), debug_lib_dir);
-                    error_count += check_lib_files_are_available_if_dlls_are_available(build_info.policies, release_libs.size(), release_dlls.size(), release_lib_dir);
+            error_count += check_lib_files_are_available_if_dlls_are_available(build_info.policies, debug_libs.size(), debug_dlls.size(), debug_lib_dir);
+            error_count += check_lib_files_are_available_if_dlls_are_available(build_info.policies, release_libs.size(), release_dlls.size(), release_lib_dir);
 
-                    std::vector<fs::path> dlls;
-                    dlls.insert(dlls.cend(), debug_dlls.cbegin(), debug_dlls.cend());
-                    dlls.insert(dlls.cend(), release_dlls.cbegin(), release_dlls.cend());
+            std::vector<fs::path> dlls;
+            dlls.insert(dlls.cend(), debug_dlls.cbegin(), debug_dlls.cend());
+            dlls.insert(dlls.cend(), release_dlls.cbegin(), release_dlls.cend());
 
-                    error_count += check_exports_of_dlls(dlls, dumpbin_exe);
-                    error_count += check_uwp_bit_of_dlls(spec.target_triplet().system(), dlls, dumpbin_exe);
-                    error_count += check_dll_architecture(spec.target_triplet().architecture(), dlls);
+            error_count += check_exports_of_dlls(dlls, dumpbin_exe);
+            error_count += check_uwp_bit_of_dlls(spec.target_triplet().system(), dlls, dumpbin_exe);
+            error_count += check_dll_architecture(spec.target_triplet().architecture(), dlls);
 
-                    error_count += check_outdated_crt_linkage_of_dlls(dlls, dumpbin_exe);
-                    break;
-                }
-            case LinkageType::STATIC:
-                {
-                    std::vector<fs::path> dlls;
-                    Files::recursive_find_files_with_extension_in_dir(package_dir, ".dll", &dlls);
-                    error_count += check_no_dlls_present(dlls);
+            error_count += check_outdated_crt_linkage_of_dlls(dlls, dumpbin_exe);
+            break;
+        }
+        case LinkageType::STATIC:
+        {
+            std::vector<fs::path> dlls;
+            Files::recursive_find_files_with_extension_in_dir(package_dir, ".dll", &dlls);
+            error_count += check_no_dlls_present(dlls);
 
-                    error_count += check_bin_folders_are_not_present_in_static_build(package_dir);
+            error_count += check_bin_folders_are_not_present_in_static_build(package_dir);
 
-                    error_count += check_crt_linkage_of_libs(BuildType::value_of(ConfigurationType::DEBUG, linkage_type_value_of(build_info.crt_linkage)), debug_libs, dumpbin_exe);
-                    error_count += check_crt_linkage_of_libs(BuildType::value_of(ConfigurationType::RELEASE, linkage_type_value_of(build_info.crt_linkage)), release_libs, dumpbin_exe);
-                    break;
-                }
-            case LinkageType::UNKNOWN:
-                {
-                    error_count += 1;
-                    System::println(System::color::warning, "Unknown library_linkage architecture: [ %s ]", build_info.library_linkage);
-                    break;
-                }
-            default:
-                Checks::unreachable();
+            error_count += check_crt_linkage_of_libs(BuildType::value_of(ConfigurationType::DEBUG, linkage_type_value_of(build_info.crt_linkage)), debug_libs, dumpbin_exe);
+            error_count += check_crt_linkage_of_libs(BuildType::value_of(ConfigurationType::RELEASE, linkage_type_value_of(build_info.crt_linkage)), release_libs, dumpbin_exe);
+            break;
+        }
+        case LinkageType::UNKNOWN:
+        {
+            error_count += 1;
+            System::println(System::color::warning, "Unknown library_linkage architecture: [ %s ]", build_info.library_linkage);
+            break;
+        }
+        default:
+            Checks::unreachable();
         }
 #if 0
-            error_count += check_no_subdirectories(package_dir / "lib");
-            error_count += check_no_subdirectories(package_dir / "debug" / "lib");
+        error_count += check_no_subdirectories(package_dir / "lib");
+        error_count += check_no_subdirectories(package_dir / "debug" / "lib");
 #endif
 
         error_count += check_no_empty_folders(package_dir);
         error_count += check_no_files_in_package_dir_and_debug_dir(package_dir);
 
+        return error_count;
+    }
+
+    void perform_all_checks(const package_spec& spec, const vcpkg_paths& paths)
+    {
+        System::println("-- Performing post-build validation");
+
+        const size_t error_count = perform_all_checks_and_return_error_count(spec, paths);
+
         if (error_count != 0)
         {
             const fs::path portfile = paths.ports / spec.name() / "portfile.cmake";
diff --git a/toolsrc/src/PostBuildLint_BuildPolicies.cpp b/toolsrc/src/PostBuildLint_BuildPolicies.cpp
index d7d67c991..4e5ac3cea 100644
--- a/toolsrc/src/PostBuildLint_BuildPolicies.cpp
+++ b/toolsrc/src/PostBuildLint_BuildPolicies.cpp
@@ -5,12 +5,15 @@
 namespace vcpkg::PostBuildLint::BuildPolicies
 {
     static const std::string NAME_UNKNOWN = "PolicyUnknown";
+    static const std::string NAME_EMPTY_PACKAGE = "PolicyEmptyPackage";
     static const std::string NAME_DLLS_WITHOUT_LIBS = "PolicyDLLsWithoutLIBs";
 
     const std::string& type::toString() const
     {
         switch (this->backing_enum)
         {
+            case EMPTY_PACKAGE:
+                return NAME_EMPTY_PACKAGE;
             case DLLS_WITHOUT_LIBS:
                 return NAME_DLLS_WITHOUT_LIBS;
             case UNKNOWN:
@@ -22,10 +25,13 @@ namespace vcpkg::PostBuildLint::BuildPolicies
 
     const std::string& type::cmake_variable() const
     {
+        static const std::string CMAKE_VARIABLE_EMPTY_PACKAGE = "VCPKG_POLICY_EMPTY_PACKAGE";
         static const std::string CMAKE_VARIABLE_DLLS_WITHOUT_LIBS = "VCPKG_POLICY_DLLS_WITHOUT_LIBS";
 
         switch (this->backing_enum)
         {
+            case EMPTY_PACKAGE:
+                return CMAKE_VARIABLE_EMPTY_PACKAGE;
             case DLLS_WITHOUT_LIBS:
                 return CMAKE_VARIABLE_DLLS_WITHOUT_LIBS;
             case UNKNOWN:
@@ -39,12 +45,17 @@ namespace vcpkg::PostBuildLint::BuildPolicies
 
     const std::vector<type>& values()
     {
-        static const std::vector<type>& v = {UNKNOWN, DLLS_WITHOUT_LIBS};
+        static const std::vector<type>& v = {UNKNOWN, EMPTY_PACKAGE, DLLS_WITHOUT_LIBS};
         return v;
     }
 
     type parse(const std::string& s)
     {
+        if (s == NAME_EMPTY_PACKAGE)
+        {
+            return BuildPolicies::EMPTY_PACKAGE;
+        }
+
         if (s == NAME_DLLS_WITHOUT_LIBS)
         {
             return BuildPolicies::DLLS_WITHOUT_LIBS;