-
Notifications
You must be signed in to change notification settings - Fork 237
split the unsafeFlags-using manifest to a Swift 6.2 minimum version #245
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| // swift-tools-version:5.7 | ||
| /* | ||
| This source file is part of the Swift.org open source project | ||
|
|
||
| Copyright (c) 2021-2023 Apple Inc. and the Swift project authors | ||
| Licensed under Apache License v2.0 with Runtime Library Exception | ||
|
|
||
| See https://swift.org/LICENSE.txt for license information | ||
| See https://swift.org/CONTRIBUTORS.txt for Swift project authors | ||
| */ | ||
|
|
||
| import PackageDescription | ||
| import class Foundation.ProcessInfo | ||
|
|
||
| let cmarkPackageName = ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil ? "swift-cmark" : "cmark" | ||
|
|
||
| let package = Package( | ||
| name: "swift-markdown", | ||
| products: [ | ||
| .library( | ||
| name: "Markdown", | ||
| targets: ["Markdown"]), | ||
| ], | ||
| targets: [ | ||
| .target( | ||
| name: "Markdown", | ||
| dependencies: [ | ||
| "CAtomic", | ||
| .product(name: "cmark-gfm", package: cmarkPackageName), | ||
| .product(name: "cmark-gfm-extensions", package: cmarkPackageName), | ||
| ], | ||
| exclude: [ | ||
| "CMakeLists.txt" | ||
| ] | ||
| ), | ||
| .testTarget( | ||
| name: "MarkdownTests", | ||
| dependencies: ["Markdown"], | ||
| resources: [.process("Visitors/Everything.md")]), | ||
| .target(name: "CAtomic"), | ||
| ] | ||
| ) | ||
|
|
||
| // If the `SWIFTCI_USE_LOCAL_DEPS` environment variable is set, | ||
| // we're building in the Swift.org CI system alongside other projects in the Swift toolchain and | ||
| // we can depend on local versions of our dependencies instead of fetching them remotely. | ||
| if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil { | ||
| // Building standalone, so fetch all dependencies remotely. | ||
| package.dependencies += [ | ||
| .package(url: "https://github.com/swiftlang/swift-cmark.git", branch: "gfm"), | ||
| ] | ||
|
|
||
| // SwiftPM command plugins are only supported by Swift version 5.6 and later. | ||
| #if swift(>=5.6) | ||
| package.dependencies += [ | ||
| .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.1.0"), | ||
| ] | ||
| #endif | ||
| } else { | ||
| // Building in the Swift.org CI system, so rely on local versions of dependencies. | ||
| package.dependencies += [ | ||
| .package(path: "../cmark"), | ||
| ] | ||
| } |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should all platforms have this flag? What does it do for the platforms that didn't need it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is more of a question for @compnerd than me. I think there's a difference between how packages are linked on Windows and elsewhere that requires that we specify
staticlinkage for Windows when building toolchains.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Apologies. I realize now that my question sounded very different from what I meant to ask.
What I meant was: is there any impact on the other platforms of always specifying this but with a
when: .windowscondition compared to only adding it inside a#ifcheck, like it was before?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On non-Windows platforms, it normally wouldn't have any impact. However, if you were to build with
-fvisibility-default=hiddenit would internalise the symbols, preventing them from participating in dynamic linking.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@d-ronnqvist The syntactic difference between
.when(platforms: [.windows])and#if os(Windows)is that the latter restricts the flag to building from a Windows host, but the former restricts the flag to building for a Windows target. Switching it back to the.whenform allows us to cross-compile Swift-Markdown for Windows from other hosts (which is important for toolchain builds) with correct linkage.