Worked extension-functions.c back into main build process

Author: dinedal

.gitignore

@@ -6,9 +6,7 @@ c/sqlite3.bc
 c/extension-functions.bc
 # Intermediary js files
 js/api.js
-js/api-extension-functions.js
 js/sql-noopt-raw.js.map
 js/sql-optimized.js
-js/sql-extension-functions-optimized.js
 js/worker.js
 js/sql-raw.js.map

Makefile

@@ -6,37 +6,27 @@ EMCC=$(EMSCRIPTEN)/emcc
 
 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
 
-all: js/sql.js js/sql-debug.js js/worker.sql.js js/sql-extension-functions.js js/sql-extension-functions-debug.js js/worker.sql-extension-functions.js
+all: js/sql.js js/sql-debug.js js/worker.sql.js
 
 # RESERVED_FUNCTION_POINTERS setting is used for registering custom functions
 debug: EMFLAGS= -O1 -g -s INLINING_LIMIT=10 -s RESERVED_FUNCTION_POINTERS=64
-debug: js/sql-debug.js js/sql-extension-functions-debug.js
+debug: js/sql-debug.js
 
 optimized: EMFLAGS= --memory-init-file 0 --closure 1 -O3 -s INLINING_LIMIT=50 -s RESERVED_FUNCTION_POINTERS=64
-optimized: js/sql-optimized.js js/sql-extension-functions-optimized.js
+optimized: js/sql-optimized.js
 
 js/sql.js: optimized
 	cp js/sql-optimized.js js/sql.js
 
-js/sql-extension-functions.js: optimized
-	cp js/sql-extension-functions-optimized.js js/sql-extension-functions.js
-
 js/sql%.js: js/shell-pre.js js/sql%-raw.js js/shell-post.js
 	cat $^ > $@
 
-js/sql%-raw.js: c/sqlite3.bc js/api.js exported_functions extension_exported_functions c/extension-functions.bc js/api-extension-functions.js
-	if [ "$(findstring extension-functions,$@)" = "extension-functions" ]; then \
-		$(EMCC) $(EMFLAGS) -s EXPORTED_FUNCTIONS=@extension_exported_functions c/extension-functions.bc c/sqlite3.bc --post-js js/api-extension-functions.js -o $@ ;\
-	else \
-		$(EMCC) $(EMFLAGS) -s EXPORTED_FUNCTIONS=@exported_functions c/sqlite3.bc --post-js js/api.js -o $@ ;\
-	fi
+js/sql%-raw.js: c/sqlite3.bc c/extension-functions.bc js/api.js exported_functions
+	$(EMCC) $(EMFLAGS) -s EXPORTED_FUNCTIONS=@exported_functions c/extension-functions.bc c/sqlite3.bc --post-js js/api.js -o $@ ;\
 
 js/api.js: coffee/api.coffee coffee/exports.coffee coffee/api-data.coffee
 	cat $^ | coffee --bare --compile --stdio > $@
 
-js/api-extension-functions.js: coffee/api.coffee coffee/extension-functions-exports.coffee coffee/api-data.coffee
-	cat $^ | coffee --bare --compile --stdio > $@
-
 # Web worker API
 worker: js/worker.sql.js
 js/worker.js: coffee/worker.coffee
@@ -45,18 +35,17 @@ js/worker.js: coffee/worker.coffee
 js/worker.sql.js: js/sql.js js/worker.js
 	cat $^ > $@
 
-js/worker.sql-extension-functions.js: js/sql-extension-functions.js js/worker.js
-	cat $^ > $@
-
 c/sqlite3.bc: c/sqlite3.c
 	# Generate llvm bitcode
 	$(EMCC) $(CFLAGS) c/sqlite3.c -o c/sqlite3.bc
 
+c/extension-functions.bc: c/extension-functions.c
+	$(EMCC) $(CFLAGS) -s LINKABLE=1 c/extension-functions.c -o c/extension-functions.bc
+
 module.tar.gz: test package.json AUTHORS README.md js/sql.js
 	tar --create --gzip $^ > $@
 
 clean:
-	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
+	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
+
 
-c/extension-functions.bc: c/extension-functions.c
-	$(EMCC) $(CFLAGS) -s LINKABLE=1 c/extension-functions.c -o c/extension-functions.bc

coffee/api.coffee

@@ -243,7 +243,7 @@ class Database
         if data? then FS.createDataFile '/', @filename, data, true, true
         @handleError sqlite3_open @filename, apiTemp
         @db = getValue(apiTemp, 'i32')
-        RegisterExtensionFunctions(@db) if typeof(RegisterExtensionFunctions) == "function"
+        RegisterExtensionFunctions(@db)
         @statements = {} # A list of all prepared statements of the database
 
     ### Execute an SQL query, ignoring the rows it returns.

coffee/exports.coffee

@@ -52,6 +52,7 @@ sqlite3_value_double = Module['cwrap'] 'sqlite3_value_double', 'number', ['numbe
 sqlite3_result_double = Module['cwrap'] 'sqlite3_result_double', '', ['number', 'number']
 sqlite3_result_null = Module['cwrap'] 'sqlite3_result_null', '', ['number']
 sqlite3_result_text = Module['cwrap'] 'sqlite3_result_text', '', ['number', 'string', 'number', 'number']
+RegisterExtensionFunctions = Module['cwrap'] 'RegisterExtensionFunctions', 'number', ['number']
 
 # Export the API
 this['SQL'] = {'Database':Database}

coffee/extension-functions-exports.coffee

@@ -32,5 +32,6 @@
 "_sqlite3_value_double",
 "_sqlite3_result_double",
 "_sqlite3_result_null",
-"_sqlite3_result_text"
+"_sqlite3_result_text",
+"_RegisterExtensionFunctions"
 ]