Skip to content

[xcodegen] A couple of command-line handling tweaks #81350

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

Jump to bottom
Merged
merged 4 commits into from
May 7, 2025
Merged

[xcodegen] A couple of command-line handling tweaks #81350

merged 4 commits into from
May 7, 2025
+99 −102

Conversation

hamishknight
Copy link
Contributor

@hamishknight hamishknight commented May 7, 2025 •
edited
Loading

  • Match common prefix instead of forming a set intersection for Clang arguments
  • Ignore -fdiagnostics-color
  • Remove overly-defensive check for input Swift files in multiple targets
  • Ensure we stop parsing Ninja command lines when encountering a shell operator

@hamishknight hamishknight changed the title [xcodegen] A couple of tweaks [xcodegen] A couple of command-line handling tweaks May 7, 2025
@hamishknight hamishknight enabled auto-merge May 7, 2025 10:50
@hamishknight
[xcodegen] Match common prefix in CommandArgTree
abc099c 
Rather than forming a set intersection, only look for a common prefix
with the parent arguments. This is both quicker and more correct
since arguments can be order-dependent. This does mean we'll end up
with more per-file arguments for "umbrella" targets, but that at
least will no longer prevent us from forming buildable folders for
them.
@hamishknight
[xcodegen] Ignore -fdiagnostics-color
a404893 
Avoid introducing ANSI escape sequences in the Xcode build log.
@hamishknight
[xcodegen] Remove duplicate file check from tryAddTarget
71d367a 
I don't recall why I added this, a file can be in multiple targets
and xcodegen handles that case just fine.
@hamishknight
[xcodegen] Stop at shell operator in parseKnownCommandOnly
8503ce0 
We're dealing with a potentially arbitary shell command here, so make
sure we don't continue parsing after a shell operator such as `&&`.
@hamishknight
Copy link
Contributor Author

@swift-ci please smoke test

@hamishknight hamishknight merged commit df32362 into swiftlang:main May 7, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@hamishknight