From: stephan <stephan@noemail.net>
Date: Sun, 9 Oct 2022 13:35:14 +0000 (+0000)
Subject: Remove ext/wasm/kvvfs.make which was inadvertently resurrected in [92b500da70a3].
X-Git-Tag: version-3.40.0~169^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=392fd3ce37f8c95ebf04425dc679a6fd6f70ef95;p=thirdparty%2Fsqlite.git

Remove ext/wasm/kvvfs.make which was inadvertently resurrected in [92b500da70a3].

FossilOrigin-Name: 2e7fa085fc0b1202c6502d89e2603ae76a93451754b07b32ab4f0211f213f980
---

diff --git a/ext/wasm/kvvfs.make b/ext/wasm/kvvfs.make
deleted file mode 100644
index 83a2691370..0000000000
--- a/ext/wasm/kvvfs.make
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/make
-#^^^^ help emacs select makefile mode
-#
-# This is a sub-make for building a standalone kvvfs-based
-# sqlite3.wasm.  It is intended to be "include"d from the main
-# GNUMakefile.
-#
-# Notable potential TODOs:
-#
-# - Trim down a custom sqlite3-api.js for this build. We can elimate
-#   the jaccwabyt dependency, for example, because this build won't
-#   make use of the VFS bits. Similarly, we can eliminate or replace
-#   parts of the OO1 API, or provide a related API which manages
-#   singletons of the localStorage/sessionStorage instances.
-#
-########################################################################
-MAKEFILE.kvvfs := $(lastword $(MAKEFILE_LIST))
-
-kvvfs.js     := sqlite3-kvvfs.js
-kvvfs.wasm   := sqlite3-kvvfs.wasm
-kvvfs.wasm.c := $(dir.api)/sqlite3-wasm.c
-
-CLEAN_FILES += $(kvvfs.js) $(kvvfs.wasm)
-
-########################################################################
-# emcc flags for .c/.o/.wasm.
-kvvfs.flags =
-#kvvfs.flags += -v # _very_ loud but also informative about what it's doing
-
-########################################################################
-# emcc flags for .c/.o.
-kvvfs.cflags :=
-kvvfs.cflags += -std=c99 -fPIC
-kvvfs.cflags += -I. -I$(dir.top)
-kvvfs.cflags += -DSQLITE_OS_KV=1 $(SQLITE_OPT)
-
-########################################################################
-# emcc flags specific to building the final .js/.wasm file...
-kvvfs.jsflags := -fPIC
-kvvfs.jsflags += --no-entry
-kvvfs.jsflags += -sENVIRONMENT=web
-kvvfs.jsflags += -sMODULARIZE
-kvvfs.jsflags += -sSTRICT_JS
-kvvfs.jsflags += -sDYNAMIC_EXECUTION=0
-kvvfs.jsflags += -sNO_POLYFILL
-kvvfs.jsflags += -sEXPORTED_FUNCTIONS=@$(dir.api)/EXPORTED_FUNCTIONS.sqlite3-api
-kvvfs.jsflags += -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory,allocateUTF8OnStack
-                                            # wasmMemory ==> for -sIMPORTED_MEMORY
-                                            # allocateUTF8OnStack ==> kvvfs internals
-kvvfs.jsflags += -sUSE_CLOSURE_COMPILER=0
-kvvfs.jsflags += -sIMPORTED_MEMORY
-#kvvfs.jsflags += -sINITIAL_MEMORY=13107200
-#kvvfs.jsflags += -sTOTAL_STACK=4194304
-kvvfs.jsflags += -sEXPORT_NAME=sqlite3InitModule
-kvvfs.jsflags += -sGLOBAL_BASE=4096 # HYPOTHETICALLY keep func table indexes from overlapping w/ heap addr.
-kvvfs.jsflags += --post-js=$(post-js.js)
-#kvvfs.jsflags += -sFILESYSTEM=0 # only for experimentation. sqlite3 needs the FS API
-#                                Perhaps the kvvfs build doesn't?
-#kvvfs.jsflags += -sABORTING_MALLOC
-kvvfs.jsflags += -sALLOW_MEMORY_GROWTH
-kvvfs.jsflags += -sALLOW_TABLE_GROWTH
-kvvfs.jsflags += -Wno-limited-postlink-optimizations
-# ^^^^^ it likes to warn when we have "limited optimizations" via the -g3 flag.
-kvvfs.jsflags += -sERROR_ON_UNDEFINED_SYMBOLS=0
-kvvfs.jsflags += -sLLD_REPORT_UNDEFINED
-#kvvfs.jsflags += --import-undefined
-kvvfs.jsflags += -sMEMORY64=0
-ifneq (0,$(enable_bigint))
-kvvfs.jsflags += -sWASM_BIGINT
-endif
-
-$(kvvfs.js): $(MAKEFILE) $(MAKEFILE.kvvfs) $(kvvfs.wasm.c) \
-    EXPORTED_FUNCTIONS.api \
-    $(post-js.js)
-	$(emcc.bin) -o $@ $(emcc_opt) $(emcc.flags) $(kvvfs.cflags) $(kvvfs.jsflags) $(kvvfs.wasm.c)
-	chmod -x $(kvvfs.wasm)
-ifneq (,$(wasm-strip))
-	$(wasm-strip) $(kvvfs.wasm)
-endif
-	@ls -la $@ $(kvvfs.wasm)
-
-kvvfs: $(kvvfs.js)
diff --git a/manifest b/manifest
index b9dae4ebf9..e5a01e2bed 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Refactor\skvvfs\sJS\sbits\sto\smake\suse\sof\s[ea370b9b05f7ed7eaa].\sAt\smain-thread\sstartup,\sif\skvvfs\sis\savailable,\sreplace\sthe\skvvfs\sI/O\smethods\swith\sJS\simpls.\sCheckin\spart\s2\sof\s2,\sto\saccount\sfor\scherrypicking\s[ea370b9b05f7ed7eaa]\sinto\sthe\skv-vfs\sbranch.
-D 2022-10-09T13:26:15.854
+C Remove\sext/wasm/kvvfs.make\swhich\swas\sinadvertently\sresurrected\sin\s[92b500da70a3].
+D 2022-10-09T13:35:14.995
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -513,7 +513,6 @@ F ext/wasm/jaccwabyt/jaccwabyt.js 0d7f32817456a0f3937fcfd934afeb32154ca33580ab26
 F ext/wasm/jaccwabyt/jaccwabyt.md 9aa6951b529a8b29f578ec8f0355713c39584c92cf1708f63ba0cf917cb5b68e
 F ext/wasm/jaccwabyt/jaccwabyt_test.c 39e4b865a33548f943e2eb9dd0dc8d619a80de05d5300668e9960fff30d0d36f
 F ext/wasm/jaccwabyt/jaccwabyt_test.exports 5ff001ef975c426ffe88d7d8a6e96ec725e568d2c2307c416902059339c06f19
-F ext/wasm/kvvfs.make 7cc9cf10e744c3ba523c3eaf5c4af47028f3a5bb76db304ea8044a9b2a9d496f
 F ext/wasm/scratchpad-wasmfs-main.html 20cf6f1a8f368e70d01e8c17200e3eaa90f1c8e1029186d836d14b83845fbe06
 F ext/wasm/scratchpad-wasmfs-main.js 1aa32c1035cf1440a226a28fefcbb5762fbbcb020ccbe5895f8736d701695c63
 F ext/wasm/speedtest1-wasmfs.html bc28eb29b69a73864b8d7aae428448f8b7e1de81d8bfb9bba99541322054dbd0
@@ -2030,8 +2029,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P ea370b9b05f7ed7eaa154ba58019f6642217eabc18517e721567adf948d93980
-R 029b3fdb077b2976ef8970d4e1e5751b
+P a9047e020a097b2259bc9935b63ca1c538a3a7f1d050e15f0d0a08cfb84acc7c
+R 883cefae3468ecd65dfcaec537518f1d
 U stephan
-Z 32c9ba8da7697e38b9e7f056e3e7c363
+Z 3463e4479bd983b8852d635dda178090
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f8b61d4efe..9158166ba2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a9047e020a097b2259bc9935b63ca1c538a3a7f1d050e15f0d0a08cfb84acc7c
\ No newline at end of file
+2e7fa085fc0b1202c6502d89e2603ae76a93451754b07b32ab4f0211f213f980
\ No newline at end of file