Merge pull request #3 from vlcn-io/merge-roy

Merge roy
vlcn-io · Nov 28, 2023 · 7d9db5f · 7d9db5f
2 parents a2b457e + 5730490
commit 7d9db5f
Show file tree

Hide file tree

Showing 7 changed files with 157 additions and 191 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @vlcn.io/wa-sqlite
 
+## 0.22.0-next.0
+
+### Minor Changes
+
+- v0.16.0-next
+
 ## 0.21.0
 
 ### Minor Changes

diff --git a/Makefile b/Makefile
@@ -1,83 +1,82 @@
 # dependencies
-
-SQLITE_AMALGAMATION = sqlite-amalgamation-3440000
-SQLITE_AMALGAMATION_ZIP_URL = https://www.sqlite.org/2023/${SQLITE_AMALGAMATION}.zip
-SQLITE_AMALGAMATION_ZIP_SHA = 93299c8d2c8397622fe00bd807204b1f58815f45bda8097bf93b3bf759a3ebad
+SQLITE_VERSION = version-3.44.0
+SQLITE_TARBALL_URL = https://www.sqlite.org/src/tarball/sqlite.tar.gz?r=${SQLITE_VERSION}
 
 EXTENSION_FUNCTIONS = extension-functions.c
 EXTENSION_FUNCTIONS_URL = https://www.sqlite.org/contrib/download/extension-functions.c?get=25
 EXTENSION_FUNCTIONS_SHA = 991b40fe8b2799edc215f7260b890f14a833512c9d9896aa080891330ffe4052
 
+CFILES_EXTRA = \
+	crsqlite.c \
+	changes-vtab.c \
+	ext-data.c
+
 # source files
+CFILES = \
+	sqlite3-extra.c \
+	extension-functions.c \
+	libauthorizer.c \
+	libfunction.c \
+	libmodule.c \
+	libprogress.c \
+	libvfs.c \
+	$(CFILES_EXTRA)
+
+dir.crsql := ./crsql/src
+
+vpath %.c src
+vpath %.c deps
+vpath %.c deps/$(SQLITE_VERSION)
+vpath %.c $(dir.crsql)
 
-LIBRARY_FILES = src/libauthorizer.js src/libfunction.js src/libmodule.js src/libprogress.js src/libvfs.js
 EXPORTED_FUNCTIONS = src/exported_functions.json
 EXPORTED_RUNTIME_METHODS = src/extra_exported_runtime_methods.json
 ASYNCIFY_IMPORTS = src/asyncify_imports.json
 
 # intermediate files
-
 RS_LIB = crsql_bundle
 RS_LIB_DIR = ./crsql/rs/bundle
 RS_WASM_TGT = wasm32-unknown-emscripten
 RS_WASM_TGT_DIR = $(RS_LIB_DIR)/target/$(RS_WASM_TGT)
 RS_RELEASE_BC = $(RS_WASM_TGT_DIR)/release/deps/$(RS_LIB).bc
 RS_DEBUG_BC = $(RS_WASM_TGT_DIR)/debug/deps/$(RS_LIB).bc
 
-OBJ_FILES_DEBUG = \
-	tmp/obj/debug/extension-functions.o \
-	tmp/obj/debug/libauthorizer.o \
-	tmp/obj/debug/libfunction.o \
-	tmp/obj/debug/libmodule.o \
-	tmp/obj/debug/libprogress.o \
-	tmp/obj/debug/libvfs.o
-
-OBJ_FILES_DIST = \
-	tmp/obj/dist/extension-functions.o \
-	tmp/obj/dist/libauthorizer.o \
-	tmp/obj/dist/libfunction.o \
-	tmp/obj/dist/libmodule.o \
-	tmp/obj/dist/libprogress.o \
-	tmp/obj/dist/libvfs.o
-
-dir.crsql := ./crsql/src
-
-crsql-files := \
-	$(dir.crsql)/crsqlite.c\
-	$(dir.crsql)/changes-vtab.c \
-	$(dir.crsql)/ext-data.c
+OBJ_FILES_DEBUG = $(patsubst %.c,tmp/obj/debug/%.o,$(CFILES))
+OBJ_FILES_DIST = $(patsubst %.c,tmp/obj/dist/%.o,$(CFILES))
 
-sqlite3.c := deps/$(SQLITE_AMALGAMATION)/sqlite3.c
-sqlite3.extra.c := deps/$(SQLITE_AMALGAMATION)/sqlite3-extra.c
+sqlite3.c := deps/$(SQLITE_VERSION)/sqlite3.c
+sqlite3.extra.c := deps/$(SQLITE_VERSION)/sqlite3-extra.c
 
 # build options
-
 EMCC ?= emcc
 
-CFLAGS_COMMON = \
-	-I'deps/$(SQLITE_AMALGAMATION)' \
-	-I$(dir.crsql) \
-	-Wno-non-literal-null-conversion
-
-CFLAGS_DEBUG = $(CFLAGS_COMMON) -g
+CFLAGS_EXTRA = -I'$(dir.crsql)'
 
-CFLAGS_DIST = $(CFLAGS_COMMON)
+CFLAGS_COMMON = \
+	-I'deps/$(SQLITE_VERSION)' \
+	-Wno-non-literal-null-conversion \
+	$(CFLAGS_EXTRA)
+CFLAGS_DEBUG = -g $(CFLAGS_COMMON)
+CFLAGS_DIST =  -Oz -flto $(CFLAGS_COMMON)
 
 EMFLAGS_COMMON = \
 	-s ALLOW_MEMORY_GROWTH=1 \
 	-s WASM=1 \
 	-s INVOKE_RUN \
 	-s ENVIRONMENT="web,worker" \
-	-s STACK_SIZE=512KB
+	-s STACK_SIZE=512KB \
+	$(EMFLAGS_EXTRA)
 
-EMFLAGS_DEBUG = $(EMFLAGS_COMMON) \
+EMFLAGS_DEBUG = \
 	-s ASSERTIONS=1 \
-	-g
+	-g \
+	$(EMFLAGS_COMMON)
 
-EMFLAGS_DIST = $(EMFLAGS_COMMON) \
+EMFLAGS_DIST = \
 	-O3 \
 	-flto \
-	--closure 1
+	--closure 1 \
+	$(EMFLAGS_COMMON)
 
 EMFLAGS_INTERFACES = \
 	-s EXPORTED_FUNCTIONS=@$(EXPORTED_FUNCTIONS) \
@@ -103,8 +102,13 @@ EMFLAGS_ASYNCIFY_DIST = \
 	$(EMFLAGS_ASYNCIFY_COMMON) \
 	-s ASYNCIFY_STACK_SIZE=16384
 
+WASQLITE_EXTRA_DEFINES = \
+	-DSQLITE_EXTRA_INIT=core_init \
+	-DSQLITE_ENABLE_FTS5 \
+	-DCRSQLITE_WASM
+
 # https://www.sqlite.org/compile.html
-WASQLITE_DEFINES ?= \
+WASQLITE_DEFINES = \
 	-DSQLITE_DEFAULT_MEMSTATUS=0 \
 	-DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 \
 	-DSQLITE_DQS=0 \
@@ -120,21 +124,8 @@ WASQLITE_DEFINES ?= \
 	-DSQLITE_ENABLE_BYTECODE_VTAB \
 	-DSQLITE_THREADSAFE=0 \
 	-DSQLITE_USE_ALLOCA \
-	-DSQLITE_EXTRA_INIT=core_init \
 	-DSQLITE_ENABLE_BATCH_ATOMIC_WRITE \
-	-DSQLITE_ENABLE_FTS5 \
-	-DCRSQLITE_WASM
-
-WASQLITE_KS_DEFINES ?= $(WASQLITE_DEFINES) \
-  -DSQLITE_ENABLE_FTS5 \
-  -DSQLITE_ENABLE_RTREE \
-  -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
-  -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION \
-  -DSQLITE_ENABLE_STMTVTAB \
-  -DSQLITE_ENABLE_DBPAGE_VTAB \
-  -DSQLITE_ENABLE_DBSTAT_VTAB \
-  -DSQLITE_ENABLE_BYTECODE_VTAB \
-  -DSQLITE_ENABLE_OFFSET_SQL_FUNC
+	$(WASQLITE_EXTRA_DEFINES)
 
 # directories
 .PHONY: all
@@ -160,10 +151,6 @@ spotless:
 clean-cache:
 	rm -rf cache
 
-cache/$(SQLITE_AMALGAMATION).zip:
-	mkdir -p cache
-	curl -LsSf '$(SQLITE_AMALGAMATION_ZIP_URL)' -o $@
-
 cache/$(EXTENSION_FUNCTIONS):
 	mkdir -p cache
 	curl -LsSf '$(EXTENSION_FUNCTIONS_URL)' -o $@
@@ -174,16 +161,12 @@ clean-deps:
 	rm -rf deps
 
 .PHONY: deps
-deps: deps/$(SQLITE_AMALGAMATION) deps/$(EXTENSION_FUNCTIONS) $(EXPORTED_FUNCTIONS)
 
-deps/$(SQLITE_AMALGAMATION): cache/$(SQLITE_AMALGAMATION).zip
-	mkdir -p deps
-	openssl dgst -sha256 -r cache/$(SQLITE_AMALGAMATION).zip | sed -e 's/ .*//' > deps/sha
-	echo $(SQLITE_AMALGAMATION_ZIP_SHA) > deps/sha-expected
-	cmp deps/sha deps/sha-expected
-	rm -rf deps/sha deps/sha-expected $@
-	unzip 'cache/$(SQLITE_AMALGAMATION).zip' -d deps/
-	touch $@
+deps/$(SQLITE_VERSION)/sqlite3.h deps/$(SQLITE_VERSION)/sqlite3.c:
+	mkdir -p cache/$(SQLITE_VERSION)
+	curl -LsS $(SQLITE_TARBALL_URL) | tar -xzf - -C cache/$(SQLITE_VERSION)/ --strip-components=1
+	mkdir -p deps/$(SQLITE_VERSION)
+	(cd deps/$(SQLITE_VERSION); ../../cache/$(SQLITE_VERSION)/configure --enable-all && make sqlite3.c)
 
 deps/$(EXTENSION_FUNCTIONS): cache/$(EXTENSION_FUNCTIONS)
 	mkdir -p deps
@@ -198,60 +181,11 @@ deps/$(EXTENSION_FUNCTIONS): cache/$(EXTENSION_FUNCTIONS)
 clean-tmp:
 	rm -rf tmp
 
-# TODO: -emit-llvm ? -flto?
-# tmp/obj/debug/sqlite3-extra.o: deps/$(SQLITE_AMALGAMATION) $(sqlite3.extra.c) $(crsql-files)
-# 	mkdir -p tmp/obj/debug
-# 	$(EMCC) $(CFLAGS_DEBUG) $(WASQLITE_DEFINES) deps/$(SQLITE_AMALGAMATION)/sqlite3-extra.c $(crsql-files) -c
-
-tmp/obj/debug/extension-functions.o: deps/$(EXTENSION_FUNCTIONS)
-	mkdir -p tmp/obj/debug
-	$(EMCC) $(CFLAGS_DEBUG) $(WASQLITE_DEFINES) $^ -c -o $@
-
-tmp/obj/debug/libfunction.o: src/libfunction.c
-	mkdir -p tmp/obj/debug
-	$(EMCC) $(CFLAGS_DEBUG) $(WASQLITE_DEFINES) $^ -c -o $@
-
-tmp/obj/debug/libauthorizer.o: src/libauthorizer.c
-	mkdir -p tmp/obj/debug
-	$(EMCC) $(CFLAGS_DEBUG) $(WASQLITE_DEFINES) $^ -c -o $@
-
-tmp/obj/debug/libmodule.o: src/libmodule.c
+tmp/obj/debug/%.o: %.c
 	mkdir -p tmp/obj/debug
 	$(EMCC) $(CFLAGS_DEBUG) $(WASQLITE_DEFINES) $^ -c -o $@
 
-tmp/obj/debug/libprogress.o: src/libprogress.c
-	mkdir -p tmp/obj/debug
-	$(EMCC) $(CFLAGS_DEBUG) $(WASQLITE_DEFINES) $^ -c -o $@
-
-tmp/obj/debug/libvfs.o: src/libvfs.c
-	mkdir -p tmp/obj/debug
-	$(EMCC) $(CFLAGS_DEBUG) $(WASQLITE_DEFINES) $^ -c -o $@
-
-sqlite3-extra.o: deps/$(SQLITE_AMALGAMATION) $(sqlite3.extra.c) $(crsql-files)
-	mkdir -p tmp/obj/dist
-	$(EMCC) $(CFLAGS_DIST) $(WASQLITE_DEFINES) deps/$(SQLITE_AMALGAMATION)/sqlite3-extra.c $(crsql-files) -c
-
-tmp/obj/dist/extension-functions.o: deps/$(EXTENSION_FUNCTIONS)
-	mkdir -p tmp/obj/dist
-	$(EMCC) $(CFLAGS_DIST) $(WASQLITE_DEFINES) $^ -c -o $@
-
-tmp/obj/dist/libfunction.o: src/libfunction.c
-	mkdir -p tmp/obj/dist
-	$(EMCC) $(CFLAGS_DIST) $(WASQLITE_DEFINES) $^ -c -o $@
-
-tmp/obj/dist/libauthorizer.o: src/libauthorizer.c
-	mkdir -p tmp/obj/dist
-	$(EMCC) $(CFLAGS_DIST) $(WASQLITE_DEFINES) $^ -c -o $@
-
-tmp/obj/dist/libmodule.o: src/libmodule.c
-	mkdir -p tmp/obj/dist
-	$(EMCC) $(CFLAGS_DIST) $(WASQLITE_DEFINES) $^ -c -o $@
-
-tmp/obj/dist/libprogress.o: src/libprogress.c
-	mkdir -p tmp/obj/dist
-	$(EMCC) $(CFLAGS_DIST) $(WASQLITE_DEFINES) $^ -c -o $@
-
-tmp/obj/dist/libvfs.o: src/libvfs.c
+tmp/obj/dist/%.o: %.c
 	mkdir -p tmp/obj/dist
 	$(EMCC) $(CFLAGS_DIST) $(WASQLITE_DEFINES) $^ -c -o $@
 
@@ -274,22 +208,22 @@ clean-debug:
 .PHONY: debug
 debug: debug/crsqlite-sync.mjs debug/crsqlite.mjs
 
-debug/crsqlite-sync.mjs: $(OBJ_FILES_DEBUG) $(RS_DEBUG_BC) sqlite3-extra.o $(LIBRARY_FILES) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
+debug/crsqlite-sync.mjs: $(OBJ_FILES_DEBUG) $(RS_DEBUG_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
 	mkdir -p debug
 	$(EMCC) $(EMFLAGS_DEBUG) \
 	  $(EMFLAGS_INTERFACES) \
 	  $(EMFLAGS_LIBRARIES) \
 		$(RS_WASM_TGT_DIR)/debug/deps/*.bc \
-	  $(OBJ_FILES_DEBUG) *.o -o $@
+	  $(OBJ_FILES_DEBUG) -o $@
 
-debug/crsqlite.mjs: $(OBJ_FILES_DEBUG) $(RS_DEBUG_BC) sqlite3-extra.o $(LIBRARY_FILES) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
+debug/crsqlite.mjs: $(OBJ_FILES_DEBUG) $(RS_DEBUG_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
 	mkdir -p debug
 	$(EMCC) $(EMFLAGS_DEBUG) \
 	  $(EMFLAGS_INTERFACES) \
 	  $(EMFLAGS_LIBRARIES) \
 	  $(EMFLAGS_ASYNCIFY_DEBUG) \
 		$(RS_WASM_TGT_DIR)/debug/deps/*.bc \
-	  $(OBJ_FILES_DEBUG) *.o -o $@
+	  $(OBJ_FILES_DEBUG) -o $@
 
 ## dist
 .PHONY: clean-dist
@@ -299,48 +233,22 @@ clean-dist:
 .PHONY: dist
 dist: deps dist/crsqlite-sync.mjs dist/crsqlite.mjs
 
-dist/crsqlite-sync.mjs: $(OBJ_FILES_DIST) $(RS_RELEASE_BC) sqlite3-extra.o $(LIBRARY_FILES) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
+FORCE: ;
+
+dist/crsqlite-sync.mjs: $(OBJ_FILES_DIST) $(RS_RELEASE_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
 	mkdir -p dist
 	$(EMCC) $(EMFLAGS_DIST) \
 	  $(EMFLAGS_INTERFACES) \
 	  $(EMFLAGS_LIBRARIES) \
 		$(RS_WASM_TGT_DIR)/release/deps/*.bc \
-	  $(OBJ_FILES_DIST) *.o -o $@
+	  $(OBJ_FILES_DIST) -o $@
 
-dist/crsqlite.mjs: $(OBJ_FILES_DIST) $(RS_RELEASE_BC) sqlite3-extra.o $(LIBRARY_FILES) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
+dist/crsqlite.mjs: $(OBJ_FILES_DIST) $(RS_RELEASE_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
 	mkdir -p dist
 	$(EMCC) $(EMFLAGS_DIST) \
 	  $(EMFLAGS_INTERFACES) \
 	  $(EMFLAGS_LIBRARIES) \
 	  $(EMFLAGS_ASYNCIFY_DIST) \
-		$(CFLAGS_DIST) \
 		$(RS_WASM_TGT_DIR)/release/deps/*.bc \
-	  $(OBJ_FILES_DIST) *.o -o $@
-
-FORCE: ;
-
-# dist-xl
-.PHONY: clean-dist-xl
-clean-dist-xl:
-	rm -f dist-xl.zip
-	rm -rf dist-xl
-
-.PHONY: dist-xl
-dist-xl: dist-xl/wa-sqlite.mjs dist-xl/wa-sqlite-async.mjs
-	zip -r dist-xl dist-xl/
-
-dist-xl/wa-sqlite.mjs: deps/$(SQLITE_AMALGAMATION)/sqlite3.c deps/$(EXTENSION_FUNCTIONS) src/*.c
-	mkdir -p dist-xl
-	$(EMCC) $(CFLAGS_DIST) $(WASQLITE_KS_DEFINES) $(EMFLAGS_DIST) \
-	  $(EMFLAGS_INTERFACES) \
-	  $(EMFLAGS_LIBRARIES) \
-	  $^ -o $@
-
-dist-xl/wa-sqlite-async.mjs: deps/$(SQLITE_AMALGAMATION)/sqlite3.c deps/$(EXTENSION_FUNCTIONS) src/*.c
-	mkdir -p dist-xl
-	$(EMCC) $(CFLAGS_DIST) $(WASQLITE_KS_DEFINES) $(EMFLAGS_DIST) \
-	  $(EMFLAGS_INTERFACES) \
-	  $(EMFLAGS_LIBRARIES) \
-	  $(EMFLAGS_ASYNCIFY_DIST) \
-	  $^ -o $@
+	  $(OBJ_FILES_DIST) -o $@
 
diff --git a/README.md b/README.md
@@ -13,12 +13,14 @@ The primary motivation for this project is to enable additions to SQLite with on
 Note that earlier versions of the project only provided pre-built artifacts in the
 "buildless" branch; that branch will no longer be maintained.
 
-If you do want to build - e.g. you want to change build flags, use a specific EMSDK version, or modify wa-sqlite itself - here are the prerequisites:
+Minor build customization (e.g. changing build defines or flags) can be done with [make arguments](https://github.com/rhashimoto/wa-sqlite/discussions/128), and the helper project [sqwab](https://github.com/rhashimoto/sqwab) can be used to build without a local build environment.
+
+If you do want to build yourself, here are the prerequisites:
 
 * Building on Debian Linux is known to work, compatibility with other platforms is unknown.
 * `yarn` - If you use a different package manager (e.g. `npm`) then file paths in the demo will need adjustment.
 * [Emscripten SDK](https://emscripten.org/docs/getting_started/downloads.html) 3.1.25+.
-* `curl`, `make`, `openssl`, `sed`, `unzip`
+* `curl`, `make`, `openssl`, `sed`, `tclsh`, `unzip`
 
 Here are the build steps:
 * Make sure `emcc` works.
@@ -74,4 +76,4 @@ For convenience, if any text region is selected in the editor, only that region
 ## License
 MIT License as of February 10, 2023, changed by generous sponsors
 [Fleet Device Management](https://fleetdm.com/) and [Reflect](https://reflect.app/).
-Existing licensees may continue under the GPLv3 or switch to the new license.
+Existing licensees may continue under the GPLv3 or switch to the new license.