Further refinements to the MSVC batch build process.

FossilOrigin-Name: 4e54e9c0fefe417f94a2d95921acf61b1dda5ca4

diff --git a/Makefile.msc b/Makefile.msc
index d84df8345e6d0158783988c5634f4c7323a1e623..8a6d7fd95423bdafade1a77883f4fafb36875d03 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -472,20 +472,24 @@ CORE_COMPILE_OPTS = $(CORE_CCONV_OPTS)
 # when linking.
 #
 !IFNDEF CORE_LINK_DEP
-!IF $(DYNAMIC_SHELL)!=0 || $(FOR_WIN10)!=0
+!IF $(DYNAMIC_SHELL)!=0
 CORE_LINK_DEP =
-!ELSE
+!ELSEIF $(FOR_WIN10)==0 || "$(PLATFORM)"=="x86"
 CORE_LINK_DEP = sqlite3.def
+!ELSE
+CORE_LINK_DEP =
 !ENDIF
 !ENDIF
 
 # These are additional linker options used for the core library.
 #
 !IFNDEF CORE_LINK_OPTS
-!IF $(DYNAMIC_SHELL)!=0 || $(FOR_WIN10)!=0
+!IF $(DYNAMIC_SHELL)!=0
 CORE_LINK_OPTS =
-!ELSE
+!ELSEIF $(FOR_WIN10)==0 || "$(PLATFORM)"=="x86"
 CORE_LINK_OPTS = /DEF:sqlite3.def
+!ELSE
+CORE_LINK_OPTS =
 !ENDIF
 !ENDIF
 
@@ -1387,11 +1391,11 @@ all:    dll libsqlite3.lib shell $(ALL_TCL_TARGETS)
 
 # Dynamic link library section.
 #
-dll: $(SQLITE3DLL)
+dll:   $(SQLITE3DLL)
 
 # Shell executable.
 #
-shell: $(SQLITE3EXE)
+shell: $(SQLITE3EXE)
 
 # <<mark>>
 libsqlite3.lib:        $(LIBOBJ)
@@ -1401,14 +1405,14 @@ libtclsqlite3.lib:      tclsqlite.lo libsqlite3.lib
        $(LTLIB) $(LTLIBOPTS) $(LTLIBPATHS) /OUT:$@ tclsqlite.lo libsqlite3.lib $(LIBTCLSTUB) $(TLIBS)
 # <</mark>>
 
-$(SQLITE3DLL): $(LIBOBJ) $(LIBRESOBJS) $(CORE_LINK_DEP)
+$(SQLITE3DLL): $(LIBOBJ) $(LIBRESOBJS) $(CORE_LINK_DEP)
        $(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL $(CORE_LINK_OPTS) /OUT:$@ $(LIBOBJ) $(LIBRESOBJS) $(LTLIBS) $(TLIBS)
 
 # <<mark>>
-sqlite3.def: libsqlite3.lib
+sqlite3.def:   libsqlite3.lib
        echo EXPORTS > sqlite3.def
        dumpbin /all libsqlite3.lib \
-               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl include "^\s+1 _?(sqlite3_.*)$$" \1 \
+               | $(TCLSH_CMD) $(TOP)\tool\replace.tcl include "^\s+1 _?(sqlite3_[^@]*)(?:@\d+)?$$" \1 \
                | sort >> sqlite3.def
 # <</mark>>
 
@@ -1784,7 +1788,7 @@ parse.c:  $(TOP)\src\parse.y lemon.exe $(TOP)\tool\addopcodes.tcl
 $(SQLITE3H):   $(TOP)\src\sqlite.h.in $(TOP)\manifest.uuid $(TOP)\VERSION
        $(TCLSH_CMD) $(TOP)\tool\mksqlite3h.tcl $(TOP:\=/) > $(SQLITE3H)
 
-sqlite3ext.h: .target_source
+sqlite3ext.h:  .target_source
        copy tsrc\sqlite3ext.h .
 
 mkkeywordhash.exe:     $(TOP)\tool\mkkeywordhash.c
@@ -1885,9 +1889,9 @@ fts5parse.c:      $(TOP)\ext\fts5\fts5parse.y lemon.exe
        del /Q fts5parse.h 2>NUL
        .\lemon.exe $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS) $(EXT_FEATURE_FLAGS) $(OPTS) fts5parse.y
 
-fts5parse.h: fts5parse.c
+fts5parse.h:   fts5parse.c
 
-fts5.c: $(FTS5_SRC)
+fts5.c:        $(FTS5_SRC)
        $(TCLSH_CMD) $(TOP)\ext\fts5\tool\mkfts5c.tcl
        copy $(TOP)\ext\fts5\fts5.h .
 
@@ -1928,7 +1932,7 @@ testfixture.exe:  $(TESTFIXTURE_SRC) $(SQLITE3H) $(LIBRESOBJS) $(HDR)
                $(TESTFIXTURE_SRC) \
                /link $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LTLIBS) $(TLIBS)
 
-extensiontest: testfixture.exe testloadext.dll
+extensiontest: testfixture.exe testloadext.dll
        @set PATH=$(LIBTCLPATH);$(PATH)
        .\testfixture.exe $(TOP)\test\loadext.test $(TESTOPTS)
 
@@ -1971,7 +1975,7 @@ smoketest:        $(TESTPROGS)
        @set PATH=$(LIBTCLPATH);$(PATH)
        .\testfixture.exe $(TOP)\test\main.test $(TESTOPTS)
 
-sqlite3_analyzer.c: $(SQLITE3C) $(SQLITE3H) $(TOP)\src\tclsqlite.c $(TOP)\tool\spaceanal.tcl
+sqlite3_analyzer.c:    $(SQLITE3C) $(SQLITE3H) $(TOP)\src\tclsqlite.c $(TOP)\tool\spaceanal.tcl
        echo #define TCLSH 2 > $@
        echo #define SQLITE_ENABLE_DBSTAT_VTAB 1 >> $@
        copy $@ + $(SQLITE3C) + $(TOP)\src\tclsqlite.c $@
@@ -1987,7 +1991,7 @@ sqlite3_analyzer.exe:     sqlite3_analyzer.c $(LIBRESOBJS)
 testloadext.lo:        $(TOP)\src\test_loadext.c
        $(LTCOMPILE) $(NO_WARN) -c $(TOP)\src\test_loadext.c
 
-testloadext.dll: testloadext.lo
+testloadext.dll:       testloadext.lo
        $(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL /OUT:$@ testloadext.lo
 
 showdb.exe:    $(TOP)\tool\showdb.c $(SQLITE3C) $(SQLITE3H)
@@ -2025,9 +2029,12 @@ speedtest1.exe:  $(TOP)\test\speedtest1.c $(SQLITE3C) $(SQLITE3H)
        $(LTLINK) $(NO_WARN) -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
                $(TOP)\test\speedtest1.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
 
-rbu.exe: $(TOP)\ext\rbu\rbu.c $(TOP)\ext\rbu\sqlite3rbu.c $(SQLITE3C) $(SQLITE3H)
+rbu.exe:       $(TOP)\ext\rbu\rbu.c $(TOP)\ext\rbu\sqlite3rbu.c $(SQLITE3C) $(SQLITE3H)
        $(LTLINK) $(NO_WARN) -DSQLITE_ENABLE_RBU -Fe$@ \
                $(TOP)\ext\rbu\rbu.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
+
+moreclean:     clean
+       del /Q $(SQLITE3C) $(SQLITE3H) 2>NUL
 # <</mark>>
 
 clean:
@@ -2035,7 +2042,8 @@ clean:
        del /Q *.bsc *.def *.cod *.da *.bb *.bbg *.vc gmon.out 2>NUL
        del /Q $(SQLITE3EXE) $(SQLITE3DLL) 2>NUL
 # <<mark>>
-       del /Q $(SQLITE3C) $(SQLITE3H) opcodes.c opcodes.h 2>NUL
+       del /Q sqlite3.c sqlite3.h 2>NUL
+       del /Q opcodes.c opcodes.h 2>NUL
        del /Q lemon.* lempar.c parse.* 2>NUL
        del /Q mkkeywordhash.* keywordhash.h 2>NUL
        del /Q notasharedlib.* 2>NUL

diff --git a/autoconf/Makefile.msc b/autoconf/Makefile.msc
index 52f0d91e0c9772a18b0527d063d22d9875737b78..ca7c62e3d4d8117f8813bc8f084eb3c5f5cb03d6 100644 (file)
--- a/autoconf/Makefile.msc
+++ b/autoconf/Makefile.msc
@@ -457,7 +457,9 @@ CORE_COMPILE_OPTS = $(CORE_CCONV_OPTS)
 # when linking.
 #
 !IFNDEF CORE_LINK_DEP
-!IF $(DYNAMIC_SHELL)!=0 || $(FOR_WIN10)!=0
+!IF $(DYNAMIC_SHELL)!=0
+CORE_LINK_DEP =
+!ELSEIF $(FOR_WIN10)==0 || "$(PLATFORM)"=="x86"
 CORE_LINK_DEP =
 !ELSE
 CORE_LINK_DEP =
@@ -467,7 +469,9 @@ CORE_LINK_DEP =
 # These are additional linker options used for the core library.
 #
 !IFNDEF CORE_LINK_OPTS
-!IF $(DYNAMIC_SHELL)!=0 || $(FOR_WIN10)!=0
+!IF $(DYNAMIC_SHELL)!=0
+CORE_LINK_OPTS =
+!ELSEIF $(FOR_WIN10)==0 || "$(PLATFORM)"=="x86"
 CORE_LINK_OPTS =
 !ELSE
 CORE_LINK_OPTS =
@@ -874,14 +878,14 @@ all:      dll shell
 
 # Dynamic link library section.
 #
-dll: $(SQLITE3DLL)
+dll:   $(SQLITE3DLL)
 
 # Shell executable.
 #
-shell: $(SQLITE3EXE)
+shell: $(SQLITE3EXE)
 
 
-$(SQLITE3DLL): $(LIBOBJ) $(LIBRESOBJS) $(CORE_LINK_DEP)
+$(SQLITE3DLL): $(LIBOBJ) $(LIBRESOBJS) $(CORE_LINK_DEP)
        $(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL $(CORE_LINK_OPTS) /OUT:$@ $(LIBOBJ) $(LIBRESOBJS) $(LTLIBS) $(TLIBS)
 
 

diff --git a/manifest b/manifest
index e8f5966687c6a649c96ed987a630ceed7991dffc..5d644993fbc74a312ab1e69d5098c1f3c0f90cbe 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
-C Use\sthe\sarguments\sto\sNMAKE\sconsistently\sin\sthe\sMSVC\sbatch\sbuild\stool.
-D 2016-02-19T19:29:44.729
+C Further\srefinements\sto\sthe\sMSVC\sbatch\sbuild\sprocess.
+D 2016-02-26T21:01:37.745
 F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc 28fc4ee02333996d31b3602b39eeb8e609a89ce4
+F Makefile.msc 56ea123a975690bf9ed38b31bb89ff87b02a7c2b
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
 F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -11,7 +11,7 @@ F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am 29e2a6e8d0c5e32723a48b4faf6b168854dde5f4
-F autoconf/Makefile.msc d5ab32cf30d6ba8b5ce20835b4042f6cc2a4cb39
+F autoconf/Makefile.msc 3cbf11c911fafd4d95fbe8aec059b5aa586a0157
 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
 F autoconf/README.txt 7c31da66232f7590bb987cfcd4e2381744b25d24
 F autoconf/configure.ac 72a5e42beb090b32bca580285dc0ab3c4670adb8
@@ -1427,7 +1427,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh ef6ebc6fd8d2dc35db3b622015c16a023d4fef4f
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 66a9ad4a6df513f4c35c3d337d4e2e80cd38d586
-R abade97baee8abed51650334fbde09aa
+P 480e5049486b8b047f533d78b040daa47dd6b946
+R 87ed83a4b8ba227fd93efdc4c65e0468
 U mistachkin
-Z 7b92d09a61d34a4957d04f9633ed77f9
+Z ceeeca002bf9c099753e1f0c14c10004

diff --git a/manifest.uuid b/manifest.uuid
index 613e1048a07547fdb92d313d467384c6e8abc5e2..a39c79627c0e9c6e3cbcfbdd2f1fe14b1d936f61 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-480e5049486b8b047f533d78b040daa47dd6b946
\ No newline at end of file
+4e54e9c0fefe417f94a2d95921acf61b1dda5ca4
\ No newline at end of file