aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.arm-wince-mingw32ce-gcc138
-rw-r--r--Makefile.in5
-rw-r--r--Makefile.linux-gcc5
-rw-r--r--Makefile.msc2
-rw-r--r--Makefile.vxworks673
-rwxr-xr-xconfigure72
-rw-r--r--configure.ac1
-rw-r--r--main.mk5
-rw-r--r--manifest26
-rw-r--r--manifest.uuid2
-rw-r--r--tool/tostr.awk9
-rw-r--r--tool/tostr.tcl12
12 files changed, 42 insertions, 908 deletions
diff --git a/Makefile.arm-wince-mingw32ce-gcc b/Makefile.arm-wince-mingw32ce-gcc
deleted file mode 100644
index 323b7ea48..000000000
--- a/Makefile.arm-wince-mingw32ce-gcc
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/usr/make
-#
-# Makefile for SQLITE
-#
-# This is a template makefile for SQLite. Most people prefer to
-# use the autoconf generated "configure" script to generate the
-# makefile automatically. But that does not work for everybody
-# and in every situation. If you are having problems with the
-# "configure" script, you might want to try this makefile as an
-# alternative. Create a copy of this file, edit the parameters
-# below and type "make".
-#
-
-#### The directory where to find the mingw32ce tools
-MINGW32CE = /opt/mingw32ce/bin
-
-#### The target prefix of the mingw32ce tools
-TARGET = arm-wince-mingw32ce
-
-#### The toplevel directory of the source tree. This is the directory
-# that contains this "Makefile.in" and the "configure.in" script.
-#
-TOP = ../sqlite
-
-#### C Compiler and options for use in building executables that
-# will run on the platform that is doing the build.
-#
-BCC = gcc -g -O2
-#BCC = /opt/ancic/bin/c89 -0
-
-#### If the target operating system supports the "usleep()" system
-# call, then define the HAVE_USLEEP macro for all C modules.
-#
-USLEEP =
-#USLEEP = -DHAVE_USLEEP=1
-
-#### If you want the SQLite library to be safe for use within a
-# multi-threaded program, then define the following macro
-# appropriately:
-#
-THREADSAFE = -DTHREADSAFE=1
-#THREADSAFE = -DTHREADSAFE=0
-
-#### Specify any extra linker options needed to make the library
-# thread safe
-#
-#THREADLIB = -lpthread
-THREADLIB =
-
-#### Specify any extra libraries needed to access required functions.
-#
-#TLIBS = -lrt # fdatasync on Solaris 8
-TLIBS =
-
-#### Leave SQLITE_DEBUG undefined for maximum speed. Use SQLITE_DEBUG=1
-# to check for memory leaks. Use SQLITE_DEBUG=2 to print a log of all
-# malloc()s and free()s in order to track down memory leaks.
-#
-# SQLite uses some expensive assert() statements in the inner loop.
-# You can make the library go almost twice as fast if you compile
-# with -DNDEBUG=1
-#
-#OPTS = -DSQLITE_DEBUG=2
-#OPTS = -DSQLITE_DEBUG=1
-#OPTS =
-OPTS = -DNDEBUG=1 -DSQLITE_OS_WIN=1 -D_WIN32_WCE=1
-#OPTS += -DHAVE_FDATASYNC=1
-
-#### The suffix to add to executable files. ".exe" for windows.
-# Nothing for unix.
-#
-EXE = .exe
-#EXE =
-
-#### C Compile and options for use in building executables that
-# will run on the target platform. This is usually the same
-# as BCC, unless you are cross-compiling.
-#
-#TCC = gcc -O6
-#TCC = gcc -g -O0 -Wall
-#TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
-#TCC = /opt/mingw/bin/i386-mingw32-gcc -O6
-TCC = $(MINGW32CE)/$(TARGET)-gcc -O2
-#TCC = /opt/ansic/bin/c89 -O +z -Wl,-a,archive
-
-#### Tools used to build a static library.
-#
-#AR = ar cr
-#AR = /opt/mingw/bin/i386-mingw32-ar cr
-AR = $(MINGW32CE)/$(TARGET)-ar cr
-#RANLIB = ranlib
-#RANLIB = /opt/mingw/bin/i386-mingw32-ranlib
-RANLIB = $(MINGW32CE)/$(TARGET)-ranlib
-
-#MKSHLIB = gcc -shared
-#SO = so
-#SHPREFIX = lib
-MKSHLIB = $(MINGW32CE)/$(TARGET)-gcc -shared
-SO = dll
-SHPREFIX =
-
-#### Extra compiler options needed for programs that use the TCL library.
-#
-#TCL_FLAGS =
-#TCL_FLAGS = -DSTATIC_BUILD=1
-TCL_FLAGS = -I/home/drh/tcltk/8.5linux
-#TCL_FLAGS = -I/home/drh/tcltk/8.5win -DSTATIC_BUILD=1
-#TCL_FLAGS = -I/home/drh/tcltk/8.3hpux
-
-#### Linker options needed to link against the TCL library.
-#
-#LIBTCL = -ltcl -lm -ldl
-LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl
-#LIBTCL = /home/drh/tcltk/8.5win/libtcl85s.a -lmsvcrt
-#LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc
-
-#### Additional objects for SQLite library when TCL support is enabled.
-TCLOBJ =
-#TCLOBJ = tclsqlite.o
-
-#### Compiler options needed for programs that use the readline() library.
-#
-READLINE_FLAGS =
-#READLINE_FLAGS = -DHAVE_READLINE=1 -I/usr/include/readline
-
-#### Linker options needed by programs using readline() must link against.
-#
-LIBREADLINE =
-#LIBREADLINE = -static -lreadline -ltermcap
-
-#### Which "awk" program provides nawk compatibilty
-#
-# NAWK = nawk
-NAWK = awk
-
-# You should not have to change anything below this line
-###############################################################################
-include $(TOP)/main.mk
diff --git a/Makefile.in b/Makefile.in
index eae80ece5..9d50a7f26 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -155,9 +155,6 @@ LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(TCC) $(LTCOMPILE_EXTRAS)
LTLINK = $(LIBTOOL) --mode=link $(TCC) $(LTCOMPILE_EXTRAS) @LDFLAGS@ $(LTLINK_EXTRAS)
LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
-# nawk compatible awk.
-NAWK = @AWK@
-
# You should not have to change anything below this line
###############################################################################
@@ -1096,7 +1093,7 @@ sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
cat sqlite3.c $(TOP)/src/tclsqlite.c >> $@
echo "static const char *tclsh_main_loop(void){" >> $@
echo "static const char *zMainloop = " >> $@
- $(NAWK) -f $(TOP)/tool/tostr.awk $(TOP)/tool/spaceanal.tcl >> $@
+ $(TCLSH_CMD) $(TOP)/tool/tostr.tcl $(TOP)/tool/spaceanal.tcl >> $@
echo "; return zMainloop; }" >> $@
sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
diff --git a/Makefile.linux-gcc b/Makefile.linux-gcc
index 1c9f24f4b..1491a4b02 100644
--- a/Makefile.linux-gcc
+++ b/Makefile.linux-gcc
@@ -118,11 +118,6 @@ READLINE_FLAGS =
LIBREADLINE =
#LIBREADLINE = -static -lreadline -ltermcap
-#### Which "awk" program provides nawk compatibilty
-#
-# NAWK = nawk
-NAWK = awk
-
# You should not have to change anything below this line
###############################################################################
include $(TOP)/main.mk
diff --git a/Makefile.msc b/Makefile.msc
index 785c65cb7..71b5fc8cc 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1774,7 +1774,7 @@ sqlite3_analyzer.c: $(SQLITE3C) $(TOP)\src\tclsqlite.c $(TOP)\tool\spaceanal.tcl
copy $@ + $(SQLITE3C) + $(TOP)\src\tclsqlite.c $@
echo static const char *tclsh_main_loop(void){ >> $@
echo static const char *zMainloop = >> $@
- $(NAWK) -f $(TOP)\tool\tostr.awk $(TOP)\tool\spaceanal.tcl >> $@
+ $(TCLSH_CMD) $(TOP)\tool\tostr.tcl $(TOP)\tool\spaceanal.tcl >> $@
echo ; return zMainloop; } >> $@
sqlite3_analyzer.exe: sqlite3_analyzer.c $(LIBRESOBJS)
diff --git a/Makefile.vxworks b/Makefile.vxworks
deleted file mode 100644
index 706261fc0..000000000
--- a/Makefile.vxworks
+++ /dev/null
@@ -1,673 +0,0 @@
-#!/usr/make
-#
-# Makefile for SQLITE on VxWorks
-
-ifeq ($(FORCPU),)
- FORCPU = SH32gnule
-endif
-
-TOOL_FAMILY = gnu
-
-include $(WIND_USR)/tool/gnu/make.$(FORCPU)
-
-#### The toplevel directory of the source tree. This is the directory
-# that contains this "Makefile.in" and the "configure.in" script.
-#
-TOP = .
-
-#### C Compiler and options for use in building executables that
-# will run on the platform that is doing the build.
-#
-BCC = gcc -g -O2
-#BCC = /opt/ancic/bin/c89 -0
-
-#### If the target operating system supports the "usleep()" system
-# call, then define the HAVE_USLEEP macro for all C modules.
-#
-USLEEP =
-#USLEEP = -DHAVE_USLEEP=1
-
-#### If you want the SQLite library to be safe for use within a
-# multi-threaded program, then define the following macro
-# appropriately:
-#
-THREADSAFE = -DSQLITE_THREADSAFE=1
-#THREADSAFE = -DSQLITE_THREADSAFE=0
-
-#### Specify any extra linker options needed to make the library
-# thread safe
-#
-#THREADLIB = -lpthread
-THREADLIB =
-
-#### Specify any extra libraries needed to access required functions.
-#
-ifeq ($(CPU),SH32)
- # for SH4 shared library
- TLIBS_SHARED += -L$(WIND_USR)/lib/sh/SH32/commonle/PIC
-else
- # for all other CPUs shared library
- TLIBS_SHARED += $(LD_LINK_PATH_ATEND) $(LD_PARTIAL_LAST_FLAGS)
-endif
-# for static library
-TLIBS += $(LD_LINK_PATH_ATEND) $(LD_PARTIAL_LAST_FLAGS)
-
-#### Leave SQLITE_DEBUG undefined for maximum speed. Use SQLITE_DEBUG=1
-# to check for memory leaks. Use SQLITE_DEBUG=2 to print a log of all
-# malloc()s and free()s in order to track down memory leaks.
-#
-# SQLite uses some expensive assert() statements in the inner loop.
-# You can make the library go almost twice as fast if you compile
-# with -DNDEBUG=1
-#
-#OPTS = -DSQLITE_DEBUG=2
-#OPTS = -DSQLITE_DEBUG=1
-#OPTS =
-OPTS = -DNDEBUG=1 -DSQLITE_OS_UNIX=1 $(THREADSAFE)
-OPTS += -DSQLITE_OMIT_LOAD_EXTENSION=1
-OPTS += -DSQLITE_ENABLE_LOCKING_STYLE=1
-OPTS += -DSQLITE_THREAD_OVERRIDE_LOCK=0
-OPTS += -DSQLITE_ENABLE_COLUMN_METADATA=1
-OPTS += -DHAVE_FDATASYNC=1
-
-#### The suffix to add to executable files. ".exe" for windows.
-# Nothing for unix.
-#
-EXE = .vxe
-#EXE =
-
-#### C Compile and options for use in building executables that
-# will run on the target platform. This is usually the same
-# as BCC, unless you are cross-compiling.
-#
-#TCC = gcc -O6
-#TCC = gcc -g -O0 -Wall
-#TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
-#TCC = /opt/mingw/bin/i386-mingw32-gcc -O6
-TCC = $(CC) $(DEFINE_CC) -O2 -g -mrtp $(CC_ARCH_SPEC) -D_REENTRANT=1 -D_VX_CPU=_VX_$(CPU) -D_VX_TOOL_FAMILY=$(TOOL_FAMILY) -D_VX_TOOL=$(TOOL)
-TCC += -I$(WIND_USR)/h -I$(WIND_USR)/h/wrn/coreip
-#TCC = /opt/ansic/bin/c89 -O +z -Wl,-a,archive
-
-#TCC_SHARED = $(TCC) -fPIC
-TCC_SHARED = $(TCC)
-
-#### Tools used to build a static library.
-#
-#ARX = ar cr
-#ARX = /opt/mingw/bin/i386-mingw32-ar cr
-AR += cr
-#RANLIB = ranlib
-#RANLIB = /opt/mingw/bin/i386-mingw32-ranlib
-
-#MKSHLIB = gcc -shared
-#SO = so
-#SHPREFIX = lib
-MKSHLIB = $(CC) $(DEFINE_CC) -mrtp -shared $(CC_ARCH_SPEC) -D_VX_CPU=_VX_$(CPU) -D_VX_TOOL_FAMILY=$(TOOL_FAMILY) -D_VX_TOOL=$(TOOL)
-SO = so
-SHPREFIX = lib
-
-#### Extra compiler options needed for programs that use the TCL library.
-#
-#TCL_FLAGS =
-#TCL_FLAGS = -DSTATIC_BUILD=1
-TCL_FLAGS = -I/home/drh/tcltk/8.5linux
-#TCL_FLAGS = -I/home/drh/tcltk/8.5win -DSTATIC_BUILD=1
-#TCL_FLAGS = -I/home/drh/tcltk/8.3hpux
-
-#### Linker options needed to link against the TCL library.
-#
-#LIBTCL = -ltcl -lm -ldl
-LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl
-#LIBTCL = /home/drh/tcltk/8.5win/libtcl85s.a -lmsvcrt
-#LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc
-
-#### Additional objects for SQLite library when TCL support is enabled.
-TCLOBJ =
-#TCLOBJ = tclsqlite.o
-
-#### Compiler options needed for programs that use the readline() library.
-#
-READLINE_FLAGS =
-#READLINE_FLAGS = -DHAVE_READLINE=1 -I/usr/include/readline
-
-#### Linker options needed by programs using readline() must link against.
-#
-LIBREADLINE =
-#LIBREADLINE = -static -lreadline -ltermcap
-
-#### Which "awk" program provides nawk compatibilty
-#
-# NAWK = nawk
-NAWK = awk
-
-
-#### Pasted and adapted main.mk file
-###############################################################################
-# The following macros should be defined before this script is
-# invoked:
-#
-# TOP The toplevel directory of the source tree. This is the
-# directory that contains this "Makefile.in" and the
-# "configure.in" script.
-#
-# BCC C Compiler and options for use in building executables that
-# will run on the platform that is doing the build.
-#
-# THREADLIB Specify any extra linker options needed to make the library
-# thread safe
-#
-# OPTS Extra compiler command-line options.
-#
-# EXE The suffix to add to executable files. ".exe" for windows
-# and "" for Unix.
-#
-# TCC C Compiler and options for use in building executables that
-# will run on the target platform. This is usually the same
-# as BCC, unless you are cross-compiling.
-#
-# AR Tools used to build a static library.
-# RANLIB
-#
-# TCL_FLAGS Extra compiler options needed for programs that use the
-# TCL library.
-#
-# LIBTCL Linker options needed to link against the TCL library.
-#
-# READLINE_FLAGS Compiler options needed for programs that use the
-# readline() library.
-#
-# LIBREADLINE Linker options needed by programs using readline() must
-# link against.
-#
-# NAWK Nawk compatible awk program. Older (obsolete?) solaris
-# systems need this to avoid using the original AT&T AWK.
-#
-# Once the macros above are defined, the rest of this make script will
-# build the SQLite library and testing tools.
-################################################################################
-
-# This is how we compile
-#
-TCCX = $(TCC) $(OPTS) -I. -I$(TOP)/src -I$(TOP)
-TCCX_SHARED = $(TCC_SHARED) $(OPTS) -I. -I$(TOP)/src -I$(TOP) \
- -I$(TOP)/ext/rtree -I$(TOP)/ext/icu -I$(TOP)/ext/fts3 \
- -I$(TOP)/ext/async
-
-# Object files for the SQLite library.
-#
-LIBOBJ+= alter.o analyze.o attach.o auth.o \
- backup.o bitvec.o btmutex.o btree.o build.o \
- callback.o complete.o date.o delete.o expr.o fault.o \
- fts3.o fts3_expr.o fts3_hash.o fts3_icu.o fts3_porter.o \
- fts3_tokenizer.o fts3_tokenizer1.o \
- func.o global.o hash.o \
- icu.o insert.o journal.o legacy.o loadext.o \
- main.o malloc.o mem0.o mem1.o mem2.o mem3.o mem5.o \
- memjournal.o \
- mutex.o mutex_noop.o mutex_unix.o mutex_w32.o \
- notify.o opcodes.o os.o os_unix.o os_win.o \
- pager.o parse.o pcache.o pcache1.o pragma.o prepare.o printf.o \
- random.o resolve.o rowset.o rtree.o select.o status.o \
- table.o tokenize.o trigger.o \
- update.o util.o vacuum.o \
- vdbe.o vdbeapi.o vdbeaux.o vdbeblob.o vdbemem.o \
- walker.o where.o utf.o vtab.o
-
-
-
-# All of the source code files.
-#
-SRC = \
- $(TOP)/src/alter.c \
- $(TOP)/src/analyze.c \
- $(TOP)/src/attach.c \
- $(TOP)/src/auth.c \
- $(TOP)/src/backup.c \
- $(TOP)/src/bitvec.c \
- $(TOP)/src/btmutex.c \
- $(TOP)/src/btree.c \
- $(TOP)/src/btree.h \
- $(TOP)/src/btreeInt.h \
- $(TOP)/src/build.c \
- $(TOP)/src/callback.c \
- $(TOP)/src/complete.c \
- $(TOP)/src/ctime.c \
- $(TOP)/src/date.c \
- $(TOP)/src/delete.c \
- $(TOP)/src/expr.c \
- $(TOP)/src/fault.c \
- $(TOP)/src/func.c \
- $(TOP)/src/global.c \
- $(TOP)/src/hash.c \
- $(TOP)/src/hash.h \
- $(TOP)/src/hwtime.h \
- $(TOP)/src/insert.c \
- $(TOP)/src/journal.c \
- $(TOP)/src/legacy.c \
- $(TOP)/src/loadext.c \
- $(TOP)/src/main.c \
- $(TOP)/src/malloc.c \
- $(TOP)/src/mem0.c \
- $(TOP)/src/mem1.c \
- $(TOP)/src/mem2.c \
- $(TOP)/src/mem3.c \
- $(TOP)/src/mem5.c \
- $(TOP)/src/memjournal.c \
- $(TOP)/src/msvc.h \
- $(TOP)/src/mutex.c \
- $(TOP)/src/mutex.h \
- $(TOP)/src/mutex_noop.c \
- $(TOP)/src/mutex_unix.c \
- $(TOP)/src/mutex_w32.c \
- $(TOP)/src/notify.c \
- $(TOP)/src/os.c \
- $(TOP)/src/os.h \
- $(TOP)/src/os_common.h \
- $(TOP)/src/os_setup.h \
- $(TOP)/src/os_unix.c \
- $(TOP)/src/os_win.c \
- $(TOP)/src/os_win.h \
- $(TOP)/src/pager.c \
- $(TOP)/src/pager.h \
- $(TOP)/src/parse.y \
- $(TOP)/src/pcache.c \
- $(TOP)/src/pcache.h \
- $(TOP)/src/pcache1.c \
- $(TOP)/src/pragma.c \
- $(TOP)/src/prepare.c \
- $(TOP)/src/printf.c \
- $(TOP)/src/random.c \
- $(TOP)/src/resolve.c \
- $(TOP)/src/rowset.c \
- $(TOP)/src/select.c \
- $(TOP)/src/status.c \
- $(TOP)/src/shell.c \
- $(TOP)/src/sqlite.h.in \
- $(TOP)/src/sqlite3ext.h \
- $(TOP)/src/sqliteInt.h \
- $(TOP)/src/sqliteLimit.h \
- $(TOP)/src/table.c \
- $(TOP)/src/tclsqlite.c \
- $(TOP)/src/tokenize.c \
- $(TOP)/src/trigger.c \
- $(TOP)/src/utf.c \
- $(TOP)/src/update.c \
- $(TOP)/src/util.c \
- $(TOP)/src/vacuum.c \
- $(TOP)/src/vdbe.c \
- $(TOP)/src/vdbe.h \
- $(TOP)/src/vdbeapi.c \
- $(TOP)/src/vdbeaux.c \
- $(TOP)/src/vdbeblob.c \
- $(TOP)/src/vdbemem.c \
- $(TOP)/src/vdbeInt.h \
- $(TOP)/src/vtab.c \
- $(TOP)/src/walker.c \
- $(TOP)/src/where.c
-
-# Source code for extensions
-#
-SRC += \
- $(TOP)/ext/fts1/fts1.c \
- $(TOP)/ext/fts1/fts1.h \
- $(TOP)/ext/fts1/fts1_hash.c \
- $(TOP)/ext/fts1/fts1_hash.h \
- $(TOP)/ext/fts1/fts1_porter.c \
- $(TOP)/ext/fts1/fts1_tokenizer.h \
- $(TOP)/ext/fts1/fts1_tokenizer1.c
-SRC += \
- $(TOP)/ext/fts2/fts2.c \
- $(TOP)/ext/fts2/fts2.h \
- $(TOP)/ext/fts2/fts2_hash.c \
- $(TOP)/ext/fts2/fts2_hash.h \
- $(TOP)/ext/fts2/fts2_icu.c \
- $(TOP)/ext/fts2/fts2_porter.c \
- $(TOP)/ext/fts2/fts2_tokenizer.h \
- $(TOP)/ext/fts2/fts2_tokenizer.c \
- $(TOP)/ext/fts2/fts2_tokenizer1.c
-SRC += \
- $(TOP)/ext/fts3/fts3.c \
- $(TOP)/ext/fts3/fts3.h \
- $(TOP)/ext/fts3/fts3_expr.c \
- $(TOP)/ext/fts3/fts3_expr.h \
- $(TOP)/ext/fts3/fts3_hash.c \
- $(TOP)/ext/fts3/fts3_hash.h \
- $(TOP)/ext/fts3/fts3_icu.c \
- $(TOP)/ext/fts3/fts3_porter.c \
- $(TOP)/ext/fts3/fts3_tokenizer.h \
- $(TOP)/ext/fts3/fts3_tokenizer.c \
- $(TOP)/ext/fts3/fts3_tokenizer1.c
-SRC += \
- $(TOP)/ext/icu/sqliteicu.h \
- $(TOP)/ext/icu/icu.c
-SRC += \
- $(TOP)/ext/rtree/rtree.h \
- $(TOP)/ext/rtree/rtree.c
-
-
-# Generated source code files
-#
-SRC += \
- keywordhash.h \
- opcodes.c \
- opcodes.h \
- parse.c \
- parse.h \
- sqlite3.h
-
-
-# Source code to the test files.
-#
-TESTSRC = \
- $(TOP)/src/test1.c \
- $(TOP)/src/test2.c \
- $(TOP)/src/test3.c \
- $(TOP)/src/test4.c \
- $(TOP)/src/test5.c \
- $(TOP)/src/test6.c \
- $(TOP)/src/test7.c \
- $(TOP)/src/test8.c \
- $(TOP)/src/test9.c \
- $(TOP)/src/test_autoext.c \
- $(TOP)/src/test_async.c \
- $(TOP)/src/test_backup.c \
- $(TOP)/src/test_btree.c \
- $(TOP)/src/test_config.c \
- $(TOP)/src/test_devsym.c \
- $(TOP)/src/test_func.c \
- $(TOP)/src/test_hexio.c \
- $(TOP)/src/test_journal.c \
- $(TOP)/src/test_malloc.c \
- $(TOP)/src/test_md5.c \
- $(TOP)/src/test_mutex.c \
- $(TOP)/src/test_onefile.c \
- $(TOP)/src/test_osinst.c \
- $(TOP)/src/test_pcache.c \
- $(TOP)/src/test_schema.c \
- $(TOP)/src/test_server.c \
- $(TOP)/src/test_tclvar.c \
- $(TOP)/src/test_thread.c \
- $(TOP)/src/test_vfs.c \
- $(TOP)/src/test_wsd.c \
-
-#TESTSRC += $(TOP)/ext/fts2/fts2_tokenizer.c
-#TESTSRC += $(TOP)/ext/fts3/fts3_tokenizer.c
-
-TESTSRC2 = \
- $(TOP)/src/attach.c $(TOP)/src/backup.c $(TOP)/src/btree.c \
- $(TOP)/src/build.c $(TOP)/src/ctime.c $(TOP)/src/date.c \
- $(TOP)/src/expr.c $(TOP)/src/func.c $(TOP)/src/insert.c $(TOP)/src/os.c \
- $(TOP)/src/os_unix.c $(TOP)/src/os_win.c \
- $(TOP)/src/pager.c $(TOP)/src/pragma.c $(TOP)/src/prepare.c \
- $(TOP)/src/printf.c $(TOP)/src/random.c $(TOP)/src/pcache.c \
- $(TOP)/src/pcache1.c $(TOP)/src/select.c $(TOP)/src/tokenize.c \
- $(TOP)/src/utf.c $(TOP)/src/util.c $(TOP)/src/vdbeapi.c $(TOP)/src/vdbeaux.c \
- $(TOP)/src/vdbe.c $(TOP)/src/vdbemem.c $(TOP)/src/where.c parse.c \
- $(TOP)/ext/fts3/fts3.c $(TOP)/ext/fts3/fts3_expr.c \
- $(TOP)/ext/fts3/fts3_tokenizer.c \
- $(TOP)/ext/async/sqlite3async.c
-
-# Header files used by all library source files.
-#
-HDR = \
- $(TOP)/src/btree.h \
- $(TOP)/src/btreeInt.h \
- $(TOP)/src/hash.h \
- $(TOP)/src/hwtime.h \
- keywordhash.h \
- $(TOP)/src/msvc.h \
- $(TOP)/src/mutex.h \
- opcodes.h \
- $(TOP)/src/os.h \
- $(TOP)/src/os_common.h \
- $(TOP)/src/os_setup.h \
- $(TOP)/src/os_win.h \
- $(TOP)/src/pager.h \
- $(TOP)/src/pcache.h \
- parse.h \
- sqlite3.h \
- $(TOP)/src/sqlite3ext.h \
- $(TOP)/src/sqliteInt.h \
- $(TOP)/src/sqliteLimit.h \
- $(TOP)/src/vdbe.h \
- $(TOP)/src/vdbeInt.h
-
-# Header files used by extensions
-#
-EXTHDR += \
- $(TOP)/ext/fts1/fts1.h \
- $(TOP)/ext/fts1/fts1_hash.h \
- $(TOP)/ext/fts1/fts1_tokenizer.h
-EXTHDR += \
- $(TOP)/ext/fts2/fts2.h \
- $(TOP)/ext/fts2/fts2_hash.h \
- $(TOP)/ext/fts2/fts2_tokenizer.h
-EXTHDR += \
- $(TOP)/ext/fts3/fts3.h \
- $(TOP)/ext/fts3/fts3_expr.h \
- $(TOP)/ext/fts3/fts3_hash.h \
- $(TOP)/ext/fts3/fts3_tokenizer.h
-EXTHDR += \
- $(TOP)/ext/rtree/rtree.h
-EXTHDR += \
- $(TOP)/ext/icu/sqliteicu.h
-
-# This is the default Makefile target. The objects listed here
-# are what get build when you type just "make" with no arguments.
-#
-all: sqlite3.h libsqlite3.a sqlite3$(EXE)
-
-libsqlite3.a: $(LIBOBJ)
- $(AR) libsqlite3.a $(LIBOBJ)
- $(RANLIB) libsqlite3.a
-
-$(SHPREFIX)sqlite3.$(SO): $(LIBOBJ)
- $(MKSHLIB) -o $(SHPREFIX)sqlite3.$(SO) $(LIBOBJ) $(TLIBS_SHARED)
-
-sqlite3$(EXE): $(TOP)/src/shell.c libsqlite3.a sqlite3.h
- $(TCCX) $(READLINE_FLAGS) -o sqlite3$(EXE) \
- $(TOP)/src/shell.c \
- $(LIBREADLINE) $(TLIBS) $(THREADLIB) -L. -lsqlite3
-
-# This target creates a directory named "tsrc" and fills it with
-# copies of all of the C source code and header files needed to
-# build on the target system. Some of the C source code and header
-# files are automatically generated. This target takes care of
-# all that automatic generation.
-#
-target_source: $(SRC)
- rm -rf tsrc
- mkdir tsrc
- cp -f $(SRC) tsrc
- rm tsrc/sqlite.h.in tsrc/parse.y
- touch target_source
-
-sqlite3.c: target_source $(TOP)/tool/mksqlite3c.tcl
- tclsh $(TOP)/tool/mksqlite3c.tcl
- cp sqlite3.c tclsqlite3.c
- cat $(TOP)/src/tclsqlite.c >>tclsqlite3.c
-
-fts2amal.c: target_source $(TOP)/ext/fts2/mkfts2amal.tcl
- tclsh $(TOP)/ext/fts2/mkfts2amal.tcl
-
-fts3amal.c: target_source $(TOP)/ext/fts3/mkfts3amal.tcl
- tclsh $(TOP)/ext/fts3/mkfts3amal.tcl
-
-# Rules to build the LEMON compiler generator
-#
-lemon: $(TOP)/tool/lemon.c $(TOP)/src/lempar.c
- $(BCC) -o lemon $(TOP)/tool/lemon.c
- cp $(TOP)/src/lempar.c .
-
-# Rules to build individual *.o files from generated *.c files. This
-# applies to:
-#
-# parse.o
-# opcodes.o
-#
-%.o: %.c $(HDR)
- $(TCCX_SHARED) -c $<
-
-# Rules to build individual *.o files from files in the src directory.
-#
-%.o: $(TOP)/src/%.c $(HDR)
- $(TCCX_SHARED) -c $<
-
-tclsqlite.o: $(TOP)/src/tclsqlite.c $(HDR)
- $(TCCX_SHARED) $(TCL_FLAGS) -c $(TOP)/src/tclsqlite.c
-
-
-
-# Rules to build opcodes.c and opcodes.h
-#
-opcodes.c: opcodes.h $(TOP)/mkopcodec.awk
- $(NAWK) -f $(TOP)/mkopcodec.awk opcodes.h >opcodes.c
-
-opcodes.h: parse.h $(TOP)/src/vdbe.c $(TOP)/mkopcodeh.awk
- cat parse.h $(TOP)/src/vdbe.c | \
- $(NAWK) -f $(TOP)/mkopcodeh.awk >opcodes.h
-
-# Rules to build parse.c and parse.h - the outputs of lemon.
-#
-parse.h: parse.c
-
-parse.c: $(TOP)/src/parse.y lemon $(TOP)/addopcodes.awk
- cp $(TOP)/src/parse.y .
- rm -f parse.h
- ./lemon $(OPTS) parse.y
- mv parse.h parse.h.temp
- awk -f $(TOP)/addopcodes.awk parse.h.temp >parse.h
-
-sqlite3.h: $(TOP)/src/sqlite.h.in
- sed -e s/--VERS--/`cat ${TOP}/VERSION`/ \
- -e s/--VERSION-NUMBER--/`cat ${TOP}/VERSION | sed 's/[^0-9]/ /g' | $(NAWK) '{printf "%d%03d%03d",$$1,$$2,$$3}'`/ \
- $(TOP)/src/sqlite.h.in >sqlite3.h
-
-keywordhash.h: $(TOP)/tool/mkkeywordhash.c
- $(BCC) -o mkkeywordhash $(OPTS) $(TOP)/tool/mkkeywordhash.c
- ./mkkeywordhash >keywordhash.h
-
-
-
-# Rules to build the extension objects.
-#
-icu.o: $(TOP)/ext/icu/icu.c $(HDR) $(EXTHDR)
- $(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/icu/icu.c
-
-fts2.o: $(TOP)/ext/fts2/fts2.c $(HDR) $(EXTHDR)
- $(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2.c
-
-fts2_hash.o: $(TOP)/ext/fts2/fts2_hash.c $(HDR) $(EXTHDR)
- $(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2_hash.c
-
-fts2_icu.o: $(TOP)/ext/fts2/fts2_icu.c $(HDR) $(EXTHDR)
- $(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2_icu.c
-
-fts2_porter.o: $(TOP)/ext/fts2/fts2_porter.c $(HDR) $(EXTHDR)
- $(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2_porter.c
-
-fts2_tokenizer.o: $(TOP)/ext/fts2/fts2_tokenizer.c $(HDR) $(EXTHDR)
- $(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2_tokenizer.c
-
-fts2_tokenizer1.o: $(TOP)/ext/fts2/fts2_tokenizer1.c $(HDR) $(EXTHDR)
- $(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts2/fts2_tokenizer1.c
-
-fts3.o: $(TOP)/ext/fts3/fts3.c $(HDR) $(EXTHDR)
- $(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3.c
-
-fts3_expr.o: $(TOP)/ext/fts3/fts3_expr.c $(HDR) $(EXTHDR)
- $(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_expr.c
-
-fts3_hash.o: $(TOP)/ext/fts3/fts3_hash.c $(HDR) $(EXTHDR)
- $(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_hash.c
-
-fts3_icu.o: $(TOP)/ext/fts3/fts3_icu.c $(HDR) $(EXTHDR)
- $(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_icu.c
-
-fts3_porter.o: $(TOP)/ext/fts3/fts3_porter.c $(HDR) $(EXTHDR)
- $(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_porter.c
-
-fts3_tokenizer.o: $(TOP)/ext/fts3/fts3_tokenizer.c $(HDR) $(EXTHDR)
- $(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_tokenizer.c
-
-fts3_tokenizer1.o: $(TOP)/ext/fts3/fts3_tokenizer1.c $(HDR) $(EXTHDR)
- $(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_tokenizer1.c
-
-rtree.o: $(TOP)/ext/rtree/rtree.c $(HDR) $(EXTHDR)
- $(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/rtree/rtree.c
-
-
-# Rules for building test programs and for running tests
-#
-tclsqlite3: $(TOP)/src/tclsqlite.c libsqlite3.a
- $(TCCX_SHARED) $(TCL_FLAGS) -DTCLSH=1 -o tclsqlite3 \
- $(TOP)/src/tclsqlite.c libsqlite3.a $(LIBTCL) $(THREADLIB)
-
-
-# Rules to build the 'testfixture' application.
-#
-TESTFIXTURE_FLAGS = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
-TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
-
-testfixture$(EXE): $(TESTSRC2) libsqlite3.a $(TESTSRC) $(TOP)/src/tclsqlite.c
- $(TCCX) $(TCL_FLAGS) $(TESTFIXTURE_FLAGS) \
- $(TESTSRC) $(TESTSRC2) $(TOP)/src/tclsqlite.c \
- -o testfixture$(EXE) $(LIBTCL) $(THREADLIB) libsqlite3.a
-
-amalgamation-testfixture$(EXE): sqlite3.c $(TESTSRC) $(TOP)/src/tclsqlite.c
- $(TCCX) $(TCL_FLAGS) $(TESTFIXTURE_FLAGS) \
- $(TESTSRC) $(TOP)/src/tclsqlite.c sqlite3.c \
- -o testfixture$(EXE) $(LIBTCL) $(THREADLIB)
-
-fts3-testfixture$(EXE): sqlite3.c fts3amal.c $(TESTSRC) $(TOP)/src/tclsqlite.c
- $(TCCX) $(TCL_FLAGS) $(TESTFIXTURE_FLAGS) \
- -DSQLITE_ENABLE_FTS3=1 \
- $(TESTSRC) $(TOP)/src/tclsqlite.c sqlite3.c fts3amal.c \
- -o testfixture$(EXE) $(LIBTCL) $(THREADLIB)
-
-fulltest: testfixture$(EXE) sqlite3$(EXE)
- ./testfixture$(EXE) $(TOP)/test/all.test
-
-soaktest: testfixture$(EXE) sqlite3$(EXE)
- ./testfixture$(EXE) $(TOP)/test/all.test -soak=1
-
-fulltestonly: testfixture$(EXE) sqlite3$(EXE)
- ./testfixture$(EXE) $(TOP)/test/full.test
-
-test: testfixture$(EXE) sqlite3$(EXE)
- ./testfixture$(EXE) $(TOP)/test/veryquick.test
-
-sqlite3_analyzer$(EXE): $(TOP)/src/tclsqlite.c sqlite3.c $(TESTSRC) \
- $(TOP)/tool/spaceanal.tcl
- sed \
- -e '/^#/d' \
- -e 's,\\,\\\\,g' \
- -e 's,",\\",g' \
- -e 's,^,",' \
- -e 's,$$,\\n",' \
- $(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h
- $(TCCX) $(TCL_FLAGS) $(TESTFIXTURE_FLAGS) \
- -DTCLSH=2 -DSQLITE_TEST=1 -DSQLITE_DEBUG=1 -DSQLITE_PRIVATE="" \
- $(TESTSRC) $(TOP)/src/tclsqlite.c sqlite3.c \
- -o sqlite3_analyzer$(EXE) \
- $(LIBTCL) $(THREADLIB)
-
-TEST_EXTENSION = $(SHPREFIX)testloadext.$(SO)
-$(TEST_EXTENSION): $(TOP)/src/test_loadext.c
- $(MKSHLIB) $(TOP)/src/test_loadext.c -o $(TEST_EXTENSION)
-
-extensiontest: testfixture$(EXE) $(TEST_EXTENSION)
- ./testfixture$(EXE) $(TOP)/test/loadext.test
-
-clean:
- rm -f *.o sqlite3$(EXE) libsqlite3.a sqlite3.h opcodes.*
- rm -f lemon lempar.c parse.* sqlite*.tar.gz mkkeywordhash keywordhash.h
- rm -f $(PUBLISH)
- rm -f *.da *.bb *.bbg gmon.out
- rm -rf quota2a quota2b quota2c
- rm -rf tsrc target_source
- rm -f testloadext.dll libtestloadext.so
- rm -f sqlite3.c fts?amal.c tclsqlite3.c
- rm -f sqlite3rc.h
- rm -f shell.c sqlite3ext.h
- rm -f $(SHPREFIX)sqlite3.$(SO)
diff --git a/configure b/configure
index 2969759f3..266057483 100755
--- a/configure
+++ b/configure
@@ -803,7 +803,6 @@ VERSION
program_prefix
TCLLIBDIR
TCLSH_CMD
-AWK
INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
@@ -3911,13 +3910,13 @@ if ${lt_cv_nm_interface+:} false; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:3914: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:3913: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:3917: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:3916: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:3920: output\"" >&5)
+ (eval echo "\"\$as_me:3919: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5123,7 +5122,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5126 "configure"' > conftest.$ac_ext
+ echo '#line 5125 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6648,11 +6647,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6651: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6650: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6655: \$? = $ac_status" >&5
+ echo "$as_me:6654: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6987,11 +6986,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6990: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6989: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6994: \$? = $ac_status" >&5
+ echo "$as_me:6993: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7092,11 +7091,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7095: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7094: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7099: \$? = $ac_status" >&5
+ echo "$as_me:7098: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7147,11 +7146,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7150: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7149: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7154: \$? = $ac_status" >&5
+ echo "$as_me:7153: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9527,7 +9526,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 9530 "configure"
+#line 9529 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9623,7 +9622,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 9626 "configure"
+#line 9625 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9943,48 +9942,6 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-for ac_prog in gawk mawk nawk awk
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$AWK"; then
- ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_AWK="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$AWK" && break
-done
-
#########
# Enable large file support (if special flags are necessary)
@@ -11885,7 +11842,6 @@ gives unlimited permission to copy, distribute and modify it."
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
-AWK='$AWK'
test -n "\$AWK" || AWK=awk
_ACEOF
diff --git a/configure.ac b/configure.ac
index 92d9b47b3..ef6d51d0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,7 +90,6 @@ fi
#
AC_PROG_LIBTOOL
AC_PROG_INSTALL
-AC_PROG_AWK
#########
# Enable large file support (if special flags are necessary)
diff --git a/main.mk b/main.mk
index f3c1d2aab..2397713c9 100644
--- a/main.mk
+++ b/main.mk
@@ -35,9 +35,6 @@
# LIBREADLINE Linker options needed by programs using readline() must
# link against.
#
-# NAWK Nawk compatible awk program. Older (obsolete?) solaris
-# systems need this to avoid using the original AT&T AWK.
-#
# Once the macros above are defined, the rest of this make script will
# build the SQLite library and testing tools.
################################################################################
@@ -701,7 +698,7 @@ sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
cat sqlite3.c $(TOP)/src/tclsqlite.c >> $@
echo "static const char *tclsh_main_loop(void){" >> $@
echo "static const char *zMainloop = " >> $@
- $(NAWK) -f $(TOP)/tool/tostr.awk $(TOP)/tool/spaceanal.tcl >> $@
+ tclsh $(TOP)/tool/tostr.tcl $(TOP)/tool/spaceanal.tcl >> $@
echo "; return zMainloop; }" >> $@
sqlite3_analyzer$(EXE): sqlite3_analyzer.c
diff --git a/manifest b/manifest
index a38c009e0..e48c25ca0 100644
--- a/manifest
+++ b/manifest
@@ -1,10 +1,8 @@
-C Change\sthe\saddopcodes.awk\sscript\sinto\stool/addopcodes.tcl.
-D 2015-10-07T12:21:14.000
-F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in b33d44230974d2d5ea2f0599855c5e36bd79b90a
-F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc b7d8a7efbbf38cee57bfc81d11ca28c42122ff81
-F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
+C Convert\sthe\stool/tostr.awk\sscript\sinto\stool/tostr.tcl.\s\sRemove\stwo\sobsolete\nMakefiles.\s\sPurge\sNAWK\sfrom\sthe\sconfigure\sscript\sand\sfrom\sunix\smakefiles.\nThere\sare\sstill\stwo\suses\sof\sNAWK\sin\sMakefile.msc.
+D 2015-10-07T12:36:42.935
+F Makefile.in 2a247c733c2dd6fab703df04dd009b26413956f5
+F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
+F Makefile.msc 17ce18bb7e9ca2ad3abed9b0a1fcbef3fbe8f307
F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -37,8 +35,8 @@ F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63
F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
F config.h.in 42b71ad3fe21c9e88fa59e8458ca1a6bc72eb0c0
F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
-F configure 2f61915a1bdfbc589244334401cf97d3401e6a39 x
-F configure.ac 713de38000413e469188db2cb85bed759b56f322
+F configure 8f9f13f9a371bea36bc5b8818bbd56e4e8ba200d x
+F configure.ac 27a3ebbfe43aab82319c68aa0a11377bbfe29246
F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
F doc/lemon.html 334dbf6621b8fb8790297ec1abf3cfa4621709d1
F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
@@ -262,7 +260,7 @@ F ext/userauth/userauth.c 5fa3bdb492f481bbc1709fc83c91ebd13460c69e
F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk 1cb544e1b1943b8b6452a811869b3baee5bfcb13
+F main.mk fdc70f6d0d018b97f351a8fa12db6b10d9baaffc
F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@ -1382,14 +1380,14 @@ F tool/sqldiff.c b318efc2eaf7a7fac4d281a0ce736193cb2506df
F tool/stack_usage.tcl f8e71b92cdb099a147dad572375595eae55eca43
F tool/symbols-mingw.sh 4dbcea7e74768305384c9fd2ed2b41bbf9f0414d
F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f
-F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
+F tool/tostr.tcl 96022f35ada2194f6f8ccf6fd95809e90ed277c4
F tool/varint.c 5d94cb5003db9dbbcbcc5df08d66f16071aee003
F tool/vdbe-compress.tcl 5926c71f9c12d2ab73ef35c29376e756eb68361c
F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 1506cb33fcf61e2ef97b35b99e58fbf21f4f5496
-R d8eeb7e51eba4dfb24803600079d2858
+P 8bbf37142ef2759274668f6da114b5c8072e42db
+R 07b752064456f02ed0865632d443e697
U drh
-Z f02ffe1dfbcccf71e8c30b4fbe822892
+Z 7087d810f3111cb2f52748462bb8f6e3
diff --git a/manifest.uuid b/manifest.uuid
index 95ca593f4..7f24566eb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8bbf37142ef2759274668f6da114b5c8072e42db \ No newline at end of file
+5b6775215327a89232f5059653747a18e83b8b4b \ No newline at end of file
diff --git a/tool/tostr.awk b/tool/tostr.awk
deleted file mode 100644
index 83c6cc1a5..000000000
--- a/tool/tostr.awk
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/awk
-#
-# Convert input text into a C string
-#
-{
- gsub(/\\/,"\\\\");
- gsub(/\"/,"\\\"");
- print "\"" $0 "\\n\"";
-}
diff --git a/tool/tostr.tcl b/tool/tostr.tcl
new file mode 100644
index 000000000..cb06ee947
--- /dev/null
+++ b/tool/tostr.tcl
@@ -0,0 +1,12 @@
+#!/usr/bin/tcl
+#
+# Convert input text into a C string
+#
+set in [open [lindex $argv 0] rb]
+while {![eof $in]} {
+ set line [gets $in]
+ if {[eof $in]} break;
+ set x [string map "\\\\ \\\\\\\\ \\\" \\\\\"" $line]
+ puts "\"$x\\n\""
+}
+close $in
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-17 15:36:24 +0000