Skip to content

fix: build for examples with MacOS shells #546

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

Open
StuartHarris wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: build for examples with MacOS shells #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions examples/counter-http/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion examples/counter-http/apple/Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,26 @@ typegen:
--language swift \
--output-dir generated

# builds the shared library as a Swift package using BoltFFI
# builds the shared library as a Swift package using BoltFFI, then fixes the
# macOS XCFramework slice from a shallow (iOS-style) bundle to the versioned
# bundle structure that macOS requires. boltffi currently generates shallow
# bundles for all platforms (see https://github.com/boltffi/boltffi/issues/560).
[working-directory('../shared')]
package: install-targets
@echo '{{ style("command") }}package:{{ NORMAL }}'
rm -rf ../apple/generated/Shared
boltffi pack apple
FW="../apple/generated/Shared/Shared.xcframework/macos-arm64_x86_64/SharedFFI.framework" ; \
mkdir -p "$FW/Versions/A/Resources" ; \
mv "$FW/SharedFFI" "$FW/Versions/A/SharedFFI" ; \
mv "$FW/Headers" "$FW/Versions/A/Headers" ; \
mv "$FW/Modules" "$FW/Versions/A/Modules" ; \
mv "$FW/Info.plist" "$FW/Versions/A/Resources/Info.plist" ; \
ln -sf A "$FW/Versions/Current" ; \
ln -sf Versions/Current/SharedFFI "$FW/SharedFFI" ; \
ln -sf Versions/Current/Headers "$FW/Headers" ; \
ln -sf Versions/Current/Modules "$FW/Modules" ; \
ln -sf Versions/Current/Resources "$FW/Resources"

# rebuilds the Xcode project from project.yml
generate-project:
Expand Down
4 changes: 2 additions & 2 deletions examples/counter-middleware/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion examples/counter-middleware/apple/Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,26 @@ typegen:
--language swift \
--output-dir generated

# builds the shared library as a Swift package using BoltFFI
# builds the shared library as a Swift package using BoltFFI, then fixes the
# macOS XCFramework slice from a shallow (iOS-style) bundle to the versioned
# bundle structure that macOS requires. boltffi currently generates shallow
# bundles for all platforms (see https://github.com/boltffi/boltffi/issues/560).
[working-directory('../shared')]
package: install-targets
@echo '{{ style("command") }}package:{{ NORMAL }}'
rm -rf ../apple/generated/Shared
boltffi pack apple
FW="../apple/generated/Shared/Shared.xcframework/macos-arm64_x86_64/SharedFFI.framework" ; \
mkdir -p "$FW/Versions/A/Resources" ; \
mv "$FW/SharedFFI" "$FW/Versions/A/SharedFFI" ; \
mv "$FW/Headers" "$FW/Versions/A/Headers" ; \
mv "$FW/Modules" "$FW/Versions/A/Modules" ; \
mv "$FW/Info.plist" "$FW/Versions/A/Resources/Info.plist" ; \
ln -sf A "$FW/Versions/Current" ; \
ln -sf Versions/Current/SharedFFI "$FW/SharedFFI" ; \
ln -sf Versions/Current/Headers "$FW/Headers" ; \
ln -sf Versions/Current/Modules "$FW/Modules" ; \
ln -sf Versions/Current/Resources "$FW/Resources"

# rebuilds the Xcode project from project.yml
generate-project:
Expand Down
4 changes: 2 additions & 2 deletions examples/counter-routing/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion examples/counter-routing/apple/Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,26 @@ typegen:
--language swift \
--output-dir generated

# builds the shared library as a Swift package using BoltFFI
# builds the shared library as a Swift package using BoltFFI, then fixes the
# macOS XCFramework slice from a shallow (iOS-style) bundle to the versioned
# bundle structure that macOS requires. boltffi currently generates shallow
# bundles for all platforms (see https://github.com/boltffi/boltffi/issues/560).
[working-directory('../shared')]
package: install-targets
@echo '{{ style("command") }}package:{{ NORMAL }}'
rm -rf ../apple/generated/Shared
boltffi pack apple
FW="../apple/generated/Shared/Shared.xcframework/macos-arm64_x86_64/SharedFFI.framework" ; \
mkdir -p "$FW/Versions/A/Resources" ; \
mv "$FW/SharedFFI" "$FW/Versions/A/SharedFFI" ; \
mv "$FW/Headers" "$FW/Versions/A/Headers" ; \
mv "$FW/Modules" "$FW/Versions/A/Modules" ; \
mv "$FW/Info.plist" "$FW/Versions/A/Resources/Info.plist" ; \
ln -sf A "$FW/Versions/Current" ; \
ln -sf Versions/Current/SharedFFI "$FW/SharedFFI" ; \
ln -sf Versions/Current/Headers "$FW/Headers" ; \
ln -sf Versions/Current/Modules "$FW/Modules" ; \
ln -sf Versions/Current/Resources "$FW/Resources"

# rebuilds the Xcode project from project.yml
generate-project:
Expand Down
4 changes: 2 additions & 2 deletions examples/counter/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion examples/counter/apple/Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,26 @@ typegen:
--language swift \
--output-dir generated

# builds the shared library as a Swift package using BoltFFI
# builds the shared library as a Swift package using BoltFFI, then fixes the
# macOS XCFramework slice from a shallow (iOS-style) bundle to the versioned
# bundle structure that macOS requires. boltffi currently generates shallow
# bundles for all platforms (see https://github.com/boltffi/boltffi/issues/560).
[working-directory('../shared')]
package: install-targets
@echo '{{ style("command") }}package:{{ NORMAL }}'
rm -rf ../apple/generated/Shared
boltffi pack apple
FW="../apple/generated/Shared/Shared.xcframework/macos-arm64_x86_64/SharedFFI.framework" ; \
mkdir -p "$FW/Versions/A/Resources" ; \
mv "$FW/SharedFFI" "$FW/Versions/A/SharedFFI" ; \
mv "$FW/Headers" "$FW/Versions/A/Headers" ; \
mv "$FW/Modules" "$FW/Versions/A/Modules" ; \
mv "$FW/Info.plist" "$FW/Versions/A/Resources/Info.plist" ; \
ln -sf A "$FW/Versions/Current" ; \
ln -sf Versions/Current/SharedFFI "$FW/SharedFFI" ; \
ln -sf Versions/Current/Headers "$FW/Headers" ; \
ln -sf Versions/Current/Modules "$FW/Modules" ; \
ln -sf Versions/Current/Resources "$FW/Resources"

# rebuilds the Xcode project from project.yml
generate-project:
Expand Down
4 changes: 2 additions & 2 deletions examples/notes/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions examples/weather/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion examples/weather/apple/Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,26 @@ typegen:
--language swift \
--output-dir generated

# builds the shared library as a Swift package using BoltFFI
# builds the shared library as a Swift package using BoltFFI, then fixes the
# macOS XCFramework slice from a shallow (iOS-style) bundle to the versioned
# bundle structure that macOS requires. boltffi currently generates shallow
# bundles for all platforms (see https://github.com/boltffi/boltffi/issues/560).
[working-directory('../shared')]
package: install-targets
@echo '{{ style("command") }}package:{{ NORMAL }}'
rm -rf ../apple/generated/Shared
boltffi pack apple
FW="../apple/generated/Shared/Shared.xcframework/macos-arm64_x86_64/SharedFFI.framework" ; \
mkdir -p "$FW/Versions/A/Resources" ; \
mv "$FW/SharedFFI" "$FW/Versions/A/SharedFFI" ; \
mv "$FW/Headers" "$FW/Versions/A/Headers" ; \
mv "$FW/Modules" "$FW/Versions/A/Modules" ; \
mv "$FW/Info.plist" "$FW/Versions/A/Resources/Info.plist" ; \
ln -sf A "$FW/Versions/Current" ; \
ln -sf Versions/Current/SharedFFI "$FW/SharedFFI" ; \
ln -sf Versions/Current/Headers "$FW/Headers" ; \
ln -sf Versions/Current/Modules "$FW/Modules" ; \
ln -sf Versions/Current/Resources "$FW/Resources"

# rebuilds the Xcode project from project.yml
generate-project:
Expand Down
Loading