Introduce new framework generation process #104
Merged
Conversation
This file contains 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
giginet
changed the title
giginet
commented
Sep 26, 2023
Comment on lines
+163
to
+169
| let notDuplicatedSymlinks = symlinks.filter { path in | ||
| notSymlinks.allSatisfy { FileManager.default.contentsEqual(atPath: path.pathString, andPath: $0.pathString) } | ||
| } | ||
| .map { $0.asURL.resolvingSymlinksInPath() } | ||
| .map(\.absolutePath) | ||
|
|
||
| return Set(notSymlinks + notDuplicatedSymlinks) |
There was a problem hiding this comment.
This is the same logic PIFGenerater used to do this.
giginet
commented
Sep 26, 2023
| @testable import ScipioKit | ||
| import TSCBasic | ||
|
|
||
| final class InfoPlistGeneratorTests: XCTestCase { |
There was a problem hiding this comment.
This is a test case of an existing logic.
freddi-kit
approved these changes
Oct 2, 2023
| import Foundation | ||
| import TSCBasic | ||
|
|
||
| /// A assembler to generate framework bundle |
There was a problem hiding this comment.
Suggested change
| /// A assembler to generate framework bundle |
It is already described in name of struct
There was a problem hiding this comment.
There is an additional doccomment following line. So it's better to remain this line.
|
|
||
| /// FileLists to assemble a framework bundle | ||
| struct FrameworkComponents { | ||
| var name: String |
There was a problem hiding this comment.
Suggested change
| var name: String | |
| var frameworkName: String |
I'm not sure whether the name of "Component" or "Framework"
Sources/ScipioKit/Producer/PIF/FrameworkComponentsCollector.swift
Outdated
Show resolved
Hide resolved
Comment on lines
110
to
124
| private func findInfoPlist(in frameworkBundlePath: AbsolutePath) throws -> AbsolutePath { | ||
| let infoPlistLocationCandidates = [ | ||
| // In a regular framework bundle, Info.plist should be on its root | ||
| frameworkBundlePath.appending(component: "Info.plist"), | ||
| // In a versioned framework bundle (for macOS), Info.plist should be in Resources | ||
| frameworkBundlePath.appending(components: "Resources", "Info.plist"), | ||
| ] | ||
| guard let infoPlistPath = infoPlistLocationCandidates.first(where: fileSystem.exists(_:)) else { | ||
| throw Error.infoPlistNotFound(frameworkBundlePath: frameworkBundlePath) | ||
| } | ||
| return infoPlistPath | ||
| } | ||
|
|
||
| /// Collects *.swiftmodules* in a generated framework bundle | ||
| private func collectSwiftModules(of targetName: String, in frameworkPath: AbsolutePath) throws -> AbsolutePath? { |
There was a problem hiding this comment.
What is difference of collect and find?
There was a problem hiding this comment.
No, I'll unify them to collect.
Co-authored-by: freddi(Yuki Aki) <[email protected]>
Run for 15.0 Revert "Run for 15.0" This reverts commit 200f4b4. Do not remove Package.resolved Specify DEPLOYMENT_TARGET
In this commit, I bumped up the macOS support version to macOS 12.0 or above. Because current HEAD of swift-driver only supports that.
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.
This PR changes framework generation process.
Before
Scipio tries to consist of frameworks with PIF. Modify PIF to generate framework by injecting header and linker build phases.
But it breaks some packages. It's better to keep PIF as modified as possible.
After
Just build framework components with xcbuild. After that, assemble framework bundles manually.
FrameworkComponentsCollectorcollects framework components from the generated framework.FrameworkBundleAssemblertry to relocate them into framework bundle format (Assembled Framework)XCBuildClienttries to generate XCFramework from the assembled frameworks