Skip to content

Commit

Permalink
Support Artifact Bundle (#1388)
Browse files Browse the repository at this point in the history
* support artifact bundle

* update CHANGELOG to exact PR

* build ArtifactBundle only on macOS

* update to copy SettingPresets into bundle

* fix CHANGELOG.md

* load Bundle.module

* update ArtifactBundleGen

* update ArtifactBundleGen to linux issue

* fix unnecessary code

* add lisence to bundle
  • Loading branch information
freddi-kit committed Feb 13, 2024
1 parent 6bbf2c6 commit 2c15007
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
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
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

## 2.38.0

Expand Down
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,8 @@ 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 \
--include-resource-path LICENSE
9 changes: 9 additions & 0 deletions Package.resolved
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" : "707e4ccc4b1c7e48e881cd5ea91e493a95df24bf",
"version" : "0.0.6"
}
},
{
"identity" : "graphviz",
"kind" : "remoteSourceControl",
Expand Down
4 changes: 3 additions & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ 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"),
.package(url: "https://github.com/freddi-kit/ArtifactBundleGen", exact: "0.0.6")
],

targets: [
.executableTarget(name: "XcodeGen", dependencies: [
"XcodeGenCLI",
Expand All @@ -42,6 +42,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
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
3 changes: 3 additions & 0 deletions Sources/XcodeGenKit/SettingsBuilder.swift
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,9 @@ extension SettingsPresetFile {
symlink.parent() + relativePath,
] + possibleSettingsPaths
}
if let moduleResourcePath = Bundle.module.path(forResource: "SettingPresets", ofType: nil) {
possibleSettingsPaths.append(Path(moduleResourcePath) + "\(path).yml")
}

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

0 comments on commit 2c15007

Please sign in to comment.