Throw an error for a library clang target if include dir is not found

Author: elsh

Sources/PackageLoading/PackageBuilder.swift

@@ -916,6 +916,10 @@ public final class PackageBuilder {
             // First determine the type of module map that will be appropriate for the target based on its header layout.
             // FIXME: We should really be checking the target type to see whether it is one that can vend headers, not just check for the existence of the public headers path.  But right now we have now way of distinguishing between, for example, a library and an executable.  The semantics here should be to only try to detect the header layout of targets that can vend public headers.
             let moduleMapType: ModuleMapType
+            
+            if targetType == .library, !fileSystem.exists(publicHeadersPath) {
+                throw ModuleError.invalidPublicHeadersDirectory(potentialModule.name)
+            }
             if fileSystem.exists(publicHeadersPath) {
                 let moduleMapGenerator = ModuleMapGenerator(targetName: potentialModule.name, moduleName: potentialModule.name.spm_mangledToC99ExtendedIdentifier(), publicHeadersDir: publicHeadersPath, fileSystem: fileSystem)
                 moduleMapType = moduleMapGenerator.determineModuleMapType(diagnostics: diagnostics)

Sources/PackageModel/Target.swift

@@ -10,7 +10,6 @@
 
 import TSCBasic
 import TSCUtility
-import Foundation
 
 public class Target: ObjectIdentifierProtocol, PolymorphicCodableProtocol {
     public static var implementations: [PolymorphicCodableProtocol.Type] = [
@@ -429,7 +428,7 @@ public final class ClangTarget: Target {
         buildSettings: BuildSettings.AssignmentTable = .init()
     ) {
 
-        assert(includeDir.isDirectory && includeDir.contains(sources.root), "\(includeDir) should be contained in the source root \(sources.root)")
+        assert(includeDir.contains(sources.root), "\(includeDir) should be contained in the source root \(sources.root)")
         self.isCXX = sources.containsCXXFiles
         self.cLanguageStandard = cLanguageStandard
         self.cxxLanguageStandard = cxxLanguageStandard
@@ -668,12 +667,3 @@ public enum PluginCapability: Equatable, Codable {
         }
     }
 }
-
-
-fileprivate extension AbsolutePath {
-  var isDirectory: Bool {
-      var isDir: ObjCBool = false
-      let exists = FileManager.default.fileExists(atPath: self.pathString, isDirectory: &isDir)
-      return exists && isDir.boolValue
-  }
-}