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

Jump to bottom

Universal builds #880

Merged
merged 2 commits into from Oct 3, 2021
Merged

Universal builds #880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f51bcd1
Ensure we build universal binaries during archive
djbe Oct 3, 2021
19b69d0
build path changed for some reason
djbe Oct 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -25,6 +25,10 @@ _None_
[David Jennes](https://github.com/djbe)
[#562](https://github.com/SwiftGen/SwiftGen/issues/562)
[#797](https://github.com/SwiftGen/SwiftGen/pull/797)
* Support M1 and Intel devices (universal binary).
[David Jennes](https://github.com/djbe)
[#805](https://github.com/SwiftGen/SwiftGen/issues/805)
[#880](https://github.com/SwiftGen/SwiftGen/pull/880)

### Bug Fixes

Expand Down
6 changes: 3 additions & 3 deletions Rakefile
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@ namespace :cli do
task :build do |task, args|
Utils.print_header 'Building Binary'
Utils.run(
%(swift build --disable-sandbox -c release),
%(swift build --disable-sandbox -c release --arch arm64 --arch x86_64),
task, xcrun: true, formatter: :raw
)
end
Expand All @@ -46,8 +46,8 @@ namespace :cli do
"(defaults $bindir=#{BUILD_DIR}/swiftgen/bin/)"
task :install, %i[bindir] => :build do |task, args|
bindir = defaults(args)
generated_binary_path = "#{BUILD_DIR}/release/swiftgen"
generated_bundle_path = "#{BUILD_DIR}/release/SwiftGen_SwiftGenCLI.bundle"
generated_binary_path = "#{BUILD_DIR}/apple/Products/Release/swiftgen"
generated_bundle_path = "#{BUILD_DIR}/apple/Products/Release/SwiftGen_SwiftGenCLI.bundle"

Utils.print_header "Installing binary in #{bindir}"
Utils.run([
Expand Down