Further polish SQLite vendoring

- Now integrated with `make tags` for Emacs IDE features
- Delete some old deprecated broken full-text search engines
- Rename .h → .inc files that don't meet our definition of header
- Make sure every #include line is normal form so tools understand

See #162
This commit is contained in:
Justine Tunney 2021-05-14 10:18:28 -07:00
parent 690be544da
commit 221817e537
152 changed files with 255 additions and 14523 deletions

View file

@ -8,11 +8,13 @@ THIRD_PARTY_SQLITE3 = $(THIRD_PARTY_SQLITE3_A_DEPS) $(THIRD_PARTY_SQLITE3_A) $(T
THIRD_PARTY_SQLITE3_A = o/$(MODE)/third_party/sqlite3/libsqlite3.a
THIRD_PARTY_SQLITE3_A_FILES := $(wildcard third_party/sqlite3/*)
THIRD_PARTY_SQLITE3_A_HDRS = $(filter %.h,$(THIRD_PARTY_SQLITE3_A_FILES))
THIRD_PARTY_SQLITE3_A_SRCS_C = $(filter-out %/geopoly.c,$(filter %.c,$(THIRD_PARTY_SQLITE3_A_FILES)))
THIRD_PARTY_SQLITE3_A_SRCS_C = $(filter %.c,$(THIRD_PARTY_SQLITE3_A_FILES))
THIRD_PARTY_SQLITE3_A_SRCS_T = $(filter %.inc,$(THIRD_PARTY_SQLITE3_A_FILES))
THIRD_PARTY_SQLITE3_BINS = $(THIRD_PARTY_SQLITE3_COMS) $(THIRD_PARTY_SQLITE3_COMS:%=%.dbg)
THIRD_PARTY_SQLITE3_A_SRCS = \
$(THIRD_PARTY_SQLITE3_A_SRCS_C)
$(THIRD_PARTY_SQLITE3_A_SRCS_C) \
$(THIRD_PARTY_SQLITE3_A_SRCS_T)
THIRD_PARTY_SQLITE3_A_OBJS = \
$(THIRD_PARTY_SQLITE3_A_SRCS_C:%.c=o/$(MODE)/%.o)
@ -66,13 +68,23 @@ $(THIRD_PARTY_SQLITE3_A).pkg: \
$(foreach x,$(THIRD_PARTY_SQLITE3_A_DIRECTDEPS),$($(x)_A).pkg)
$(THIRD_PARTY_SQLITE3_A_OBJS): \
OVERRIDE_CFLAGS = \
-DSTACK_FRAME_UNLIMITED \
OVERRIDE_CFLAGS += \
-DNDEBUG \
-DSQLITE_CORE \
-DSQLITE_OS_UNIX=1 \
-DBUILD_sqlite -DNDEBUG \
-DSQLITE_OS_UNIX \
-DBUILD_sqlite \
-DHAVE_READLINE=0 \
-DHAVE_EDITLINE=0 \
-DSQLITE_THREADSAFE=0 \
-DSQLITE_OMIT_LOAD_EXTENSION=1 \
-DSQLITE_HAVE_ZLIB \
-DHAVE_MALLOC_USABLE_SIZE \
-DHAVE_FDATASYNC \
-DHAVE_STRCHRNUL \
-DHAVE_LOCALTIME_R \
-DHAVE_GMTIME_R \
-DHAVE_USLEEP \
-DSQLITE_HAVE_C99_MATH_FUNCS \
-DSQLITE_OMIT_LOAD_EXTENSION \
-DSQLITE_ENABLE_MATH_FUNCTIONS \
-DSQLITE_ENABLE_FTS3 \
-DSQLITE_ENABLE_FTS4 \
@ -82,9 +94,7 @@ $(THIRD_PARTY_SQLITE3_A_OBJS): \
-DSQLITE_ENABLE_RTREE \
-DSQLITE_ENABLE_SESSION \
-DSQLITE_ENABLE_PREUPDATE_HOOK \
-DSQLITE_TEMP_STORE=1 \
-DHAVE_READLINE=0 \
-DHAVE_EDITLINE=0 \
-DSQLITE_TEMP_STORE \
-DSQLITE_ENABLE_JSON1 \
-DSQLITE_ENABLE_RTREE \
-DSQLITE_ENABLE_EXPLAIN_COMMENTS \
@ -96,6 +106,16 @@ $(THIRD_PARTY_SQLITE3_A_OBJS): \
-DSQLITE_ENABLE_OFFSET_SQL_FUNC \
-DSQLITE_ENABLE_DESERIALIZE
o/$(MODE)/third_party/sqlite3/shell.o: \
OVERRIDE_CFLAGS += \
-DSTACK_FRAME_UNLIMITED
THIRD_PARTY_SQLITE3_LIBS = $(foreach x,$(THIRD_PARTY_SQLITE3_ARTIFACTS),$($(x)))
THIRD_PARTY_SQLITE3_SRCS = $(foreach x,$(THIRD_PARTY_SQLITE3_ARTIFACTS),$($(x)_SRCS))
THIRD_PARTY_SQLITE3_CHECKS = $(foreach x,$(THIRD_PARTY_SQLITE3_ARTIFACTS),$($(x)_CHECKS))
THIRD_PARTY_SQLITE3_OBJS = $(foreach x,$(THIRD_PARTY_SQLITE3_ARTIFACTS),$($(x)_OBJS))
$(THIRD_PARTY_SQLITE3_OBJS): third_party/sqlite3/sqlite3.mk
.PHONY: o/$(MODE)/third_party/sqlite3
o/$(MODE)/third_party/sqlite3: \
$(THIRD_PARTY_SQLITE3_BINS) \