]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Add the --msvc command-line option to the releasetest.tcl script. This is
authordrh <drh@noemail.net>
Wed, 15 Apr 2015 14:52:05 +0000 (14:52 +0000)
committerdrh <drh@noemail.net>
Wed, 15 Apr 2015 14:52:05 +0000 (14:52 +0000)
only a partial merge from the winTest branch as the OS_TRACE changes are
omitted.

FossilOrigin-Name: b8768f124ef7d79e500b60a3ede288d46a0f529d

1  2 
Makefile.msc
manifest
manifest.uuid

diff --cc Makefile.msc
Simple merge
diff --cc manifest
index 7337ec76734d5be15625dc7c61a39e62813940e2,e2d9993f0b9db62a1e13cf20341048a1b3ab2c97..c374496704f8a0af1371f304ad7b86dd1a983838
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Remove\san\sincorrect\sassert()\sstatement\sfrom\ssqlite3Fts3Dequote().
- D 2015-04-15T09:16:39.633
 -C Enhance\sthe\s'releasetest.tcl'\stool\sto\ssupport\sMSVC.
 -D 2015-04-04T00:02:07.856
++C Add\sthe\s--msvc\scommand-line\soption\sto\sthe\sreleasetest.tcl\sscript.\s\sThis\sis\nonly\sa\spartial\smerge\sfrom\sthe\swinTest\sbranch\sas\sthe\sOS_TRACE\schanges\sare\nomitted.
++D 2015-04-15T14:52:05.457
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 00d12636df7a5b08af09116bcd6c7bfd49b8b3b4
 +F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 0078f5781538e07ea38683439f38d5f5ab79ab6e
 -F Makefile.msc a95303d8bd37f8cf176be19cb5542355cc3c243b
++F Makefile.msc 11cb5361e34b80e9c5b417ed6a6deee099c5b5f3
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
 -F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60
 +F VERSION 2e244662b71e6e68a5c29b014ebc5b7564f4cc5a
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -1250,7 -1248,7 +1250,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P fa0956edf866f48f448967836709a3ad822ff917
- R ae90fdb352a7af37163dde65a0adec8a
- U dan
- Z a5cd9462fba20ef05f7047cbd877b3d9
 -P 5f6e35802fcf7b5e9fc3dd4424e9074523fa8ad3
 -R beb5360693babbdb25b957a67e8a7b0e
 -U mistachkin
 -Z 6aedfad85a42d725bf8ce314c14e99d1
++P bd06eeb8d06237dc2d54d8a03e8bf525cb811c9e f664bfdc82597a4530d4f4938bb96557b43b171b
++R b50245239bcc99605991067d21ad645b
++U drh
++Z 4acea00deaa3e67c61c8980097c82958
diff --cc manifest.uuid
index 6c106f0137fb94ad57d6eae52953f8cbc5dcafb1,3312a66aa238ce45e5b67e22d278164a3bbf3b83..89bd95a64917a1849791f9861da9ab757f1a7f2c
@@@ -1,1 -1,1 +1,1 @@@
- bd06eeb8d06237dc2d54d8a03e8bf525cb811c9e
 -f664bfdc82597a4530d4f4938bb96557b43b171b
++b8768f124ef7d79e500b60a3ede288d46a0f529d