Skip to content

Commit 15eea72

Browse files
committed
Rename exported_runtime_methods and exported_functions
1 parent 6466c31 commit 15eea72

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

Makefile

+9-9
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ CFLAGS=-O2 -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_DISABLE_LFS -DLONGDOUBLE_TYPE=d
2525
EMFLAGS = \
2626
--memory-init-file 0 \
2727
-s RESERVED_FUNCTION_POINTERS=64 \
28-
-s EXPORTED_FUNCTIONS=@exported_functions \
29-
-s EXTRA_EXPORTED_RUNTIME_METHODS=@exported_runtime_methods \
28+
-s EXPORTED_FUNCTIONS=@src/exported_functions.json \
29+
-s EXTRA_EXPORTED_RUNTIME_METHODS=@src/exported_runtime_methods.json \
3030
-s SINGLE_FILE=0 \
3131
-s NODEJS_CATCH_EXIT=0
3232

@@ -51,13 +51,13 @@ all: optimized debug worker
5151
.PHONY: debug
5252
debug: dist/sql-asm-debug.js dist/sql-wasm-debug.js
5353

54-
dist/sql-asm-debug.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) out/api.js exported_functions exported_runtime_methods
54+
dist/sql-asm-debug.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) out/api.js src/exported_functions.json src/exported_runtime_methods.json
5555
$(EMCC) $(EMFLAGS) $(EMFLAGS_DEBUG) -s WASM=0 $(BITCODE_FILES) --pre-js out/api.js -o $@
5656
mv $@ out/tmp-raw.js
5757
cat src/shell-pre.js out/tmp-raw.js src/shell-post.js > $@
5858
rm out/tmp-raw.js
5959

60-
dist/sql-wasm-debug.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) out/api.js exported_functions exported_runtime_methods
60+
dist/sql-wasm-debug.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) out/api.js src/exported_functions.json src/exported_runtime_methods.json
6161
$(EMCC) $(EMFLAGS) $(EMFLAGS_DEBUG) $(EMFLAGS_WASM) $(BITCODE_FILES) --pre-js out/api.js -o $@
6262
mv $@ out/tmp-raw.js
6363
cat src/shell-pre.js out/tmp-raw.js src/shell-post.js > $@
@@ -66,19 +66,19 @@ dist/sql-wasm-debug.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) out/api.js expo
6666
.PHONY: optimized
6767
optimized: dist/sql-asm.js dist/sql-wasm.js dist/sql-asm-memory-growth.js
6868

69-
dist/sql-asm.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) out/api.js exported_functions exported_runtime_methods
69+
dist/sql-asm.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) out/api.js src/exported_functions.json src/exported_runtime_methods.json
7070
$(EMCC) $(EMFLAGS) $(EMFLAGS_OPTIMIZED) -s WASM=0 $(BITCODE_FILES) --pre-js out/api.js -o $@
7171
mv $@ out/tmp-raw.js
7272
cat src/shell-pre.js out/tmp-raw.js src/shell-post.js > $@
7373
rm out/tmp-raw.js
7474

75-
dist/sql-wasm.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) out/api.js exported_functions exported_runtime_methods
75+
dist/sql-wasm.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) out/api.js src/exported_functions.json src/exported_runtime_methods.json
7676
$(EMCC) $(EMFLAGS) $(EMFLAGS_OPTIMIZED) $(EMFLAGS_WASM) $(BITCODE_FILES) --pre-js out/api.js -o $@
7777
mv $@ out/tmp-raw.js
7878
cat src/shell-pre.js out/tmp-raw.js src/shell-post.js > $@
7979
rm out/tmp-raw.js
8080

81-
dist/sql-asm-memory-growth.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) out/api.js exported_functions exported_runtime_methods
81+
dist/sql-asm-memory-growth.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) out/api.js src/exported_functions.json src/exported_runtime_methods.json
8282
$(EMCC) $(EMFLAGS) $(EMFLAGS_OPTIMIZED) -s WASM=0 -s ALLOW_MEMORY_GROWTH=1 $(BITCODE_FILES) --pre-js out/api.js -o $@
8383
mv $@ out/tmp-raw.js
8484
cat src/shell-pre.js out/tmp-raw.js src/shell-post.js > $@
@@ -108,14 +108,14 @@ dist/worker.sql-wasm-debug.js: dist/sql-wasm-debug.js out/worker.js
108108
# However, since we can't tell emcc that we don't need the wasm generated, and just want the wrapper, we have to pay to have the .wasm generated
109109
# even though we would have already generated it with our sql-wasm.js target above.
110110
# This would be made easier if this is implemented: https://github.com/emscripten-core/emscripten/issues/8506
111-
# dist/worker.sql-wasm.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) out/api.js out/worker.js exported_functions exported_runtime_methods dist/sql-wasm-debug.wasm
111+
# dist/worker.sql-wasm.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) out/api.js out/worker.js src/exported_functions.json src/exported_runtime_methods.json dist/sql-wasm-debug.wasm
112112
# $(EMCC) $(EMFLAGS) $(EMFLAGS_OPTIMIZED) -s ENVIRONMENT=worker -s $(EMFLAGS_WASM) $(BITCODE_FILES) --pre-js out/api.js -o out/sql-wasm.js
113113
# mv out/sql-wasm.js out/tmp-raw.js
114114
# cat src/shell-pre.js out/tmp-raw.js src/shell-post.js out/worker.js > $@
115115
# #mv out/sql-wasm.wasm dist/sql-wasm.wasm
116116
# rm out/tmp-raw.js
117117

118-
# dist/worker.sql-wasm-debug.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) out/api.js out/worker.js exported_functions exported_runtime_methods dist/sql-wasm-debug.wasm
118+
# dist/worker.sql-wasm-debug.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) out/api.js out/worker.js src/exported_functions.json src/exported_runtime_methods.json dist/sql-wasm-debug.wasm
119119
# $(EMCC) -s ENVIRONMENT=worker $(EMFLAGS) $(EMFLAGS_DEBUG) -s ENVIRONMENT=worker -s WASM_BINARY_FILE=sql-wasm-foo.debug $(EMFLAGS_WASM) $(BITCODE_FILES) --pre-js out/api.js -o out/sql-wasm-debug.js
120120
# mv out/sql-wasm-debug.js out/tmp-raw.js
121121
# cat src/shell-pre.js out/tmp-raw.js src/shell-post.js out/worker.js > $@
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)