Allow creating intermediary groups outside of the project directory #892
Conversation
segiddins
force-pushed
the
segiddins/889-create-intermediadary-groups-outside-of-project-dir
branch
from
a0aad0e
to
c5013d5
Compare
| @@ -492,7 +492,7 @@ class SourceGeneratorTests: XCTestCase { | |||
| let pbxProj = try project.generatePbxProj() | |||
| try pbxProj.expectFile(paths: ["Sources", "A", "b.swift"], buildPhase: .sources) | |||
| try pbxProj.expectFile(paths: ["Sources", "F", "G", "h.swift"], buildPhase: .sources) | |||
| try pbxProj.expectFile(paths: ["../OtherDirectory/C/D", "e.swift"], names: ["D", "e.swift"], buildPhase: .sources) | |||
| try pbxProj.expectFile(paths: ["..", "OtherDirectory", "C", "D", "e.swift"], names: [".", "OtherDirectory", "C", "D", "e.swift"], buildPhase: .sources) | |||
There was a problem hiding this comment.
Are there other test cases you can think of for this?
There was a problem hiding this comment.
Thanks @segiddins. I'm trying to think of why this wasn't done before. Can you envisage any issues when running this with a different --spec or --project path? There aren't enough tests around those use cases.
Could you also add a changelog entry
|
I'll try to pick this back up next week, thanks for the review! |
segiddins
force-pushed
the
segiddins/889-create-intermediadary-groups-outside-of-project-dir
branch
from
c5013d5
to
84f1daf
Compare
|
@yonaskolb this should be ready now, sorry for the delay! |
|
@yonaskolb any other changes you'd like me to make? |
| // has no valid parent paths | ||
| let isRootPath = (isBaseGroup && isOutOfBasePath) || path.parent() == project.basePath | ||
| let isRootPath = (isBaseGroup && isOutOfBasePath && isParentOfBasePath) || path.parent() == project.basePath |
There was a problem hiding this comment.
I think this line can lose the && isParentOfBasePath.
isOutOfBasePath captures the intent and isRootPath is used in the line below. Or am I reading it wrong?
There was a problem hiding this comment.
I don't think it can. For example, for a project in ., ../foo/bar.txt shouldn't be considered the root path -- the root path should be a strict parent of the current directory
|
Ping on merging this before the next release? |
segiddins
deleted the
segiddins/889-create-intermediadary-groups-outside-of-project-dir
branch
Resolves #889
Putting this out as a potential solution -- I'm new to the codebase, so I'm not sure if there's maybe a better way of doing this, or if there's a reason this is unacceptable. Just wanted to try it out, since it makes the projects we're generating via bazel in a scratch directory nicer to edit