Skip to content

Commit 2cbd670

Browse files
Rpath change in actions WIP 1/2 (#348)
Co-authored-by: Dragos Daian <[email protected]>
1 parent fbbb65a commit 2cbd670

File tree

6 files changed

+14
-12
lines changed

6 files changed

+14
-12
lines changed

.github/workflows/ios_builds.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,17 @@ jobs:
3636
shell: sh
3737
run: |
3838
ls target/release
39-
mv target/release/libgodot_rapier.dylib bin${{ matrix.dimensions.short }}/addons/godot-rapier${{ matrix.dimensions.short }}/bin/libgodot_rapier.ios.${{ matrix.arch.name }}.framework/libgodot_rapier
39+
# Change rpath for testing
40+
install_name_tool -id @rpath/libgodot_rapier.ios.${{ matrix.arch.name }}.framework/libgodot_rapier.ios.${{ matrix.arch.name }} target/release/libgodot_rapier.dylib
41+
mv target/release/libgodot_rapier.dylib bin${{ matrix.dimensions.short }}/addons/godot-rapier${{ matrix.dimensions.short }}/bin/libgodot_rapier.ios.${{ matrix.arch.name }}.framework/libgodot_rapier.ios.${{ matrix.arch.name }}
4042
mv target/release/libgodot_rapier.a bin${{ matrix.dimensions.short }}/addons/godot-rapier${{ matrix.dimensions.short }}/bin/libgodot_rapier.ios.${{ matrix.arch.name }}.framework/libgodot_rapier.a
4143
4244
- name: Upload
4345
uses: actions/upload-artifact@v4
4446
with:
4547
name: godot-rapier-${{ matrix.dimensions.short }}-${{ matrix.precision }}-${{ matrix.features.name }}-${{ matrix.arch.rust}}
4648
path: |
47-
bin${{ matrix.dimensions.short }}/**/libgodot_rapier
49+
bin${{ matrix.dimensions.short }}/**/*.${{ matrix.arch.name }}
4850
if-no-files-found: error
4951

5052
- name: Upload Static

bin2d/addons/godot-rapier2d/bin/libgodot_rapier.ios.arm64.framework/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleDevelopmentRegion</key>
88
<string>en</string>
99
<key>CFBundleExecutable</key>
10-
<string>libgodot_rapier</string>
10+
<string>libgodot_rapier.ios.arm64</string>
1111
<key>CFBundleName</key>
1212
<string>Godot Rapier2D</string>
1313
<key>CFBundleDisplayName</key>
@@ -35,7 +35,7 @@
3535
<array>
3636
<dict>
3737
<key>BinaryPath</key>
38-
<string>libgodot_rapier.dylib</string>
38+
<string>libgodot_rapier.ios.arm64.dylib</string>
3939
</dict>
4040
</array>
4141
</dict>

bin2d/addons/godot-rapier2d/bin/libgodot_rapier.ios.x86_64.framework/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleDevelopmentRegion</key>
88
<string>en</string>
99
<key>CFBundleExecutable</key>
10-
<string>libgodot_rapier</string>
10+
<string>libgodot_rapier.ios.x86_64</string>
1111
<key>CFBundleName</key>
1212
<string>Godot Rapier2D</string>
1313
<key>CFBundleDisplayName</key>
@@ -35,7 +35,7 @@
3535
<array>
3636
<dict>
3737
<key>BinaryPath</key>
38-
<string>libgodot_rapier.dylib</string>
38+
<string>libgodot_rapier.ios.x86_64.dylib</string>
3939
</dict>
4040
</array>
4141
</dict>

bin2d/addons/godot-rapier2d/godot-rapier2d.gdextension

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ android.debug.arm64 = "bin/libgodot_rapier.android.aarch64-linux-android.so"
2424
android.release.arm64 = "bin/libgodot_rapier.android.aarch64-linux-android.so"
2525
ios.debug.arm64 = "bin/libgodot_rapier.ios.arm64.framework"
2626
ios.release.arm64 = "bin/libgodot_rapier.ios.arm64.framework"
27-
ios.debug.x86_64 = "bin/libgodot_rapier.ios.framework"
28-
ios.release.x86_64 = "bin/libgodot_rapier.ios.framework"
27+
ios.debug.x86_64 = "bin/libgodot_rapier.ios.x86_64.framework"
28+
ios.release.x86_64 = "bin/libgodot_rapier.ios.x86_64.framework"
2929
web.debug.threads.wasm32 = "bin/godot_rapier.wasm"
3030
web.release.threads.wasm32 = "bin/godot_rapier.wasm"
3131
web.debug.wasm32 = "bin/wasm-nothreads/godot_rapier.wasm"

bin3d/addons/godot-rapier3d/bin/libgodot_rapier.ios.arm64.framework/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleDevelopmentRegion</key>
88
<string>en</string>
99
<key>CFBundleExecutable</key>
10-
<string>libgodot_rapier</string>
10+
<string>libgodot_rapier.ios.arm64.dylib</string>
1111
<key>CFBundleName</key>
1212
<string>Godot Rapier3D</string>
1313
<key>CFBundleDisplayName</key>
@@ -35,7 +35,7 @@
3535
<array>
3636
<dict>
3737
<key>BinaryPath</key>
38-
<string>libgodot_rapier.dylib</string>
38+
<string>libgodot_rapier.ios.arm64.dylib</string>
3939
</dict>
4040
</array>
4141
</dict>

bin3d/addons/godot-rapier3d/bin/libgodot_rapier.ios.x86_64.framework/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleDevelopmentRegion</key>
88
<string>en</string>
99
<key>CFBundleExecutable</key>
10-
<string>libgodot_rapier</string>
10+
<string>libgodot_rapier.ios.x86_64.dylib</string>
1111
<key>CFBundleName</key>
1212
<string>Godot Rapier3D</string>
1313
<key>CFBundleDisplayName</key>
@@ -35,7 +35,7 @@
3535
<array>
3636
<dict>
3737
<key>BinaryPath</key>
38-
<string>libgodot_rapier.dylib</string>
38+
<string>libgodot_rapier.ios.x86_64.dylib</string>
3939
</dict>
4040
</array>
4141
</dict>

0 commit comments

Comments
 (0)