@@ -62,10 +62,10 @@ BITCODE_FILES = out/sqlite3.bc out/extension-functions.bc
62
62
63
63
OUTPUT_WRAPPER_FILES = src/shell-pre.js src/shell-post.js
64
64
65
- OUTPUT_API_FILES = out /api.js
65
+ SOURCE_API_FILES = src /api.js
66
66
67
67
EMFLAGS_PRE_JS_FILES = \
68
- --pre-js out /api.js
68
+ --pre-js src /api.js
69
69
70
70
EXPORTED_METHODS_JSON_FILES = src/exported_functions.json src/exported_runtime_methods.json
71
71
@@ -74,13 +74,13 @@ all: optimized debug worker
74
74
.PHONY : debug
75
75
debug : dist/sql-asm-debug.js dist/sql-wasm-debug.js
76
76
77
- dist/sql-asm-debug.js : $(BITCODE_FILES ) $(OUTPUT_WRAPPER_FILES ) $(OUTPUT_API_FILES ) $(EXPORTED_METHODS_JSON_FILES )
77
+ dist/sql-asm-debug.js : $(BITCODE_FILES ) $(OUTPUT_WRAPPER_FILES ) $(SOURCE_API_FILES ) $(EXPORTED_METHODS_JSON_FILES )
78
78
$(EMCC ) $(EMFLAGS ) $(EMFLAGS_DEBUG ) $(EMFLAGS_ASM ) $(BITCODE_FILES ) $(EMFLAGS_PRE_JS_FILES ) -o $@
79
79
mv $@ out/tmp-raw.js
80
80
cat src/shell-pre.js out/tmp-raw.js src/shell-post.js > $@
81
81
rm out/tmp-raw.js
82
82
83
- dist/sql-wasm-debug.js : $(BITCODE_FILES ) $(OUTPUT_WRAPPER_FILES ) $(OUTPUT_API_FILES ) $(EXPORTED_METHODS_JSON_FILES )
83
+ dist/sql-wasm-debug.js : $(BITCODE_FILES ) $(OUTPUT_WRAPPER_FILES ) $(SOURCE_API_FILES ) $(EXPORTED_METHODS_JSON_FILES )
84
84
$(EMCC ) $(EMFLAGS ) $(EMFLAGS_DEBUG ) $(EMFLAGS_WASM ) $(BITCODE_FILES ) $(EMFLAGS_PRE_JS_FILES ) -o $@
85
85
mv $@ out/tmp-raw.js
86
86
cat src/shell-pre.js out/tmp-raw.js src/shell-post.js > $@
@@ -89,19 +89,19 @@ dist/sql-wasm-debug.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) $(OUTPUT_API_FI
89
89
.PHONY : optimized
90
90
optimized : dist/sql-asm.js dist/sql-wasm.js dist/sql-asm-memory-growth.js
91
91
92
- dist/sql-asm.js : $(BITCODE_FILES ) $(OUTPUT_WRAPPER_FILES ) $(OUTPUT_API_FILES ) $(EXPORTED_METHODS_JSON_FILES )
92
+ dist/sql-asm.js : $(BITCODE_FILES ) $(OUTPUT_WRAPPER_FILES ) $(SOURCE_API_FILES ) $(EXPORTED_METHODS_JSON_FILES )
93
93
$(EMCC ) $(EMFLAGS ) $(EMFLAGS_OPTIMIZED ) $(EMFLAGS_ASM ) $(BITCODE_FILES ) $(EMFLAGS_PRE_JS_FILES ) -o $@
94
94
mv $@ out/tmp-raw.js
95
95
cat src/shell-pre.js out/tmp-raw.js src/shell-post.js > $@
96
96
rm out/tmp-raw.js
97
97
98
- dist/sql-wasm.js : $(BITCODE_FILES ) $(OUTPUT_WRAPPER_FILES ) $(OUTPUT_API_FILES ) $(EXPORTED_METHODS_JSON_FILES )
98
+ dist/sql-wasm.js : $(BITCODE_FILES ) $(OUTPUT_WRAPPER_FILES ) $(SOURCE_API_FILES ) $(EXPORTED_METHODS_JSON_FILES )
99
99
$(EMCC ) $(EMFLAGS ) $(EMFLAGS_OPTIMIZED ) $(EMFLAGS_WASM ) $(BITCODE_FILES ) $(EMFLAGS_PRE_JS_FILES ) -o $@
100
100
mv $@ out/tmp-raw.js
101
101
cat src/shell-pre.js out/tmp-raw.js src/shell-post.js > $@
102
102
rm out/tmp-raw.js
103
103
104
- dist/sql-asm-memory-growth.js : $(BITCODE_FILES ) $(OUTPUT_WRAPPER_FILES ) $(OUTPUT_API_FILES ) $(EXPORTED_METHODS_JSON_FILES )
104
+ dist/sql-asm-memory-growth.js : $(BITCODE_FILES ) $(OUTPUT_WRAPPER_FILES ) $(SOURCE_API_FILES ) $(EXPORTED_METHODS_JSON_FILES )
105
105
$(EMCC ) $(EMFLAGS ) $(EMFLAGS_OPTIMIZED ) $(EMFLAGS_ASM_MEMORY_GROWTH ) $(BITCODE_FILES ) $(EMFLAGS_PRE_JS_FILES ) -o $@
106
106
mv $@ out/tmp-raw.js
107
107
cat src/shell-pre.js out/tmp-raw.js src/shell-post.js > $@
@@ -111,64 +111,50 @@ dist/sql-asm-memory-growth.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) $(OUTPUT
111
111
.PHONY : worker
112
112
worker : dist/worker.sql-asm.js dist/worker.sql-asm-debug.js dist/worker.sql-wasm.js dist/worker.sql-wasm-debug.js
113
113
114
- out/worker.js : src/worker.coffee
115
- cat $^ | npx coffee --bare --compile --stdio > $@
116
-
117
- dist/worker.sql-asm.js : dist/sql-asm.js out/worker.js
114
+ dist/worker.sql-asm.js : dist/sql-asm.js src/worker.js
118
115
cat $^ > $@
119
116
120
- dist/worker.sql-asm-debug.js : dist/sql-asm-debug.js out /worker.js
117
+ dist/worker.sql-asm-debug.js : dist/sql-asm-debug.js src /worker.js
121
118
cat $^ > $@
122
119
123
- dist/worker.sql-wasm.js : dist/sql-wasm.js out /worker.js
120
+ dist/worker.sql-wasm.js : dist/sql-wasm.js src /worker.js
124
121
cat $^ > $@
125
122
126
- dist/worker.sql-wasm-debug.js : dist/sql-wasm-debug.js out /worker.js
123
+ dist/worker.sql-wasm-debug.js : dist/sql-wasm-debug.js src /worker.js
127
124
cat $^ > $@
128
125
129
126
# Building it this way gets us a wrapper that _knows_ it's in worker mode, which is nice.
130
127
# 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
131
128
# even though we would have already generated it with our sql-wasm.js target above.
132
129
# This would be made easier if this is implemented: https://github.com/emscripten-core/emscripten/issues/8506
133
- # dist/worker.sql-wasm.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) out /api.js out /worker.js $(EXPORTED_METHODS_JSON_FILES) dist/sql-wasm-debug.wasm
134
- # $(EMCC) $(EMFLAGS) $(EMFLAGS_OPTIMIZED) -s ENVIRONMENT=worker -s $(EMFLAGS_WASM) $(BITCODE_FILES) --pre-js out /api.js -o out/sql-wasm.js
130
+ # dist/worker.sql-wasm.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) src /api.js src /worker.js $(EXPORTED_METHODS_JSON_FILES) dist/sql-wasm-debug.wasm
131
+ # $(EMCC) $(EMFLAGS) $(EMFLAGS_OPTIMIZED) -s ENVIRONMENT=worker -s $(EMFLAGS_WASM) $(BITCODE_FILES) --pre-js src /api.js -o out/sql-wasm.js
135
132
# mv out/sql-wasm.js out/tmp-raw.js
136
- # cat src/shell-pre.js out/tmp-raw.js src/shell-post.js out /worker.js > $@
133
+ # cat src/shell-pre.js out/tmp-raw.js src/shell-post.js src /worker.js > $@
137
134
# #mv out/sql-wasm.wasm dist/sql-wasm.wasm
138
135
# rm out/tmp-raw.js
139
136
140
- # dist/worker.sql-wasm-debug.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) out /api.js out /worker.js $(EXPORTED_METHODS_JSON_FILES) dist/sql-wasm-debug.wasm
141
- # $(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
137
+ # dist/worker.sql-wasm-debug.js: $(BITCODE_FILES) $(OUTPUT_WRAPPER_FILES) src /api.js src /worker.js $(EXPORTED_METHODS_JSON_FILES) dist/sql-wasm-debug.wasm
138
+ # $(EMCC) -s ENVIRONMENT=worker $(EMFLAGS) $(EMFLAGS_DEBUG) -s ENVIRONMENT=worker -s WASM_BINARY_FILE=sql-wasm-foo.debug $(EMFLAGS_WASM) $(BITCODE_FILES) --pre-js src /api.js -o out/sql-wasm-debug.js
142
139
# mv out/sql-wasm-debug.js out/tmp-raw.js
143
- # cat src/shell-pre.js out/tmp-raw.js src/shell-post.js out /worker.js > $@
140
+ # cat src/shell-pre.js out/tmp-raw.js src/shell-post.js src /worker.js > $@
144
141
# #mv out/sql-wasm-debug.wasm dist/sql-wasm-debug.wasm
145
142
# rm out/tmp-raw.js
146
143
147
- out/api.js : src/output-pre.js src/api.coffee src/exports.coffee src/api-data.coffee src/output-post.js
148
- mkdir -p out
149
- cat src/api.coffee src/exports.coffee src/api-data.coffee | npx coffee --bare --compile --stdio > $@
150
- cat src/output-pre.js $@ src/output-post.js > out/api-wrapped.js
151
- mv out/api-wrapped.js $@
152
-
153
144
out/sqlite3.bc : sqlite-src/$(SQLITE_AMALGAMATION )
154
145
mkdir -p out
155
146
# Generate llvm bitcode
156
- $(EMCC ) $(CFLAGS ) sqlite-src/$(SQLITE_AMALGAMATION ) /sqlite3.c -o $@
147
+ $(EMCC ) $(CFLAGS ) -c sqlite-src/$(SQLITE_AMALGAMATION ) /sqlite3.c -o $@
157
148
158
149
out/extension-functions.bc : sqlite-src/$(SQLITE_AMALGAMATION ) /$(EXTENSION_FUNCTIONS )
159
150
mkdir -p out
160
- $(EMCC ) $(CFLAGS ) -s LINKABLE=1 sqlite-src/$(SQLITE_AMALGAMATION ) /extension-functions.c -o $@
151
+ $(EMCC ) $(CFLAGS ) -s LINKABLE=1 -c sqlite-src/$(SQLITE_AMALGAMATION ) /extension-functions.c -o $@
161
152
162
153
# TODO: This target appears to be unused. If we re-instatate it, we'll need to add more files inside of the JS folder
163
154
# module.tar.gz: test package.json AUTHORS README.md dist/sql-asm.js
164
155
# tar --create --gzip $^ > $@
165
156
166
157
# # cache
167
-
168
- .PHONY : clean-cache
169
- clean-cache :
170
- rm -rf cache
171
-
172
158
cache/$(SQLITE_AMALGAMATION ) .zip :
173
159
mkdir -p cache
174
160
curl -LsSf ' $(SQLITE_AMALGAMATION_ZIP_URL)' -o $@
@@ -178,11 +164,6 @@ cache/$(EXTENSION_FUNCTIONS):
178
164
curl -LsSf ' $(EXTENSION_FUNCTIONS_URL)' -o $@
179
165
180
166
# # sqlite-src
181
-
182
- .PHONY : clean-sqlite-src
183
- clean-sqlite-src :
184
- rm -rf sqlite
185
-
186
167
.PHONY : sqlite-src
187
168
sqlite-src : sqlite-src/$(SQLITE_AMALGAMATION ) sqlite-src/$(EXTENSION_FUNCTIONS )
188
169
@@ -203,10 +184,6 @@ sqlite-src/$(SQLITE_AMALGAMATION)/$(EXTENSION_FUNCTIONS): cache/$(EXTENSION_FUNC
203
184
204
185
.PHONY : clean
205
186
clean :
206
- rm -rf out/* dist/*
207
-
208
- .PHONY : clean-all
209
- clean-all :
210
187
rm -f out/* dist/* cache/*
211
- rm -rf sqlite-src/
188
+ rm -rf sqlite-src/ c/
212
189
0 commit comments