Skip to content

[PackageLoading] Disable modulemap mixed with sources check #2394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 31, 2019
Merged

[PackageLoading] Disable modulemap mixed with sources check #2394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Sources/PackageLoading/PackageBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,13 +659,19 @@ public final class PackageBuilder {
throw ModuleError.invalidPublicHeadersDirectory(potentialModule.name)
}

// Exclude public headers path directory from source searching if it's not
// the target root.
// FIXME: This means we'll try to assign rules to header files
// which is currently not handled by the sources builder.
let extraExcludes = publicHeadersPath != potentialModule.path ? [publicHeadersPath] : []

let sourcesBuilder = TargetSourcesBuilder(
packageName: manifest.name,
packagePath: packagePath,
target: manifestTarget,
path: potentialModule.path,
additionalFileRules: additionalFileRules,
extraExcludes: [publicHeadersPath],
extraExcludes: extraExcludes,
toolsVersion: manifest.toolsVersion,
fs: fileSystem,
diags: diagnostics
Expand Down
6 changes: 0 additions & 6 deletions Sources/PackageLoading/TargetSourcesBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,6 @@ public struct TargetSourcesBuilder {
throw Target.Error.mixedSources(targetPath)
}

// Make sure there is no modulemap mixed with the sources.
let moduleMapFiles = pathToRule.filter{ $0.value == .modulemap }
if let moduleMapFile = moduleMapFiles.first {
throw ModuleError.invalidLayout(.modulemapInSources(moduleMapFile.key))
}

return (sources, resources)
}

Expand Down
35 changes: 4 additions & 31 deletions Tests/PackageLoadingTests/PackageBuilderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,13 @@ class PackageBuilderTests: XCTestCase {
}

func testModuleMapLayout() throws {
var fs = InMemoryFileSystem(emptyFiles:
let fs = InMemoryFileSystem(emptyFiles:
"/Sources/clib/include/module.modulemap",
"/Sources/clib/include/clib.h",
"/Sources/clib/clib.c")
"/Sources/clib/clib.c"
)

var manifest = Manifest.createV4Manifest(
let manifest = Manifest.createV4Manifest(
name: "MyPackage",
targets: [
TargetDescription(name: "clib"),
Expand All @@ -183,34 +184,6 @@ class PackageBuilderTests: XCTestCase {
moduleResult.checkSources(root: "/Sources/clib", paths: "clib.c")
}
}

fs = InMemoryFileSystem(emptyFiles:
"/Sources/clib/module.modulemap",
"/Sources/clib/foo.swift")
manifest = Manifest.createV4Manifest(
name: "MyPackage",
targets: [
TargetDescription(name: "clib"),
]
)
PackageBuilderTester(manifest, in: fs) { result in
result.checkDiagnostic("package has unsupported layout; modulemap '/Sources/clib/module.modulemap' should be inside the 'include' directory")
}

fs = InMemoryFileSystem(emptyFiles:
"/Sources/Foo/module.modulemap",
"/Sources/Foo/foo.swift",
"/Sources/Bar/bar.swift")
manifest = Manifest.createV4Manifest(
name: "MyPackage",
targets: [
TargetDescription(name: "Foo"),
TargetDescription(name: "Bar"),
]
)
PackageBuilderTester(manifest, in: fs) { result in
result.checkDiagnostic("package has unsupported layout; modulemap '/Sources/Foo/module.modulemap' should be inside the 'include' directory")
}
}

func testDeclaredExecutableProducts() {
Expand Down