8000 update to upstream sqlite 3.6.17 · mobappmart/sqlcipher-android@db1d641 · GitHub
[go: up one dir, main page]
Skip to content

Commit db1d641

Browse files
sjlombardosjlombardo
committed
update to upstream sqlite 3.6.17
1 parent b9df4d3 commit db1d641

File tree

191 files changed

+28913
-20612
lines changed

Some content is hidden

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

191 files changed

+28913
-20612
lines changed

‎Makefile.in

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,16 +488,18 @@ sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h
488488
mkdir -p tsrc
489489
cp $(SRC) tsrc
490490
rm tsrc/sqlite.h.in tsrc/parse.y
491+
$(TCLSH_CMD) $(TOP)/tool/vdbe-compress.tcl <tsrc/vdbe.c >vdbe.new
492+
mv vdbe.new tsrc/vdbe.c
491493
touch .target_source
492494

493495
sqlite3.c: .target_source $(TOP)/tool/mksqlite3c.tcl
494496
$(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl
495497

496498
# Rules to build the LEMON compiler generator
497499
#
498-
lemon$(BEXE): $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c
500+
lemon$(BEXE): $(TOP)/tool/lemon.c $(TOP)/src/lempar.c
499501
$(BCC) -o $@ $(TOP)/tool/lemon.c
500-
cp $(TOP)/tool/lempar.c .
502+
cp $(TOP)/src/lempar.c .
501503

502504

503505
# Rule to build the amalgamation

‎Makefile.vxworks

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,9 +489,9 @@ fts3amal.c: target_source $(TOP)/ext/fts3/mkfts3amal.tcl
489489

490490
# Rules to build the LEMON compiler generator
491491
#
492-
lemon: $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c
492+
lemon: $(TOP)/tool/lemon.c $(TOP)/src/lempar.c
493493
$(BCC) -o lemon $(TOP)/tool/lemon.c
494-
cp $(TOP)/tool/lempar.c .
494+
cp $(TOP)/src/lempar.c .
495495

496496
# Rules to build individual *.o files from generated *.c files. This
497497
# applies to:

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6.14
1+
3.6.17

0 commit comments

Comments
 (0)
0