Hello,
I checked the message archive and it appears that the attachment got stripped
from my previous message. So I'm plastering it inline below.
Thank you,
--Zem
diff -C5 sqlitesrc2/sqlite-src-3160200/main.mk
sqlitesrc3/sqlite-src-3160200/main.mk
*** sqlitesrc2/sqlite-src-3160200/main.mk 2017-01-06 08:52:10.000000000
-0800
--- sqlitesrc3/sqlite-src-3160200/main.mk 2017-02-06 14:04:14.725992100
-0800
***************
*** 626,642 ****
opcodes.h: parse.h $(TOP)/src/vdbe.c $(TOP)/tool/mkopcodeh.tcl
cat parse.h $(TOP)/src/vdbe.c | \
tclsh $(TOP)/tool/mkopcodeh.tcl >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)/tool/addopcodes.tcl
cp $(TOP)/src/parse.y .
rm -f parse.h
! ./lemon -s $(OPTS) parse.y
mv parse.h parse.h.temp
tclsh $(TOP)/tool/addopcodes.tcl parse.h.temp >parse.h
sqlite3.h: $(TOP)/src/sqlite.h.in $(TOP)/manifest.uuid $(TOP)/VERSION
$(TOP)/ext/rtree/sqlite3rtree.h
tclsh $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h
--- 626,654 ----
opcodes.h: parse.h $(TOP)/src/vdbe.c $(TOP)/tool/mkopcodeh.tcl
cat parse.h $(TOP)/src/vdbe.c | \
tclsh $(TOP)/tool/mkopcodeh.tcl >opcodes.h
# Rules to build parse.c and parse.h - the outputs of lemon.
+ # NB: To build parse.c, we run lemon twice - once with
+ # -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT and once without -
+ # and then diff the results. This way, SQLITE_ENABLE_UPDATE_DELETE_LIMIT
+ # can be used directly with the amalgamation.
#
parse.h: parse.c
parse.c: $(TOP)/src/parse.y lemon $(TOP)/tool/addopcodes.tcl
cp $(TOP)/src/parse.y .
rm -f parse.h
! ./lemon -s $(OPTS:SQLITE_ENABLE_UPDATE_DELETE_LIMIT=_UNUSED) \
! parse.y
! mv parse.c parse.c.1.temp
! mv parse.out parse.out.1.temp
! ./lemon -s $(OPTS:SQLITE_ENABLE_UPDATE_DELETE_LIMIT=_UNUSED) \
! -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT parse.y
! mv parse.c parse.c.2.temp
! mv parse.out parse.out.2.temp
! -diff -d -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT parse.c.1.temp
parse.c.2.temp >parse.c
mv parse.h parse.h.temp
tclsh $(TOP)/tool/addopcodes.tcl parse.h.temp >parse.h
sqlite3.h: $(TOP)/src/sqlite.h.in $(TOP)/manifest.uuid $(TOP)/VERSION
$(TOP)/ext/rtree/sqlite3rtree.h
tclsh $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h
diff -C5 sqlitesrc2/sqlite-src-3160200/Makefile.in
sqlitesrc3/sqlite-src-3160200/Makefile.in
*** sqlitesrc2/sqlite-src-3160200/Makefile.in 2017-01-06 08:52:10.000000000
-0800
--- sqlitesrc3/sqlite-src-3160200/Makefile.in 2017-02-06 14:06:04.625426600
-0800
***************
*** 940,956 ****
opcodes.h: parse.h $(TOP)/src/vdbe.c $(TOP)/tool/mkopcodeh.tcl
cat parse.h $(TOP)/src/vdbe.c | $(TCLSH_CMD) $(TOP)/tool/mkopcodeh.tcl
>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$(BEXE) $(TOP)/tool/addopcodes.tcl
cp $(TOP)/src/parse.y .
rm -f parse.h
! ./lemon$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS) parse.y
mv parse.h parse.h.temp
$(TCLSH_CMD) $(TOP)/tool/addopcodes.tcl parse.h.temp >parse.h
sqlite3.h: $(TOP)/src/sqlite.h.in $(TOP)/manifest.uuid $(TOP)/VERSION
$(TCLSH_CMD) $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h
--- 940,969 ----
opcodes.h: parse.h $(TOP)/src/vdbe.c $(TOP)/tool/mkopcodeh.tcl
cat parse.h $(TOP)/src/vdbe.c | $(TCLSH_CMD) $(TOP)/tool/mkopcodeh.tcl
>opcodes.h
# Rules to build parse.c and parse.h - the outputs of lemon.
+ # NB: To build parse.c, we run lemon twice - once with
+ # -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT and once without -
+ # and then diff the results. This way, SQLITE_ENABLE_UPDATE_DELETE_LIMIT
+ # can be used directly with the amalgamation.
#
parse.h: parse.c
parse.c: $(TOP)/src/parse.y lemon$(BEXE) $(TOP)/tool/addopcodes.tcl
cp $(TOP)/src/parse.y .
rm -f parse.h
! ./lemon$(BEXE)
$(OPT_FEATURE_FLAGS:SQLITE_ENABLE_UPDATE_DELETE_LIMIT=_UNUSED) \
! $(OPTS:SQLITE_ENABLE_UPDATE_DELETE_LIMIT=_UNUSED) parse.y
! mv parse.c parse.c.1.temp
! mv parse.out parse.out.1.temp
! ./lemon$(BEXE)
$(OPT_FEATURE_FLAGS:SQLITE_ENABLE_UPDATE_DELETE_LIMIT=_UNUSED) \
! $(OPTS:SQLITE_ENABLE_UPDATE_DELETE_LIMIT=_UNUSED) \
! -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT parse.y
! mv parse.c parse.c.2.temp
! mv parse.out parse.out.2.temp
! -diff -d -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT parse.c.1.temp
parse.c.2.temp >parse.c
mv parse.h parse.h.temp
$(TCLSH_CMD) $(TOP)/tool/addopcodes.tcl parse.h.temp >parse.h
sqlite3.h: $(TOP)/src/sqlite.h.in $(TOP)/manifest.uuid $(TOP)/VERSION
$(TCLSH_CMD) $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h
diff -C5 sqlitesrc2/sqlite-src-3160200/Makefile.msc
sqlitesrc3/sqlite-src-3160200/Makefile.msc
*** sqlitesrc2/sqlite-src-3160200/Makefile.msc 2017-01-06 08:52:10.000000000
-0800
--- sqlitesrc3/sqlite-src-3160200/Makefile.msc 2017-02-05 20:00:47.125852800
-0800
***************
*** 828,837 ****
--- 828,843 ----
# specific Tcl shell to use.
#
!IFNDEF TCLSH_CMD
TCLSH_CMD = tclsh
!ENDIF
+
+ # The command to use for diff, analogous to tclsh.
+ !IFNDEF DIFF_CMD
+ DIFF_CMD = diff
+ !ENDIF
+
# <</mark>>
# Compiler options needed for programs that use the readline() library.
#
!IFNDEF READLINE_FLAGS
***************
*** 1910,1926 ****
opcodes.h: parse.h $(TOP)\src\vdbe.c $(TOP)\tool\mkopcodeh.tcl
type parse.h $(TOP)\src\vdbe.c | $(TCLSH_CMD) $(TOP)\tool\mkopcodeh.tcl
> 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.exe $(TOP)\tool\addopcodes.tcl
del /Q parse.y parse.h parse.h.temp 2>NUL
copy $(TOP)\src\parse.y .
! .\lemon.exe $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS)
$(EXT_FEATURE_FLAGS) $(OPTS) parse.y
move parse.h parse.h.temp
$(TCLSH_CMD) $(TOP)\tool\addopcodes.tcl parse.h.temp > parse.h
$(SQLITE3H): $(TOP)\src\sqlite.h.in $(TOP)\manifest.uuid $(TOP)\VERSION
$(TCLSH_CMD) $(TOP)\tool\mksqlite3h.tcl $(TOP:\=/) > $(SQLITE3H)
$(MKSQLITE3H_ARGS)
--- 1916,1949 ----
opcodes.h: parse.h $(TOP)\src\vdbe.c $(TOP)\tool\mkopcodeh.tcl
type parse.h $(TOP)\src\vdbe.c | $(TCLSH_CMD) $(TOP)\tool\mkopcodeh.tcl
> opcodes.h
# Rules to build parse.c and parse.h - the outputs of lemon.
+ # NB: To build parse.c, we run lemon twice - once with
+ # -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT and once without -
+ # and then diff the results. This way, SQLITE_ENABLE_UPDATE_DELETE_LIMIT
+ # can be used directly with the amalgamation.
#
parse.h: parse.c
parse.c: $(TOP)\src\parse.y lemon.exe $(TOP)\tool\addopcodes.tcl
del /Q parse.y parse.h parse.h.temp 2>NUL
copy $(TOP)\src\parse.y .
! .\lemon.exe
$(REQ_FEATURE_FLAGS:SQLITE_ENABLE_UPDATE_DELETE_LIMIT=_UNUSED) \
! $(OPT_FEATURE_FLAGS:SQLITE_ENABLE_UPDATE_DELETE_LIMIT=_UNUSED) \
! $(EXT_FEATURE_FLAGS:SQLITE_ENABLE_UPDATE_DELETE_LIMIT=_UNUSED) \
! $(OPTS:SQLITE_ENABLE_UPDATE_DELETE_LIMIT=_UNUSED) parse.y
! mv parse.c parse.c.1.temp
! mv parse.out parse.out.1.temp
! .\lemon.exe
$(REQ_FEATURE_FLAGS:SQLITE_ENABLE_UPDATE_DELETE_LIMIT=_UNUSED) \
! $(OPT_FEATURE_FLAGS:SQLITE_ENABLE_UPDATE_DELETE_LIMIT=_UNUSED) \
! $(EXT_FEATURE_FLAGS:SQLITE_ENABLE_UPDATE_DELETE_LIMIT=_UNUSED) \
! $(OPTS:SQLITE_ENABLE_UPDATE_DELETE_LIMIT=_UNUSED) \
! -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT parse.y
! mv parse.c parse.c.2.temp
! mv parse.out parse.out.2.temp
! -$(DIFF_CMD) -d -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT parse.c.1.temp
parse.c.2.temp >parse.c
move parse.h parse.h.temp
$(TCLSH_CMD) $(TOP)\tool\addopcodes.tcl parse.h.temp > parse.h
$(SQLITE3H): $(TOP)\src\sqlite.h.in $(TOP)\manifest.uuid $(TOP)\VERSION
$(TCLSH_CMD) $(TOP)\tool\mksqlite3h.tcl $(TOP:\=/) > $(SQLITE3H)
$(MKSQLITE3H_ARGS)
_______________________________________________
sqlite-users mailing list
[email protected]
http://mailinglists.sqlite.org/cgi-bin/mailman/listinfo/sqlite-users
