8000 track 3.6.13 · githubzhaoliang/sqlcipher@81f606f · GitHub
[go: up one dir, main page]
Skip to content

Commit 81f606f

Browse files
sjlombardosjlombardo
committed
track 3.6.13
1 parent 6e36436 commit 81f606f

File tree

171 files changed

+9143
-12269
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+9143
-12269
lines changed

‎Makefile.in

Lines changed: 13 additions & 4 deletions
< 1241 td data-grid-cell-id="diff-b48650cabc0f502b52865f525765f2d688198f06e0ffb5456c76fabab7f2bfb2-520-524-1" data-selected="false" role="gridcell" style="background-color:var(--diffBlob-additionNum-bgColor, var(--diffBlob-addition-bgColor-num));text-align:center" tabindex="-1" valign="top" class="focusable-grid-cell diff-line-number position-relative left-side">524
Original file line numberDiff line numberDiff line change
@@ -163,14 +163,14 @@ NAWK = @AWK@
163163

164164
# Object files for the SQLite library (non-amalgamation).
165165
#
166-
OBJS0 = alter.lo analyze.lo attach.lo auth.lo bitvec.lo btmutex.lo \
166+
OBJS0 = alter.lo analyze.lo attach.lo auth.lo backup.lo bitvec.lo btmutex.lo \
167167
btree.lo build.lo callback.lo complete.lo date.lo \
168168
delete.lo expr.lo fault.lo func.lo global.lo \
169169
hash.lo journal.lo insert.lo legacy.lo loadext.lo \
170170
main.lo malloc.lo mem0.lo mem1.lo mem2.lo mem3.lo mem5.lo \
171171
memjournal.lo \
172172
mutex.lo mutex_noop.lo mutex_os2.lo mutex_unix.lo mutex_w32.lo \
173-
opcodes.lo os.lo os_unix.lo os_win.lo os_os2.lo \
173+
notify.lo opcodes.lo os.lo os_unix.lo os_win.lo os_os2.lo \
174174
pager.lo parse.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
175175
random.lo resolve.lo rowset.lo select.lo status.lo \
176176
table.lo tokenize.lo trigger.lo update.lo \
@@ -231,6 +231,7 @@ SRC = \
231231
$(TOP)/src/mutex_os2.c \
232232
$(TOP)/src/mutex_unix.c \
233233
$(TOP)/src/mutex_w32.c \
234+
$(TOP)/src/notify.c \
234235
$(TOP)/src/os.c \
235236
$(TOP)/src/os.h \
236237
$(TOP)/src/os_common.h \
@@ -518,6 +519,9 @@ attach.lo: $(TOP)/src/attach.c $(HDR)
518519
auth.lo: $(TOP)/src/auth.c $(HDR)
519520
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/auth.c
520521

522+
backup.lo: $(TOP)/src/backup.c $(HDR)
523+
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/backup.c
+
521525
bitvec.lo: $(TOP)/src/bitvec.c $(HDR)
522526
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/bitvec.c
523527

@@ -608,6 +612,9 @@ mutex_unix.lo: $(TOP)/src/mutex_unix.c $(HDR)
608612
mutex_w32.lo: $(TOP)/src/mutex_w32.c $(HDR)
609613
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/mutex_w32.c
610614

615+
notify.lo: $(TOP)/src/notify.c $(HDR)
616+
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/notify.c
617+
611618
pager.lo: $(TOP)/src/pager.c $(HDR) $(TOP)/src/pager.h
612619
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/pager.c
613620

@@ -765,9 +772,11 @@ sqlite3_analyzer$(TEXE): $(TESTFIXTURE_SRC) $(TOP)/tool/spaceanal.tcl
765772
$(TEMP_STORE) -o $@ $(TESTFIXTURE_SRC) $(LIBTCL)
766773

767774

768-
install: sqlite3$(BEXE) libsqlite3.la sqlite3.h sqlite3.pc ${HAVE_TCL:1=tcl_install}
775+
lib_install: libsqlite3.la
769776
$(INSTALL) -d $(DESTDIR)$(libdir)
770777
$(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir)
778+
779+
install: sqlite3$(BEXE) lib_install sqlite3.h sqlite3.pc ${HAVE_TCL:1=tcl_install}
771780
$(INSTALL) -d $(DESTDIR)$(bindir)
772781
$(LTINSTALL) sqlite3$(BEXE) $(DESTDIR)$(bindir)
773782
$(INSTALL) -d $(DESTDIR)$(includedir)
@@ -778,7 +787,7 @@ install: sqlite3$(BEXE) libsqlite3.la sqlite3.h sqlite3.pc ${HAVE_TCL:1=tcl_inst
778787

779788
pkgIndex.tcl:
780789
echo 'package ifneeded sqlite3 $(RELEASE) [list load $(TCLLIBDIR)/libtclsqlite3.so sqlite3]' > $@
781-
tcl_install: libtclsqlite3.la pkgIndex.tcl
790+
tcl_install: lib_install libtclsqlite3.la pkgIndex.tcl
782791
$(INSTALL) -d $(DESTDIR)$(TCLLIBDIR)
783792
$(LTINSTALL) libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR)
784793
rm -f $(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.a

‎Makefile.vxwSH4 renamed to ‎Makefile.vxworks

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ include $(WIND_USR)/tool/gnu/make.$(FORCPU)
1313
#### The toplevel directory of the source tree. This is the directory
1414
# that contains this "Makefile.in" and the "configure.in" script.
1515
#
16-
TOP = ../sqlite-3.6.5
16+
TOP = .
1717

1818
#### C Compiler and options for use in building executables that
1919
# will run on the platform that is doing the build.
@@ -42,13 +42,14 @@ THREADLIB =
4242

4343
#### Specify any extra libraries needed to access required functions.
4444
#
45-
#TLIBS = -lrt # fdatasync on Solaris 8
46-
#for x86 vxWorks
47-
#TLIBS += TLIBS = $(LD_LINK_PATH_ATEND) $(LD_PARTIAL_LAST_FLAGS)
48-
#for SH4 shared library
49-
TLIBS_SHARED += -L$(WIND_USR)/lib/sh/SH32/commonle/PIC
50-
#TLIBS_SHARED += $(LD_LINK_PATH_ATEND) $(LD_PARTIAL_LAST_FLAGS)
51-
#for SH4 static
45+
ifeq ($(CPU),SH32)
46+
# for SH4 shared library
47+
TLIBS_SHARED += -L$(WIND_USR)/lib/sh/SH32/commonle/PIC
48+
else
49+
# for all other CPUs shared library
50+
TLIBS_SHARED += $(LD_LINK_PATH_ATEND) $(LD_PARTIAL_LAST_FLAGS)
51+
endif
52+
# for static library
5253
TLIBS += $(LD_LINK_PATH_ATEND) $(LD_PARTIAL_LAST_FLAGS)
5354

5455
#### Leave SQLITE_DEBUG undefined for maximum speed. Use SQLITE_DEBUG=1
@@ -193,18 +194,18 @@ TCCX_SHARED = $(TCC_SHARED) $(OPTS) -I. -I$(TOP)/src -I$(TOP) -I$(TOP)/ext/rtree
193194
# Object files for the SQLite library.
194195
#
195196
LIBOBJ+= alter.o analyze.o attach.o auth.o \
196-
bitvec.o btmutex.o btree.o build.o \
197+
backup.o bitvec.o btmutex.o btree.o build.o \
197198
callback.o complete.o date.o delete.o \
198199
expr.o fault.o func.o global.o hash.o \
199200
icu.o insert.o journal.o legacy.o loadext.o \
200201
main.o malloc.o mem0.o mem1.o mem2.o mem3.o mem5.o memjournal.o \
201202
mutex.o mutex_os2.o mutex_unix.o mutex_w32.o mutex_noop.o \
202203
opcodes.o os.o os_os2.o os_unix.o os_win.o \
203-
pager.o parse.o pcache.o pragma.o prepare.o printf.o \
204-
random.o resolve.o rtree.o select.o status.o \
204+
pager.o parse.o pcache.o pcache1.o pragma.o prepare.o printf.o \
205+
random.o resolve.o rowset.o rtree.o select.o status.o \
205206
table.o tokenize.o trigger.o \
206207
update.o util.o vacuum.o \
207-
vdbe.o vdbeapi.o vdbeaux.o vdbeblob.o vdbefifo.o vdbemem.o \
208+
vdbe.o vdbeapi.o vdbeaux.o vdbeblob.o vdbemem.o \
208209
walker.o where.o utf.o vtab.o
209210

210211

@@ -215,6 +216,7 @@ SRC = \
215216
$(TOP)/src/analyze.c \
216217
$(TOP)/src/attach.c \
217218
$(TOP)/src/auth.c \
219+
$(TOP)/src/backup.c \
218220
$(TOP)/src/bitvec.c \
219221
$(TOP)/src/btmutex.c \
220222
$(TOP)/src/btree.c \
@@ -260,12 +262,14 @@ SRC = \
260262
$(TOP)/src/pager.h \
261263
$(TOP)/src/parse.y \
262264
$(TOP)/src/pcache.c \
265+
$(TOP)/src/pcache1.c \
263266
$(TOP)/src/pcache.h \
264267
$(TOP)/src/pragma.c \
265268
$(TOP)/src/prepare.c \
266269
$(TOP)/src/printf.c \
267270
$(TOP)/src/random.c \
268271
$(TOP)/src/resolve.c \
272+
$(TOP)/src/rowset.c \
269273
$(TOP)/src/select.c \
270274
$(TOP)/src/status.c \
271275
$(TOP)/src/shell.c \
@@ -286,7 +290,6 @@ SRC = \
286290
$(TOP)/src/vdbeapi.c \
287291
$(TOP)/src/vdbeaux.c \
288292
$(TOP)/src/vdbeblob.c \
289-
$(TOP)/src/vdbefifo.c \
290293
$(TOP)/src/vdbemem.c \
291294
$(TOP)/src/vdbeInt.h \
292295
$(TOP)/src/vtab.c \
@@ -316,6 +319,8 @@ SRC += \
316319
SRC += \
317320
$(TOP)/ext/fts3/fts3.c \
318321
$(TOP)/ext/fts3/fts3.h \
322+
$(TOP)/ext/fts3/fts3_expr.c \
323+
$(TOP)/ext/fts3/fts3_expr.h \
319324
$(TOP)/ext/fts3/fts3_hash.c \
320325
$(TOP)/ext/fts3/fts3_hash.h \
321326
$(TOP)/ext/fts3/fts3_icu.c \

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6.11
1+
3.6.13

0 commit comments

Comments
 (0)
0