From: drh <drh@noemail.net>
Date: Mon, 18 Mar 2013 16:24:33 +0000 (+0000)
Subject: Adjust the MSVC makefile so that it correctly handles the sessions
X-Git-Tag: version-3.13.0~148^2~209
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c03edc0b62b27384c132b271d87c4fff670c9c8b;p=thirdparty%2Fsqlite.git

Adjust the MSVC makefile so that it correctly handles the sessions
extension being included in the amalgamation.  Import the test case
changes that appeared in 3.7.16 final.

FossilOrigin-Name: 9bac09a99aef5f18386037b409869d760c520d53
---

c03edc0b62b27384c132b271d87c4fff670c9c8b
diff --cc Makefile.msc
index dea8ee8cd6,2fb9687655..00e4ffbe8d
--- a/Makefile.msc
+++ b/Makefile.msc
@@@ -761,14 -751,7 +761,14 @@@ TESTSRC2 = 
    $(TOP)\ext\fts3\fts3_unicode.c \
    $(TOP)\ext\fts3\fts3_unicode2.c \
    $(TOP)\ext\fts3\fts3_write.c \
 -  $(TOP)\ext\async\sqlite3async.c
 +  $(TOP)\ext\async\sqlite3async.c \
 +  $(TOP)\ext\session\sqlite3session.c
 +
 +# Source code to the library files needed by the test fixture
 +# (amalgamation)
 +#
- TESTSRC3 = \
-   $(TOP)\ext\session\sqlite3session.c
++TESTSRC3 =
++
  
  # Header files used by all library source files.
  #
diff --cc manifest
index d5d4db2ad3,81e2d81daa..60723169d4
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Fix\stypos\sin\sMSVC\smakefile.
- D 2013-03-13T19:02:39.185
 -C Version\s3.7.16
 -D 2013-03-18T11:39:23.116
++C Adjust\sthe\sMSVC\smakefile\sso\sthat\sit\scorrectly\shandles\sthe\ssessions\nextension\sbeing\sincluded\sin\sthe\samalgamation.\s\sImport\sthe\stest\scase\nchanges\sthat\sappeared\sin\s3.7.16\sfinal.
++D 2013-03-18T16:24:33.543
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 9a804abbd3cae82d196e4d33aba13239e32522a5
 +F Makefile.in f33fad60e6fa3cc15f6a39609a256b340a1c12d9
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 50121cf9f55dd2bd06ed70007c9c48d89f2c230b
 -F Makefile.msc 1bed3bca025ee90441bb0c9f95f36f42b70bd839
++F Makefile.msc c56c19e93d5de6dde495d68d28d8455a5bab9917
  F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 6d4f66eaebabc42ef8c2a4d2d0caf4ce7ee81137
@@@ -1051,7 -1038,10 +1051,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 0b84e277245f10f928c010ea5958923681c6d582
- R 8936b43e7cb6239a57717295926fbe09
- U mistachkin
- Z 90881652b49d2ff478c663d912137eaa
 -P 0b452734faa0839c817f040322e7733e423bfce2
 -R ad71abb6cd4a6ebc6857153126653bad
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.7.16 *
++P 2d15c2685750b930c5b7e2f06cb056b24a037967 66d5f2b76750f3520eb7a495f6247206758f5b90
++R 2176dc6cddaef86d42b3729c5996485e
+ U drh
 -Z d73f3a9c465960162106ae1e090c862c
++Z 1f183a91c30c6bc258b1a36f7025012a
diff --cc manifest.uuid
index c29d8d46f9,8d7655aac9..742ad126ba
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2d15c2685750b930c5b7e2f06cb056b24a037967
 -66d5f2b76750f3520eb7a495f6247206758f5b90
++9bac09a99aef5f18386037b409869d760c520d53