Skip to content

Commit 522a3d0

Browse files
sjlombardosjlombardo
committed
Merge branch 'master' into v2beta
Conflicts: Makefile.in
2 parents 3e4eacd + dea8ae9 commit 522a3d0

329 files changed

Lines changed: 14774 additions & 8937 deletions

File tree

Some content is hidden

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

‎Makefile.in‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
189189
random.lo resolve.lo rowset.lo rtree.lo select.lo status.lo \
190190
table.lo tokenize.lo trigger.lo \
191191
update.lo util.lo vacuum.lo \
192-
vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbetrace.lo \
193-
wal.lo walker.lo where.lo utf.lo vtab.lo $(CRYPTOLIBOBJ)
192+
vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
193+
vdbetrace.lo wal.lo walker.lo where.lo utf.lo vtab.lo $(CRYPTOLIBOBJ)
194194

195195
# Object files for the amalgamation.
196196
#
@@ -287,6 +287,7 @@ SRC = \
287287
$(TOP)/src/vdbeaux.c \
288288
$(TOP)/src/vdbeblob.c \
289289
$(TOP)/src/vdbemem.c \
290+
$(TOP)/src/vdbesort.c \
290291
$(TOP)/src/vdbetrace.c \
291292
$(TOP)/src/vdbeInt.h \
292293
$(TOP)/src/vtab.c \
@@ -530,6 +531,9 @@ sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h
530531
sqlite3.c: .target_source $(TOP)/tool/mksqlite3c.tcl
531532
$(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl
532533

534+
sqlite3-all.c: sqlite3.c $(TOP)/tool/split-sqlite3c.tcl
535+
$(TCLSH_CMD) $(TOP)/tool/split-sqlite3c.tcl
536+
533537
# Rule to build the amalgamation
534538
#
535539
sqlite3.lo: sqlite3.c
@@ -757,6 +761,9 @@ vdbeblob.lo: $(TOP)/src/vdbeblob.c $(HDR)
757761
vdbemem.lo: $(TOP)/src/vdbemem.c $(HDR)
758762
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/vdbemem.c
759763

764+
vdbesort.lo: $(TOP)/src/vdbesort.c $(HDR)
765+
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/vdbesort.c
766+
760767
vdbetrace.lo: $(TOP)/src/vdbetrace.c $(HDR)
761768
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/vdbetrace.c
762769

@@ -788,7 +795,7 @@ tclsqlite3$(TEXE): tclsqlite-shell.lo libsqlite3.la
788795
# Rules to build opcodes.c and opcodes.h
789796
#
790797
opcodes.c: opcodes.h $(TOP)/mkopcodec.awk
791-
sort -n -b -k 3 opcodes.h | $(NAWK) -f $(TOP)/mkopcodec.awk >opcodes.c
798+
$(NAWK) -f $(TOP)/mkopcodec.awk opcodes.h >opcodes.c
792799

793800
opcodes.h: parse.h $(TOP)/src/vdbe.c $(TOP)/mkopcodeh.awk
794801
cat parse.h $(TOP)/src/vdbe.c | $(NAWK) -f $(TOP)/mkopcodeh.awk >opcodes.h
@@ -805,7 +812,7 @@ parse.c: $(TOP)/src/parse.y lemon$(BEXE) $(TOP)/addopcodes.awk
805812
$(NAWK) -f $(TOP)/addopcodes.awk parse.h.temp >parse.h
806813

807814
sqlite3.h: $(TOP)/src/sqlite.h.in $(TOP)/manifest.uuid $(TOP)/VERSION
808-
tclsh $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h
815+
$(TCLSH_CMD) $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h
809816

810817
keywordhash.h: $(TOP)/tool/mkkeywordhash.c
811818
$(BCC) -o mkkeywordhash$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS) $(TOP)/tool/mkkeywordhash.c
@@ -879,6 +886,7 @@ rtree.lo: $(TOP)/ext/rtree/rtree.c $(HDR) $(EXTHDR)
879886
#
880887
TESTFIXTURE_FLAGS = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
881888
TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
889+
TESTFIXTURE_FLAGS += -DBUILD_sqlite
882890

883891
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
884892
TESTFIXTURE_SRC1 = sqlite3.c
@@ -898,18 +906,16 @@ soaktest: testfixture$(TEXE) sqlite3$(TEXE)
898906
test: testfixture$(TEXE) sqlite3$(TEXE)
899907
./testfixture$(TEXE) $(TOP)/test/veryquick.test
900908

901-
sqlite3_analyzer$(TEXE): $(TESTFIXTURE_SRC) $(TOP)/tool/spaceanal.tcl
902-
sed \
903-
-e '/^#/d' \
904-
-e 's,\\,\\\\,g' \
905-
-e 's,",\\",g' \
906-
-e 's,^,",' \
907-
-e 's,$$,\\n",' \
908-
$(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h
909-
$(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \
910-
-DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE \
911-
$(TEMP_STORE) -o $@ $(TESTFIXTURE_SRC) $(LIBTCL) $(TLIBS)
909+
sqlite3_analyzer.c: sqlite3.c $(TOP)/src/test_stat.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
910+
echo "#define TCLSH 2" > $@
911+
cat sqlite3.c $(TOP)/src/test_stat.c $(TOP)/src/tclsqlite.c >> $@
912+
echo "static const char *tclsh_main_loop(void){" >> $@
913+
echo "static const char *zMainloop = " >> $@
914+
$(NAWK) -f $(TOP)/tool/tostr.awk $(TOP)/tool/spaceanal.tcl >> $@
915+
echo "; return zMainloop; }" >> $@
912916

917+
sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
918+
$(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
913919

914920
# Standard install and cleanup targets
915921
#
@@ -943,9 +949,11 @@ clean:
943949
rm -f $(PUBLISH)
944950
rm -f *.da *.bb *.bbg gmon.out
945951
rm -rf tsrc .target_source
952+
rm -f tclsqlite3$(TEXE)
946953
rm -f testfixture$(TEXE) test.db
947-
rm -f sqlite3.dll sqlite3.lib sqlite3.def
954+
rm -f sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def
948955
rm -f sqlite3.c
956+
rm -f sqlite3_analyzer$(TEXE) sqlite3_analyzer.c
949957

950958
distclean: clean
951959
rm -f config.log config.status libtool Makefile sqlite3.pc

0 commit comments

Comments
 (0)