Skip to content

Commit 274d336

Browse files
committed
Use static lib for powersync.
1 parent 0f0bddf commit 274d336

File tree

3 files changed

+5
-36
lines changed

3 files changed

+5
-36
lines changed

.gitmodules

-3
This file was deleted.

sqlite3/assets/wasm/CMakeLists.txt

+5-32
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,10 @@ FetchContent_Declare(
1717

1818
FetchContent_MakeAvailable(sqlite3)
1919

20-
file(DOWNLOAD https://raw.githubusercontent.com/sqlite/sqlite/master/src/test_vfstrace.c "${CMAKE_BINARY_DIR}/vfstrace.c")
21-
22-
get_filename_component(RS_LIB_DIR "${CMAKE_BINARY_DIR}/../../powersync-sqlite-core/" ABSOLUTE)
23-
set(RS_LIB "powersync")
24-
set(RS_WASM_TGT "wasm32-wasi")
25-
set(RS_WASM_TGT_DIR "${RS_LIB_DIR}/target/${RS_WASM_TGT}")
20+
set(POWERSYNC_A "${CMAKE_BINARY_DIR}/libpowersync-wasm.a")
2621

27-
set(RS_RELEASE_OUT "${RS_WASM_TGT_DIR}/wasm/")
28-
set(RS_RELEASE_OUT_DEPS "${RS_WASM_TGT_DIR}/wasm/deps")
29-
set(RS_RELEASE_EXTENSION_OUT "${RS_RELEASE_OUT}/powersync-extension.o")
22+
file(DOWNLOAD https://raw.githubusercontent.com/sqlite/sqlite/master/src/test_vfstrace.c "${CMAKE_BINARY_DIR}/vfstrace.c")
23+
file(DOWNLOAD https://github.com/powersync-ja/powersync-sqlite-core/releases/download/v0.3.0/libpowersync-wasm.a "${POWERSYNC_A}")
3024

3125
# Generate symbols we need to export from the sqlite3.wasm build
3226
add_custom_command(
@@ -47,7 +41,6 @@ macro(base_sqlite3_target name debug)
4741
${CMAKE_CURRENT_SOURCE_DIR}/os_web.c
4842
${CMAKE_CURRENT_SOURCE_DIR}/helpers.c
4943
${sqlite3_SOURCE_DIR}/sqlite3.c
50-
${RS_RELEASE_EXTENSION_OUT}
5144
)
5245
set(flags -Wall -Wextra -Wno-unused-parameter -Wno-unused-function)
5346

@@ -71,6 +64,7 @@ macro(base_sqlite3_target name debug)
7164
-Wl,--import-memory
7265
--sysroot ${wasi_sysroot}
7366
${sources}
67+
${POWERSYNC_A}
7468
@${CMAKE_CURRENT_BINARY_DIR}/required_symbols.txt
7569
DEPENDS ${sources} required_symbols
7670
VERBATIM
@@ -97,31 +91,10 @@ macro(base_sqlite3_target name debug)
9791
add_custom_target(${name} DEPENDS ${output})
9892
endmacro()
9993

100-
# Script to use llc to get object code from bytecode
101-
set(objectcode_script "${CMAKE_CURRENT_BINARY_DIR}/loop_objectcode_script.sh")
102-
file(WRITE ${objectcode_script}
103-
"cd ${RS_RELEASE_OUT_DEPS}\n"
104-
"for filename in *.bc; do llc -march=wasm32 -filetype=obj $filename -o $filename.o; done\n"
105-
"wasm-ld -relocatable *.o -o ../powersync-extension.o"
106-
)
107-
108-
add_custom_target(
109-
powersync_core_bytecode
110-
COMMAND ${CMAKE_COMMAND} -E env
111-
"RUSTFLAGS=--emit=llvm-bc -C linker=true"
112-
cargo build -p powersync_loadable --profile wasm --no-default-features --features \"powersync_core/static powersync_core/omit_load_extension sqlite_nostd/static sqlite_nostd/omit_load_extension\" -Z build-std=panic_abort,core,alloc --target ${RS_WASM_TGT}
113-
WORKING_DIRECTORY ${RS_LIB_DIR}
114-
# Converts bytecode to wasm object files
115-
COMMAND sh ${objectcode_script}
116-
)
117-
11894
base_sqlite3_target(sqlite3_debug true)
11995
base_sqlite3_target(sqlite3_opt false)
12096

121-
add_dependencies(sqlite3_opt powersync_core_bytecode)
122-
add_dependencies(sqlite3_debug powersync_core_bytecode)
123-
12497
add_custom_target(output)
12598
add_custom_command(TARGET output COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/sqlite3_opt.wasm ${PROJECT_SOURCE_DIR}/../../example/web/sqlite3.wasm)
12699
add_custom_command(TARGET output COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/sqlite3_debug.init.wasm ${PROJECT_SOURCE_DIR}/../../example/web/sqlite3.debug.wasm)
127-
add_dependencies(output sqlite3_debug sqlite3_opt powersync_core_bytecode)
100+
add_dependencies(output sqlite3_debug sqlite3_opt)

sqlite3/powersync-sqlite-core

-1
This file was deleted.

0 commit comments

Comments
 (0)