Introduce new defines to enable #bundle in Swift Packages #8556
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
matthewseaman
requested review from
MaxDesiatov,
bkhouri,
bnbarham,
bripeticca,
cmcgee1024,
daveyc123,
dschaefer2,
jakepetroules,
owenv,
plemarquand,
shawnhyam and
xedin
as code owners
neonichu
reviewed
Apr 24, 2025
| if bundlePath != nil { | ||
| compilationConditions += ["-DSWIFT_MODULE_RESOURCE_BUNDLE_AVAILABLE=1"] | ||
| } else { | ||
| compilationConditions += ["-DSWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLE=1"] |
There was a problem hiding this comment.
Won't this trigger
warning: conditional compilation flags do not have values in Swift; they are either present or absent
There was a problem hiding this comment.
oh good catch! I was copying the wrong pattern from the Clang version.
|
@swift-ci please test |
jakepetroules
requested changes
Apr 24, 2025
|
@swift-ci please test |
matthewseaman
force-pushed
the
mseaman/149806691-pound-bundle-support
branch
from
96c5bae to
c052c54
Compare
|
@swift-ci please test |
|
@swift-ci test windows |
|
Foundation implementation has landed via swiftlang/swift-foundation#1274 |
jakepetroules
approved these changes
Apr 30, 2025
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.
Introduce Swift compilation conditions to support
#bundlein Foundation.Motivation:
This is the SwiftPM companion to
#bundle.Pitch: https://forums.swift.org/t/pitch-introduce-bundle-macro/79288
Proposal: swiftlang/swift-foundation#1251
Implementation: swiftlang/swift-foundation#1274
Modifications:
Define
SWIFT_MODULE_RESOURCE_BUNDLE_AVAILABLEwhen we'd like#bundleto call our generatedBundle.module.Define
SWIFT_MODULE_RESOURCE_BUNDLE_UNAVAILABLEwhen there are no resources and#bundleshould complain about that.Leave them both undefined when we'd like
#bundleto keep its default behavior of using the same bundle where the source code lives.Result:
#bundlewill point to the correct resource bundle when called from Swift Packages.