Skip to content

Commit 68d7db6

Browse files
committed
Merge pull request sql-js#142 from dinedal/extension_functions
Adds extension-functions.c from http://www.sqlite.org/contrib
2 parents e41ef2e + 5faf290 commit 68d7db6

File tree

12 files changed

+250135
-258570
lines changed

12 files changed

+250135
-258570
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ node_modules/
33

44
# LLVM bitcode
55
c/sqlite3.bc
6+
c/extension-functions.bc
67
# Intermediary js files
78
js/api.js
89
js/sql-noopt-raw.js.map
910
js/sql-optimized.js
11+
js/worker.js
1012
js/sql-raw.js.map

Makefile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ EMCC=$(EMSCRIPTEN)/emcc
66

77
CFLAGS=-DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_DISABLE_LFS -DLONGDOUBLE_TYPE=double -DSQLITE_INT64_TYPE="long long int" -DSQLITE_THREADSAFE=0 -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
88

9-
all: js/sql.js
9+
all: js/sql.js js/sql-debug.js js/worker.sql.js
1010

1111
# RESERVED_FUNCTION_POINTERS setting is used for registering custom functions
1212
debug: EMFLAGS= -O1 -g -s INLINING_LIMIT=10 -s RESERVED_FUNCTION_POINTERS=64
@@ -21,8 +21,8 @@ js/sql.js: optimized
2121
js/sql%.js: js/shell-pre.js js/sql%-raw.js js/shell-post.js
2222
cat $^ > $@
2323

24-
js/sql%-raw.js: c/sqlite3.bc js/api.js exported_functions
25-
$(EMCC) $(EMFLAGS) -s EXPORTED_FUNCTIONS=@exported_functions c/sqlite3.bc --post-js js/api.js -o $@
24+
js/sql%-raw.js: c/sqlite3.bc c/extension-functions.bc js/api.js exported_functions
25+
$(EMCC) $(EMFLAGS) -s EXPORTED_FUNCTIONS=@exported_functions c/extension-functions.bc c/sqlite3.bc --post-js js/api.js -o $@ ;\
2626

2727
js/api.js: coffee/api.coffee coffee/exports.coffee coffee/api-data.coffee
2828
cat $^ | coffee --bare --compile --stdio > $@
@@ -39,9 +39,13 @@ c/sqlite3.bc: c/sqlite3.c
3939
# Generate llvm bitcode
4040
$(EMCC) $(CFLAGS) c/sqlite3.c -o c/sqlite3.bc
4141

42+
c/extension-functions.bc: c/extension-functions.c
43+
$(EMCC) $(CFLAGS) -s LINKABLE=1 c/extension-functions.c -o c/extension-functions.bc
44+
4245
module.tar.gz: test package.json AUTHORS README.md js/sql.js
4346
tar --create --gzip $^ > $@
4447

4548
clean:
46-
rm -rf js/sql*.js js/api.js js/sql*-raw.js c/sqlite3.bc
49+
rm -rf js/sql.js js/api.js js/sql*-raw.js js/worker.sql.js js/worker.js c/sqlite3.bc c/extension-functions.bc
50+
4751

0 commit comments

Comments
 (0)