Skip to content

Commit 32f39de

Browse files
authored
Merge pull request #1096 from aciidb0mb3r/predefined-sources-dir
[PackageBuilder] Make predefined list of sources and tests directorie…
2 parents 59f2629 + fc31d2c commit 32f39de

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Sources/PackageLoading/PackageBuilder.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -436,11 +436,11 @@ public final class PackageBuilder {
436436
return try constructV4Targets()
437437
}
438438

439-
/// Predefined source directories.
440-
private let predefinedSourceDirectories = ["Sources", "Source", "src", "srcs"]
439+
/// Predefined source directories, in order of preference.
440+
public static let predefinedSourceDirectories = ["Sources", "Source", "src", "srcs"]
441441

442-
/// Predefined test directories.
443-
private let predefinedTestDirectories = ["Tests", "Sources", "Source", "src", "srcs"]
442+
/// Predefined test directories, in order of preference.
443+
public static let predefinedTestDirectories = ["Tests", "Sources", "Source", "src", "srcs"]
444444

445445
/// Construct targets according to PackageDescription 4 conventions.
446446
fileprivate func constructV4Targets() throws -> [Target] {
@@ -458,7 +458,7 @@ public final class PackageBuilder {
458458
throw ModuleError.modulesNotFound([target.name])
459459
}
460460
// Select the correct predefined directory list.
461-
let predefinedDirs = target.isTest ? predefinedTestDirectories : predefinedSourceDirectories
461+
let predefinedDirs = target.isTest ? PackageBuilder.predefinedTestDirectories : PackageBuilder.predefinedSourceDirectories
462462
for directory in predefinedDirs {
463463
let path = packagePath.appending(components: directory, target.name)
464464
if fileSystem.isDirectory(path) {

0 commit comments

Comments
 (0)