Skip to content

Commit 93dab7b

Browse files
committed
Fix Sconstruct, Attempt Fix Github Actions
1 parent 5588007 commit 93dab7b

File tree

4 files changed

+16
-33
lines changed

4 files changed

+16
-33
lines changed

.github/workflows/builds.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ jobs:
8888
run: |
8989
tar -xvzf kuzu_binary.tar.gz -C ${{ github.workspace }}/bin/${{ matrix.target.platform }}/kuzu/
9090
# Rename only for Linux platforms
91-
mv ${{ github.workspace }}/bin/${{ matrix.target.platform }}-${{ matrix.target.arch }}-${{ matrix.float-precision }}-${{ matrix.target-type }}/kuzu/libkuzu.so \
92-
${{ github.workspace }}/bin/${{ matrix.target.platform }}-${{ matrix.target.arch }}-${{ matrix.float-precision }}-${{ matrix.target-type }}/kuzu/libkuzu_${{ matrix.target.arch }}.so
91+
mv ${{ github.workspace }}/bin/${{ matrix.target.platform }}/kuzu/libkuzu.so \
92+
${{ github.workspace }}/bin/${{ matrix.target.platform }}/kuzu/libkuzu_${{ matrix.target.arch }}.so
9393
9494
- name: Extract Kuzu Binaries (macOS)
9595
if: ${{ matrix.target.platform == 'macos' }}
@@ -132,8 +132,7 @@ jobs:
132132
debug_symbols=${{ matrix.target-type == 'template_debug' && 'yes' || 'no' }} \
133133
platform=${{ matrix.target.platform }} \
134134
arch=${{ matrix.target.arch }} \
135-
precision=${{ matrix.float-precision }} \
136-
build_dir=${{ github.workspace }}/bin/${{ matrix.target.platform }}-${{ matrix.target.arch }}-${{ matrix.float-precision }}-${{ matrix.target-type }}/
135+
precision=${{ matrix.float-precision }}
137136
138137
- name: Save .scons_cache
139138
uses: ./godot-cpp/.github/actions/godot-cache-save

SConstruct

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ elif (env["platform"] == 'linux'):
8989
env.Append(LIBPATH=["bin/linux/kuzu"])
9090
arch = platform.machine()
9191

92-
kuzu_generic_name = 'libkuzu.so'
92+
kuzu_generic_name = f'libkuzu_{arch}.so'
9393

9494
if arch == "x86_64":
9595
env.Append(LIBS=["libkuzu_x86_64"])
@@ -101,14 +101,14 @@ elif (env["platform"] == 'linux'):
101101
elif (env["platform"] == 'macos'):
102102
env.Append(LIBPATH=["bin/macos/kuzu"])
103103
env.Append(LIBS=["libkuzu"])
104-
kuzu_lib_name = "libkuzu"
104+
kuzu_lib_name = "libkuzu.dylib"
105105

106106
kuzu_generic_name = 'libkuzu.dylib'
107107

108108
elif (env["platform"] == 'android'):
109109
env.Append(LIBPATH=["bin/android/kuzu"])
110110
env.Append(LIBS=["libkuzu"])
111-
kuzu_lib_name = "libkuzu"
111+
kuzu_lib_name = "libkuzu.so"
112112

113113
kuzu_generic_name = 'libkuzu.so'
114114

@@ -128,7 +128,6 @@ library = env.SharedLibrary(
128128
copy = env.Install("{}/bin/{}/".format(projectdir, env["platform"]), library)
129129

130130
kuzu_library_path = "bin/{}/kuzu/{}/".format(env['platform'], kuzu_lib_name)
131-
#kuzu_copy = env.Install("{}/bin/{}/kuzu/".format(projectdir, env["platform"]), kuzu_library_path)
132131

133132
kuzu_copy = env.InstallAs("{}/bin/{}/{}".format(projectdir, env["platform"], kuzu_generic_name), kuzu_library_path)
134133

addons/KuzuGD/kuzugd.gdextension

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ windows.x86_64.double.debug = "res://addons/KuzuGD/windows/kuzu_shared.dll"
6767
windows.x86_64.single.release = "res://addons/KuzuGD/windows/kuzu_shared.dll"
6868
windows.x86_64.double.release = "res://addons/KuzuGD/windows/kuzu_shared.dll"
6969

70-
linux.x86_64.single.debug = "res://addons/KuzuGD/linux/libkuzu.so"
71-
linux.x86_64.double.debug = "res://addons/KuzuGD/linux/libkuzu.so"
72-
linux.x86_64.single.release = "res://addons/KuzuGD/linux/libkuzu.so"
73-
linux.x86_64.double.release = "res://addons/KuzuGD/linux/libkuzu.so"
74-
75-
linux.arm64.single.debug = "res://addons/KuzuGD/linux/libkuzu.so"
76-
linux.arm64.double.debug = "res://addons/KuzuGD/linux/libkuzu.so"
77-
linux.arm64.single.release = "res://addons/KuzuGD/linux/libkuzu.so"
78-
linux.arm64.double.release = "res://addons/KuzuGD/linux/libkuzu.so"
70+
linux.x86_64.single.debug = "res://addons/KuzuGD/linux/libkuzu_x86_64.so"
71+
linux.x86_64.double.debug = "res://addons/KuzuGD/linux/libkuzu_x86_64.so"
72+
linux.x86_64.single.release = "res://addons/KuzuGD/linux/libkuzu_x86_64.so"
73+
linux.x86_64.double.release = "res://addons/KuzuGD/linux/libkuzu_x86_64.so"
74+
75+
linux.arm64.single.debug = "res://addons/KuzuGD/linux/libkuzu_aarch64.so"
76+
linux.arm64.double.debug = "res://addons/KuzuGD/linux/libkuzu_aarch64.so"
77+
linux.arm64.single.release = "res://addons/KuzuGD/linux/libkuzu_aarch64.so"
78+
linux.arm64.double.release = "res://addons/KuzuGD/linux/libkuzu_aarch64.so"
7979

8080
android.x86_64.single.debug = "res://addons/KuzuGD/android/libkuzu.so"
8181
android.x86_64.double.debug = "res://addons/KuzuGD/android/libkuzu.so"

demo/bin/kuzugd.gdextension

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ ios.arm64.double.debug = "./ios/KuzuGD.ios.template_debug.arm64.double.dylib"
1515
ios.arm64.single.release = "./ios/KuzuGD.ios.template_release.arm64.dylib"
1616
ios.arm64.double.release = "./ios/KuzuGD.ios.template_release.arm64.double.dylib"
1717

18-
windows.x86_32.single.debug = "./windows/KuzuGD.windows.template_debug.x86_32.dll"
19-
windows.x86_32.double.debug = "./windows/KuzuGD.windows.template_debug.x86_32.double.dll"
20-
windows.x86_32.single.release = "./windows/KuzuGD.windows.template_release.x86_32.dll"
21-
windows.x86_32.double.release = "./windows/KuzuGD.windows.template_release.x86_32.double.dll"
22-
2318
windows.x86_64.single.debug = "./windows/KuzuGD.windows.template_debug.x86_64.dll"
2419
windows.x86_64.double.debug = "./windows/KuzuGD.windows.template_debug.x86_64.double.dll"
2520
windows.x86_64.single.release = "./windows/KuzuGD.windows.template_release.x86_64.dll"
@@ -35,11 +30,6 @@ linux.arm64.double.debug = "./linux/libKuzuGD.linux.template_debug.arm64.double.
3530
linux.arm64.single.release = "./linux/libKuzuGD.linux.template_release.arm64.so"
3631
linux.arm64.double.release = "./linux/libKuzuGD.linux.template_release.arm64.double.so"
3732

38-
linux.rv64.single.debug = "./linux/libKuzuGD.linux.template_debug.rv64.so"
39-
linux.rv64.double.debug = "./linux/libKuzuGD.linux.template_debug.rv64.double.so"
40-
linux.rv64.single.release = "./linux/libKuzuGD.linux.template_release.rv64.so"
41-
linux.rv64.double.release = "./linux/libKuzuGD.linux.template_release.rv64.double.so"
42-
4333
android.x86_64.single.debug = "./android/KuzuGD.android.template_debug.x86_64.so"
4434
android.x86_64.double.debug = "./android/KuzuGD.android.template_debug.x86_64.double.so"
4535
android.x86_64.single.release = "./android/KuzuGD.android.template_release.x86_64.so"
@@ -48,9 +38,4 @@ android.x86_64.double.release = "./android/KuzuGD.android.template_release.x86_6
4838
android.arm64.single.debug = "./android/KuzuGD.android.template_debug.arm64.so"
4939
android.arm64.double.debug = "./android/KuzuGD.android.template_debug.arm64.double.so"
5040
android.arm64.single.release = "./android/KuzuGD.android.template_release.arm64.so"
51-
android.arm64.double.release = "./android/KuzuGD.android.template_release.arm64.double.so"
52-
53-
web.wasm32.single.debug = "./web/KuzuGD.web.template_debug.wasm32.nothreads.wasm"
54-
web.wasm32.double.debug = "./web/KuzuGD.web.template_release.wasm32.double.nothreads.wasm"
55-
web.wasm32.single.release = "./web/KuzuGD.web.template_release.wasm32.nothreads.wasm"
56-
web.wasm32.double.release = "./web/KuzuGD.web.template_release.wasm32.double.nothreads.wasm"
41+
android.arm64.double.release = "./android/KuzuGD.android.template_release.arm64.double.so"

0 commit comments

Comments
 (0)