Enhancements to the incremental build support for MSVC.

FossilOrigin-Name: 2e25d915bcb8d6f1747f9befdef64d2e0e495cc6c5948a8eff5d0097b6613d06

diff --git a/Makefile.msc b/Makefile.msc
index 235c7c19ac39e638b414516c07e0e842b946adc6..241961e2d506c3352dfb4db67b725afe19fb8107 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1495,7 +1495,7 @@ SRC12 =
 
 # All source code files.
 #
-SRC = $(SRC00) $(SRC01) $(SRC03) $(SRC04) $(SRC05) $(SRC06) $(SRC07) $(SRC08) $(SRC09) $(SRC10) $(SRC11)
+SRC = $(SRC00) $(SRC01) $(SRC03) $(SRC04) $(SRC05) $(SRC06) $(SRC07) $(SRC08) $(SRC09) $(SRC10) $(SRC11) $(SRC12)
 
 # Source code to the test files.
 #
@@ -1846,15 +1846,16 @@ mptest: mptester.exe
        for %i in ($(SRC11)) do copy /Y %i tsrc
        for %i in ($(SRC12)) do copy /Y %i tsrc
        copy /Y fts5.c tsrc
+       copy /B tsrc\fts5.c +,,
        copy /Y fts5.h tsrc
+       copy /B tsrc\fts5.h +,,
        del /Q tsrc\sqlite.h.in tsrc\parse.y 2>NUL
        $(TCLSH_CMD) $(TOP)\tool\vdbe-compress.tcl $(OPTS) < tsrc\vdbe.c > vdbe.new
        move vdbe.new tsrc\vdbe.c
        echo > .target_source
 
-sqlite3.c:     .target_source sqlite3ext.h $(MKSQLITE3C_TOOL)
+sqlite3.c:     .target_source sqlite3ext.h sqlite3session.h $(MKSQLITE3C_TOOL)
        $(TCLSH_CMD) $(MKSQLITE3C_TOOL) $(MKSQLITE3C_ARGS)
-       copy $(TOP)\ext\session\sqlite3session.h .
 
 sqlite3-all.c: sqlite3.c $(TOP)\tool\split-sqlite3c.tcl
        $(TCLSH_CMD) $(TOP)\tool\split-sqlite3c.tcl
@@ -1869,7 +1870,8 @@ sqlite3.lo:       $(SQLITE3C)
 # Rules to build the LEMON compiler generator
 #
 lempar.c:      $(TOP)\tool\lempar.c
-       copy $(TOP)\tool\lempar.c .
+       copy /Y $(TOP)\tool\lempar.c .
+       copy /B lempar.c +,,
 
 lemon.exe:     $(TOP)\tool\lemon.c lempar.c
        $(BCC) $(NO_WARN) -Daccess=_access \
@@ -2169,7 +2171,8 @@ parse.h:  parse.c
 
 parse.c:       $(TOP)\src\parse.y lemon.exe
        del /Q parse.y parse.h parse.h.temp 2>NUL
-       copy $(TOP)\src\parse.y .
+       copy /Y $(TOP)\src\parse.y .
+       copy /B parse.y +,,
        .\lemon.exe $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS) $(EXT_FEATURE_FLAGS) $(OPTS) -S parse.y
 
 $(SQLITE3H):   $(TOP)\src\sqlite.h.in $(TOP)\manifest mksourceid.exe $(TOP)\VERSION
@@ -2182,8 +2185,13 @@ sqlite3ext.h:    .target_source
        copy /Y sqlite3ext.h tsrc\sqlite3ext.h
 !ELSE
        copy /Y tsrc\sqlite3ext.h sqlite3ext.h
+       copy /B sqlite3ext.h +,,
 !ENDIF
 
+sqlite3session.h:      $(TOP)\ext\session\sqlite3session.h
+       copy /Y $(TOP)\ext\session\sqlite3session.h .
+       copy /B sqlite3session.h +,,
+
 mkkeywordhash.exe:     $(TOP)\tool\mkkeywordhash.c
        $(BCC) $(NO_WARN) -Fe$@ $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS) $(EXT_FEATURE_FLAGS) $(OPTS) \
                $(TOP)\tool\mkkeywordhash.c /link $(LDFLAGS) $(NLTLINKOPTS) $(NLTLIBPATHS)
@@ -2198,7 +2206,7 @@ SHELL_SRC = \
        $(TOP)\ext\misc\shathree.c \
        $(TOP)\ext\misc\fileio.c \
        $(TOP)\ext\misc\completion.c \
-        $(TOP)\ext\misc\uint.c \
+       $(TOP)\ext\misc\uint.c \
        $(TOP)\ext\expert\sqlite3expert.c \
        $(TOP)\ext\expert\sqlite3expert.h \
        $(TOP)\ext\misc\memtrace.c \
@@ -2329,7 +2337,8 @@ LSM1_SRC = \
    $(TOP)\ext\lsm1\lsm_win32.c
 
 fts5parse.c:   $(TOP)\ext\fts5\fts5parse.y lemon.exe
-       copy $(TOP)\ext\fts5\fts5parse.y .
+       copy /Y $(TOP)\ext\fts5\fts5parse.y .
+       copy /B fts5parse.y +,,
        del /Q fts5parse.h 2>NUL
        .\lemon.exe $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS) $(EXT_FEATURE_FLAGS) $(OPTS) -S fts5parse.y
 
@@ -2337,11 +2346,13 @@ fts5parse.h:    fts5parse.c
 
 fts5.c:        $(FTS5_SRC)
        $(TCLSH_CMD) $(TOP)\ext\fts5\tool\mkfts5c.tcl
-       copy $(TOP)\ext\fts5\fts5.h .
+       copy /Y $(TOP)\ext\fts5\fts5.h .
+       copy /B fts5.h +,,
 
 lsm1.c:        $(LSM1_SRC)
        $(TCLSH_CMD) $(TOP)\ext\lsm1\tool\mklsm1c.tcl
-       copy $(TOP)\ext\lsm1\lsm.h .
+       copy /Y $(TOP)\ext\lsm1\lsm.h .
+       copy /B lsm.h +,,
 
 fts5.lo:       fts5.c $(HDR) $(EXTHDR)
        $(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c fts5.c

diff --git a/manifest b/manifest
index 1c917dad382b6cf2f6532cc054c9c95808c0f937..996c4868f7579e42ce78dc6df16bb2fd5b1bfcad 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C Remove\sa\sstray\s"&"\scharacter\sin\sthe\sCLI,\sdetected\sby\sa\sclang\swarning.
-D 2020-05-29T20:16:19.429
+C Enhancements\sto\sthe\sincremental\sbuild\ssupport\sfor\sMSVC.
+D 2020-05-29T21:06:52.599
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 F Makefile.in 8d79d12bae1b624d32cf9a698ecc797bfa908ab7eabac5d76faf130c4d362223
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
-F Makefile.msc 708c6032842b4fa340a6af87e124c1563da82663fb5a74d4a2f5b2c0829b51e0
+F Makefile.msc 08268b28e97fce2475c4a9bd7ba84a99827d6cf9e6b46952409821f6a12ee46d
 F README.md 1514a365ffca3c138e00c5cc839906108a01011a6b082bad19b09781e3aa498a
 F VERSION 5db2ee2cfcc790af73775fa485c13b2e8ccaa5936c6e1f47aedeba7056041ca5
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -1866,7 +1866,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 9924c0456bfcd2058c9620a93dfbfd4c7d960c68910ce6aed7364dff42baba5c
-R 85938626fdde133bf2bbed9b50812696
-U drh
-Z a7ec4245396908b4263f1a81f6c6a7ec
+P 5865d2f2d0333024366ecf1d919535fd4ec05c637feff16d75028ccdc8db4b50
+R ea1f39211518f41f5c2b12c4cd8c40f2
+U mistachkin
+Z 0c710e2dd8d54ec195365654b7322b90

diff --git a/manifest.uuid b/manifest.uuid
index c182cd8037b830d16b694543721d0fdfa3aaaaf3..fefbf025132feb5686e6adf57eb03f392814d1da 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5865d2f2d0333024366ecf1d919535fd4ec05c637feff16d75028ccdc8db4b50
\ No newline at end of file
+2e25d915bcb8d6f1747f9befdef64d2e0e495cc6c5948a8eff5d0097b6613d06
\ No newline at end of file