[XcodeGen] Handle 'rule' declarations and generate command line args #78879
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hamishknight
approved these changes
Jan 24, 2025
utils/swift-xcodegen/Sources/SwiftXcodeGen/Ninja/NinjaParser.swift
Outdated
Show resolved
Hide resolved
utils/swift-xcodegen/Sources/SwiftXcodeGen/Ninja/NinjaParser.swift
Outdated
Show resolved
Hide resolved
utils/swift-xcodegen/Sources/SwiftXcodeGen/Ninja/NinjaBuildFile.swift
Outdated
Show resolved
Hide resolved
utils/swift-xcodegen/Sources/SwiftXcodeGen/BuildArgs/SwiftTargets.swift
Outdated
Show resolved
Hide resolved
utils/swift-xcodegen/Sources/SwiftXcodeGen/Ninja/NinjaBuildFile.swift
Outdated
Show resolved
Hide resolved
rintaro
force-pushed
the
xcodegen-commandline
branch
from
2563756 to
a80a5a5
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please smoke test macOS |
hamishknight
approved these changes
Jan 28, 2025
utils/swift-xcodegen/Sources/SwiftXcodeGen/Ninja/NinjaBuildFile.swift
Outdated
Show resolved
Hide resolved
utils/swift-xcodegen/Sources/SwiftXcodeGen/Ninja/NinjaBuildFile.swift
Outdated
Show resolved
Hide resolved
utils/swift-xcodegen/Sources/SwiftXcodeGen/Path/PathProtocol.swift
Outdated
Show resolved
Hide resolved
utils/swift-xcodegen/Tests/SwiftXcodeGenTest/NinjaParserTests.swift
Outdated
Show resolved
Hide resolved
utils/swift-xcodegen/Tests/SwiftXcodeGenTest/NinjaParserTests.swift
Outdated
Show resolved
Hide resolved
* Rename 'BuildRule to 'BuildEdige' because it is the official term * NinjaParser to handle 'include' and 'rule' directives * NinjaParser to handle parse "rule name" in 'build' correctly * Make variable table a simple `[String: String]` and keep any bindings to make the substitutions possible. * Generate command line argumets using 'command' variable in the 'rule' and use it as the source of truth, istead of using random known bindings like 'FLAGS'.
rintaro
force-pushed
the
xcodegen-commandline
branch
from
a80a5a5 to
8d2ac00
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please smoke test macOS |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
NinjaParserto handleincludeandruledirectivesNinjaParserto parse "rule name" inbuilddirective correctly[String: String]and keep any bindings to make the substitutions possiblecommandvariable in theruleand use it as the source of truth, instead of using random known bindings likeFLAGSPrimary motivation of this patch is to resolve an issue where
MACOSX_DEPLOYMENT_TARGETis not derived correctly because-targetargument is specified in therule. not inbuild. (see-targetin${build_dir}/CMakeFiles/rules.ninja). Because of that, some modules are (correctly) compiled for13.0, but some are incorrectly compiled for the current default deployment target.