Skip to content
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

Support Artifact Bundle #1388

Merged
merged 11 commits into from
Feb 13, 2024
Merged

Support Artifact Bundle #1388

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d55fcb6
support artifact bundle
freddi-kit Aug 16, 2023
e3ac5e0
update CHANGELOG to exact PR
freddi-kit Aug 16, 2023
b0b6a93
build ArtifactBundle only on macOS
freddi-kit Aug 16, 2023
4a02f37
update to copy SettingPresets into bundle
freddi-kit Aug 17, 2023
019ccc0
Merge branch 'master' into aritfact-bundle
freddi-kit Aug 17, 2023
2ed1bee
fix CHANGELOG.md
freddi-kit Aug 17, 2023
512ec95
load Bundle.module
freddi-kit Sep 6, 2023
5fa61af
update ArtifactBundleGen
freddi-kit Sep 10, 2023
1a42ba2
update ArtifactBundleGen to linux issue
freddi-kit Sep 10, 2023
deef7e7
fix unnecessary code
freddi-kit Sep 10, 2023
b98231e
add lisence to bundle
freddi-kit Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ xcuserdata
*.xcuserstate
XcodeGen.xcodeproj
xcodegen.zip
xcodegen.artifactbundle.zip
.vscode/launch.json
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Change Log

## Next Version
### Added

- Support Artifact Bundle #1388 @freddi-kit

### Fixed

Expand Down
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,7 @@ brew:

archive: build
./scripts/archive.sh "$(EXECUTABLE_PATH)"
swift package plugin --allow-writing-to-package-directory generate-artifact-bundle \
--package-version $(VERSION) \
--executable-name $(EXECUTABLE_NAME) \
--build-config release \
freddi-kit marked this conversation as resolved.
Show resolved Hide resolved
9 changes: 9 additions & 0 deletions Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@
"version" : "4.6.1"
}
},
{
"identity" : "artifactbundlegen",
"kind" : "remoteSourceControl",
"location" : "https://github.com/freddi-kit/ArtifactBundleGen",
"state" : {
"revision" : "0c5cdf2d8e522aaf32d2f441efd002b757c5a4d2",
"version" : "0.0.4"
}
},
{
"identity" : "graphviz",
"kind" : "remoteSourceControl",
Expand Down
12 changes: 10 additions & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

import PackageDescription

let macOSOnlyDependency: [Package.Dependency]
#if !os(Linux)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason not to do a mac check here instead to be more explicit?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In CI machine, we cannot build my tools, I'm checking the reason

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

macOSOnlyDependency = [Package.Dependency.package(url: "https://github.com/freddi-kit/ArtifactBundleGen", exact: "0.0.4")]
#else
macOSOnlyDependency = []
#endif

let package = Package(
name: "XcodeGen",
platforms: [.macOS(.v10_13)],
Expand All @@ -20,8 +27,7 @@ let package = Package(
.package(url: "https://github.com/jakeheis/SwiftCLI.git", from: "6.0.3"),
.package(url: "https://github.com/mxcl/Version", from: "2.0.0"),
.package(url: "https://github.com/SwiftDocOrg/GraphViz.git", exact: "0.2.0"),
],

] + macOSOnlyDependency,
targets: [
.executableTarget(name: "XcodeGen", dependencies: [
"XcodeGenCLI",
Expand All @@ -42,6 +48,8 @@ let package = Package(
"PathKit",
"XcodeGenCore",
"GraphViz",
], resources: [
.copy("SettingPresets")
]),
.target(name: "ProjectSpec", dependencies: [
"JSONUtilities",
Expand Down
4 changes: 2 additions & 2 deletions RELEASE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
1. Run `make release`
1. Push commit and tag to github
1. Create release from tag on GitHub using the version number and relevant changelog contents
1. Run `make archive` and upload `xcodegen.zip` to the github release
1. Run `make brew` which will open a PR on homebrew core
1. Run `make archive` and upload `xcodegen.zip` and `xcodegen.artifactbundle.zip` to the github release
1. Run `make brew` which will open a PR on homebrew core
1 change: 1 addition & 0 deletions Sources/XcodeGenKit/SettingPresets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../SettingPresets/
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this file do?

Copy link
Collaborator Author

@freddi-kit freddi-kit Sep 10, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is symbolic link for SeetingPresets in root to detect it as bundle file for XcodeGenKit. Package.swift cannot find it if we don't have it in root of target source file here https://github.com/yonaskolb/XcodeGen/pull/1388/files#diff-f913940c58e8744a2af1c68b909bb6383e49007e6c5a12fb03104a9006ae677eR46

We also cannot set it as .copy("../../SettingPresets")

3 changes: 3 additions & 0 deletions Sources/XcodeGenKit/SettingsBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,9 @@ extension SettingsPresetFile {
symlink.parent() + relativePath,
] + possibleSettingsPaths
}
if let moduleResourcePath = Bundle.module.path(forResource: "SettingPresets", ofType: nil) {
possibleSettingsPaths.append(Path(moduleResourcePath) + "\(path).yml")
}
Comment on lines +205 to +207
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@roman-aliyev If @yonaskolb agree with your way, please open PR and do not forget to add this code and copy script SettingPresets to bundle.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, please add https://github.com/yonaskolb/XcodeGen/pull/1388/files#diff-f913940c58e8744a2af1c68b909bb6383e49007e6c5a12fb03104a9006ae677eR45-R46 and make symbolic link as https://github.com/yonaskolb/XcodeGen/pull/1388/files#diff-9f320f241fc06216ac0b9fed9a549298a11c8f203c299350159cab6946344b14


guard let settingsPath = possibleSettingsPaths.first(where: { $0.exists }) else {
switch self {
Expand Down