Skip to content

Commit 9be5d78

Browse files
mugikhanmugikhan
committed
Add fts flag to standard build.
Comment out FTS build
1 parent 153621e commit 9be5d78

File tree

1 file changed

+57
-60
lines changed

1 file changed

+57
-60
lines changed

‎Makefile‎

Lines changed: 57 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ EXPORTED_RUNTIME_METHODS = src/extra_exported_runtime_methods.json
2626
ASYNCIFY_IMPORTS = src/asyncify_imports.json
2727

2828
# intermediate files
29-
OBJ_FILES_DEBUG_FTS = $(patsubst %.c,tmp/obj/debug/%.o,$(CFILES))
30-
OBJ_FILES_DIST_FTS = $(patsubst %.c,tmp/obj/dist/%.o,$(CFILES))
29+
OBJ_FILES_DEBUG = $(patsubst %.c,tmp/obj/debug/%.o,$(CFILES))
30+
OBJ_FILES_DIST = $(patsubst %.c,tmp/obj/dist/%.o,$(CFILES))
3131

3232
RS_LIB = powersync
3333
RS_LIB_DIR = ./powersync-sqlite-core
@@ -104,11 +104,9 @@ WASQLITE_DEFINES = \
104104
-DSQLITE_THREADSAFE=0 \
105105
-DSQLITE_USE_ALLOCA \
106106
-DSQLITE_ENABLE_BATCH_ATOMIC_WRITE \
107+
-DSQLITE_ENABLE_FTS5 \
107108
$(WASQLITE_EXTRA_DEFINES)
108109

109-
WASQLITE_FTS_DEFINES ?= $(WASQLITE_DEFINES) \
110-
-DSQLITE_ENABLE_FTS5
111-
112110
# directories
113111
.PHONY: all
114112
all: dist
@@ -155,11 +153,11 @@ clean-tmp:
155153

156154
tmp/obj/debug/%.o: %.c
157155
mkdir -p tmp/obj/debug
158-
$(EMCC) $(CFLAGS_DEBUG) $(WASQLITE_FTS_DEFINES) $^ -c -o $@
156+
$(EMCC) $(CFLAGS_DEBUG) $(WASQLITE_DEFINES) $^ -c -o $@
159157

160158
tmp/obj/dist/%.o: %.c
161159
mkdir -p tmp/obj/dist
162-
$(EMCC) $(CFLAGS_DIST) $(WASQLITE_FTS_DEFINES) $^ -c -o $@
160+
$(EMCC) $(CFLAGS_DIST) $(WASQLITE_DEFINES) $^ -c -o $@
163161

164162
$(RS_DEBUG_BC): FORCE
165163
mkdir -p tmp/bc/dist
@@ -177,100 +175,99 @@ $(RS_RELEASE_BC): FORCE
177175
clean-debug:
178176
rm -rf debug debug-fts
179177

180-
# .PHONY: debug
181-
# debug: debug/wa-sqlite.mjs debug/wa-sqlite-async.mjs
182-
183-
# debug/wa-sqlite.mjs: $(OBJ_FILES_DEBUG) $(RS_DEBUG_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
184-
# mkdir -p debug
185-
# $(EMCC) $(EMFLAGS_DEBUG) \
186-
# $(EMFLAGS_INTERFACES) \
187-
# $(EMFLAGS_LIBRARIES) \
188-
# $(RS_WASM_TGT_DIR)/debug/deps/*.bc \
189-
# $(OBJ_FILES_DEBUG) *.o -o $@
190-
191-
# debug/wa-sqlite-async.mjs: $(OBJ_FILES_DEBUG) $(RS_DEBUG_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
192-
# mkdir -p debug
193-
# $(EMCC) $(EMFLAGS_DEBUG) \
194-
# $(EMFLAGS_INTERFACES) \
195-
# $(EMFLAGS_LIBRARIES) \
196-
# $(EMFLAGS_ASYNCIFY_DEBUG) \
197-
# $(RS_WASM_TGT_DIR)/debug/deps/*.bc \
198-
# $(OBJ_FILES_DEBUG) *.o -o $@
199-
200178
.PHONY: debug
201179
debug: debug/wa-sqlite.mjs debug/wa-sqlite-async.mjs
202180

203-
debug/wa-sqlite.mjs: $(OBJ_FILES_DEBUG_FTS) $(RS_DEBUG_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
181+
debug/wa-sqlite.mjs: $(OBJ_FILES_DEBUG) $(RS_DEBUG_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
204182
mkdir -p debug
205183
$(EMCC) $(EMFLAGS_DEBUG) \
206184
$(EMFLAGS_INTERFACES) \
207185
$(EMFLAGS_LIBRARIES) \
208186
$(RS_WASM_TGT_DIR)/debug/deps/*.bc \
209-
$(OBJ_FILES_DEBUG_FTS) *.o -o $@
187+
$(OBJ_FILES_DEBUG) *.o -o $@
210188

211-
debug/wa-sqlite-async.mjs: $(OBJ_FILES_DEBUG_FTS) $(RS_DEBUG_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
189+
debug/wa-sqlite-async.mjs: $(OBJ_FILES_DEBUG) $(RS_DEBUG_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
212190
mkdir -p debug
213191
$(EMCC) $(EMFLAGS_DEBUG) \
214192
$(EMFLAGS_INTERFACES) \
215193
$(EMFLAGS_LIBRARIES) \
216194
$(EMFLAGS_ASYNCIFY_DEBUG) \
217195
$(RS_WASM_TGT_DIR)/debug/deps/*.bc \
218-
$(OBJ_FILES_DEBUG_FTS) *.o -o $@
196+
$(OBJ_FILES_DEBUG) *.o -o $@
219197

220-
# For future use as an optimised build target
221-
# To build add dist to the .PHONY: all target
222-
## dist
223-
# .PHONY: clean-dist
224-
# clean-dist:
225-
# rm -rf dist
226-
227-
# .PHONY: dist
228-
# dist: dist/wa-sqlite.mjs dist/wa-sqlite-async.mjs
198+
## Debug FTS builds
199+
# .PHONY: debug
200+
# debug: debug/wa-sqlite.mjs debug/wa-sqlite-async.mjs
229201

230-
# dist/wa-sqlite.mjs: $(OBJ_FILES_DIST) $(RS_RELEASE_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
231-
# mkdir -p dist
232-
# $(EMCC) $(EMFLAGS_DIST) \
202+
# debug/wa-sqlite.mjs: $(OBJ_FILES_DEBUG_FTS) $(RS_DEBUG_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
203+
# mkdir -p debug
204+
# $(EMCC) $(EMFLAGS_DEBUG) \
233205
# $(EMFLAGS_INTERFACES) \
234206
# $(EMFLAGS_LIBRARIES) \
235-
# $(RS_WASM_TGT_DIR)/wasm/deps/*.bc \
236-
# $(OBJ_FILES_DIST) -o $@
207+
# $(RS_WASM_TGT_DIR)/debug/deps/*.bc \
208+
# $(OBJ_FILES_DEBUG_FTS) *.o -o $@
237209

238-
# dist/wa-sqlite-async.mjs: $(OBJ_FILES_DIST) $(RS_RELEASE_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
239-
# mkdir -p dist
240-
# $(EMCC) $(EMFLAGS_DIST) \
210+
# debug/wa-sqlite-async.mjs: $(OBJ_FILES_DEBUG_FTS) $(RS_DEBUG_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
211+
# mkdir -p debug
212+
# $(EMCC) $(EMFLAGS_DEBUG) \
241213
# $(EMFLAGS_INTERFACES) \
242214
# $(EMFLAGS_LIBRARIES) \
243-
# $(EMFLAGS_ASYNCIFY_DIST) \
244-
# $(CFLAGS_DIST) \
245-
# $(RS_WASM_TGT_DIR)/wasm/deps/*.bc \
246-
# $(OBJ_FILES_DIST) -o $@
247-
248-
# FORCE: ;
215+
# $(EMFLAGS_ASYNCIFY_DEBUG) \
216+
# $(RS_WASM_TGT_DIR)/debug/deps/*.bc \
217+
# $(OBJ_FILES_DEBUG_FTS) *.o -o $@
249218

250-
# FTS builds
219+
## dist
251220
.PHONY: clean-dist
252221
clean-dist:
253222
rm -rf dist
254223

255224
.PHONY: dist
256225
dist: dist/wa-sqlite.mjs dist/wa-sqlite-async.mjs
257226

258-
dist/wa-sqlite.mjs: $(OBJ_FILES_DIST_FTS) $(RS_RELEASE_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
227+
dist/wa-sqlite.mjs: $(OBJ_FILES_DIST) $(RS_RELEASE_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
259228
mkdir -p dist
260229
$(EMCC) $(EMFLAGS_DIST) \
261230
$(EMFLAGS_INTERFACES) \
262231
$(EMFLAGS_LIBRARIES) \
263232
$(RS_WASM_TGT_DIR)/wasm/deps/*.bc \
264-
$(OBJ_FILES_DIST_FTS) -o $@
233+
$(OBJ_FILES_DIST) -o $@
265234

266-
dist/wa-sqlite-async.mjs: $(OBJ_FILES_DIST_FTS) $(RS_RELEASE_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
235+
dist/wa-sqlite-async.mjs: $(OBJ_FILES_DIST) $(RS_RELEASE_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
267236
mkdir -p dist
268237
$(EMCC) $(EMFLAGS_DIST) \
269238
$(EMFLAGS_INTERFACES) \
270239
$(EMFLAGS_LIBRARIES) \
271240
$(EMFLAGS_ASYNCIFY_DIST) \
272241
$(CFLAGS_DIST) \
273242
$(RS_WASM_TGT_DIR)/wasm/deps/*.bc \
274-
$(OBJ_FILES_DIST_FTS) -o $@
243+
$(OBJ_FILES_DIST) -o $@
244+
245+
FORCE: ;
246+
247+
# FTS builds
248+
# .PHONY: clean-dist
249+
# clean-dist:
250+
# rm -rf dist
251+
252+
# .PHONY: dist
253+
# dist: dist/wa-sqlite.mjs dist/wa-sqlite-async.mjs
254+
255+
# dist/wa-sqlite.mjs: $(OBJ_FILES_DIST_FTS) $(RS_RELEASE_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS)
256+
# mkdir -p dist
257+
# $(EMCC) $(EMFLAGS_DIST) \
258+
# $(EMFLAGS_INTERFACES) \
259+
# $(EMFLAGS_LIBRARIES) \
260+
# $(RS_WASM_TGT_DIR)/wasm/deps/*.bc \
261+
# $(OBJ_FILES_DIST_FTS) -o $@
262+
263+
# dist/wa-sqlite-async.mjs: $(OBJ_FILES_DIST_FTS) $(RS_RELEASE_BC) $(EXPORTED_FUNCTIONS) $(EXPORTED_RUNTIME_METHODS) $(ASYNCIFY_IMPORTS)
264+
# mkdir -p dist
265+
# $(EMCC) $(EMFLAGS_DIST) \
266+
# $(EMFLAGS_INTERFACES) \
267+
# $(EMFLAGS_LIBRARIES) \
268+
# $(EMFLAGS_ASYNCIFY_DIST) \
269+
# $(CFLAGS_DIST) \
270+
# $(RS_WASM_TGT_DIR)/wasm/deps/*.bc \
271+
# $(OBJ_FILES_DIST_FTS) -o $@
275272

276-
FORCE: ;
273+
# FORCE: ;

0 commit comments

Comments
 (0)