Enable JSON by default in the Windows command-line shell sqlite3.exe.

FossilOrigin-Name: 79c96121baf065fd78ba4f1fe82ce725b6372df20e9323d88022b7c243701372

diff --git a/Makefile.msc b/Makefile.msc
index 10585e4a5821a6d43ae8a403a7bc41efbf1c4ec8..de4f8b196f8da285dd7ca7b47758cc5e5d8a774e 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1508,7 +1508,7 @@ FUZZDATA = \
 # when the shell is not being dynamically linked.
 #
 !IF $(DYNAMIC_SHELL)==0 && $(FOR_WIN10)==0
-SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_STMTVTAB
+SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_STMTVTAB
 !ENDIF
 
 # <<mark>>

diff --git a/manifest b/manifest
index fb182d011548738a33139c2f211ea1d30be61bc2..6e831045b9bde11907e8af2ebbe47cafc60bddda 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
-C Create\sa\sbranch\sfor\sthe\s3.21.0\srelease.\s\sDevelopment\scontinues\son\strunk.
-D 2017-10-11T11:12:20.240
+C Enable\sJSON\sby\sdefault\sin\sthe\sWindows\scommand-line\sshell\ssqlite3.exe.
+D 2017-10-11T17:25:08.609
 F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f
+F Makefile.msc aade743c45bf10cc6d0150d97842e310ac3d91d4f3640a286139d4e72451b96f
 F README.md f5c87359573c4d255425e588a56554b50fdcc2afba4e017a2e02a43701456afd
 F VERSION f81232df28e2d3ff049feefad5fbd5489cc33697f6bd2ecf61af7f0dde3b83d0
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -1656,10 +1656,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 b8c1b5a584aeb6ab63cff875ca16135efeadac16b4b32afa589845477feebf32
-R f3d3a32072dba092302fd2943ac3dda5
-T *branch * branch-3.21
-T *sym-branch-3.21 *
-T -sym-trunk *
+P 0f160a8abb0409b6e687ebc13b732559b3d65428f72430df142fd925eb39e9a2
+R 7fea6f857c00d4f29f020f0f9a952e04
 U drh
-Z 2b6b9e30a8a2f29d1c1889fa41916c23
+Z b088c8a18ee6c3891400703c6e00fc6b

diff --git a/manifest.uuid b/manifest.uuid
index dc796a5a8182893678cb75cd8fc75f4baac4506c..ce3f7ad8486c8bc653b045cbafe18ff868ba833b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0f160a8abb0409b6e687ebc13b732559b3d65428f72430df142fd925eb39e9a2
\ No newline at end of file
+79c96121baf065fd78ba4f1fe82ce725b6372df20e9323d88022b7c243701372
\ No newline at end of file