From 80344223b5e99ff33f044de88e2b73f0e48c7931 Mon Sep 17 00:00:00 2001 From: Dale <1363082+dalemyers@users.noreply.github.com> Date: Thu, 22 Feb 2024 16:48:30 +0000 Subject: [PATCH 1/2] Add support for relative paths for exclusions Includes already support relative paths, but excludes don't. This means if you did something like ``` targets: Foo: sources: path: ../Foo excludes: - ../Foo/Bar ``` then it wouldn't work. This fix corrects that issue. --- Sources/XcodeGenKit/SourceGenerator.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/XcodeGenKit/SourceGenerator.swift b/Sources/XcodeGenKit/SourceGenerator.swift index 3abc303e2..7c49ea6c0 100644 --- a/Sources/XcodeGenKit/SourceGenerator.swift +++ b/Sources/XcodeGenKit/SourceGenerator.swift @@ -376,7 +376,7 @@ class SourceGenerator { patterns.parallelMap { pattern in guard !pattern.isEmpty else { return [] } return Glob(pattern: "\(rootSourcePath)/\(pattern)") - .map { Path($0) } + .map { Path($0).absolute() } .map { guard $0.isDirectory else { return [$0] From 7e34c597d2804e0093116b0b6f2940c13a75d98d Mon Sep 17 00:00:00 2001 From: Dale <1363082+dalemyers@users.noreply.github.com> Date: Thu, 22 Feb 2024 16:51:52 +0000 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a80e7321f..b1e30b511 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Next Version +### Fixed + +- Fixed exclusion of relative paths when including a relative path in target sources #1454 @dalemyers + ## 2.39.1 ### Added