In the MSVC makefile, adjust the names of two nmake variables for consistency.

FossilOrigin-Name: 92aa4b6b6fbb83f965e4c4be0aa21a8b7e330ed8

diff --git a/Makefile.msc b/Makefile.msc
index 8e00eb83b1720e7742e9673b2e0e01b2366dbb48..b486c8b8d1b842ad8be91476ce1f961e50976e96 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -388,11 +388,11 @@ CORE_LINK_OPTS = /DEF:sqlite3.def
 
 # These are additional compiler options used for the shell executable.
 #
-!IFNDEF SHELL_OPT
+!IFNDEF SHELL_COMPILE_OPTS
 !IF $(DYNAMIC_SHELL)!=0
-SHELL_OPT = -DSQLITE_SHELL_JSON1 $(SHELL_CCONV_OPTS) -DSQLITE_API=__declspec(dllimport)
+SHELL_COMPILE_OPTS = -DSQLITE_SHELL_JSON1 $(SHELL_CCONV_OPTS) -DSQLITE_API=__declspec(dllimport)
 !ELSE
-SHELL_OPT = -DSQLITE_SHELL_JSON1 $(SHELL_CCONV_OPTS)
+SHELL_COMPILE_OPTS = -DSQLITE_SHELL_JSON1 $(SHELL_CCONV_OPTS)
 !ENDIF
 !ENDIF
 
@@ -1213,9 +1213,9 @@ FUZZDATA = \
 
 # Extra compiler options for various shell tools
 #
-SHELL_OPT = -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5
-FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
-FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1
+SHELL_COMPILE_OPTS = -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5
+FUZZERSHELL_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1
+FUZZCHECK_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1
 
 # Standard options to testfixture
 #
@@ -1233,18 +1233,18 @@ libtclsqlite3.lib:      tclsqlite.lo libsqlite3.lib
        $(LTLIB) $(LTLIBOPTS) $(LTLIBPATHS) /OUT:$@ tclsqlite.lo libsqlite3.lib $(LIBTCL:tcl=tclstub) $(TLIBS)
 
 sqlite3.exe:   $(TOP)\src\shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) sqlite3.h
-       $(LTLINK) $(SHELL_COMPILE_OPTS) $(SHELL_OPT) $(READLINE_FLAGS) $(TOP)\src\shell.c \
+       $(LTLINK) $(SHELL_COMPILE_OPTS) $(SHELL_COMPILE_OPTS) $(READLINE_FLAGS) $(TOP)\src\shell.c \
                /link /pdb:sqlite3sh.pdb $(LTLINKOPTS) $(SHELL_LINK_OPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LIBREADLINE) $(LTLIBS) $(TLIBS)
 
 sqldiff.exe:   $(TOP)\tool\sqldiff.c sqlite3.c sqlite3.h
        $(LTLINK) $(NO_WARN) $(TOP)\tool\sqldiff.c sqlite3.c
 
 fuzzershell.exe:       $(TOP)\tool\fuzzershell.c sqlite3.c sqlite3.h
-       $(LTLINK) $(NO_WARN) $(FUZZERSHELL_OPT) \
+       $(LTLINK) $(NO_WARN) $(FUZZERSHELL_COMPILE_OPTS) \
          $(TOP)\tool\fuzzershell.c sqlite3.c
 
 fuzzcheck.exe: $(TOP)\test\fuzzcheck.c sqlite3.c sqlite3.h
-       $(LTLINK) $(NO_WARN) $(FUZZCHECK_OPT) $(TOP)\test\fuzzcheck.c sqlite3.c
+       $(LTLINK) $(NO_WARN) $(FUZZCHECK_COMPILE_OPTS) $(TOP)\test\fuzzcheck.c sqlite3.c
 
 mptester.exe:  $(TOP)\mptest\mptest.c $(SHELL_CORE_DEP) $(LIBRESOBJS) sqlite3.h
        $(LTLINK) $(NO_WARN) $(SHELL_COMPILE_OPTS) $(TOP)\mptest\mptest.c \

diff --git a/manifest b/manifest
index b99d30edbff02444da403ae40112f7984c1bd42f..827da675cce8047a4f4e7c4818dcbe859e5159aa 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Change\sthe\sversion\snumber\sof\sthe\snext\srelease\sto\s3.9.0.
-D 2015-10-09T13:42:52.722
+C In\sthe\sMSVC\smakefile,\sadjust\sthe\snames\sof\stwo\snmake\svariables\sfor\sconsistency.
+D 2015-10-09T14:23:56.143
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in f0088ff0d2ac949fce6de7c00f13a99ac5bdb663
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc cc5793c66d1d280d20c5a0652c176e0e115638df
+F Makefile.msc 0ed934b4ae6a5ec0b9d7e770104864f8372414ab
 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
 F VERSION cacf16a72f9a03cd06b939a764e32f6f53254c7f
@@ -1390,7 +1390,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 1eb769933108cf401b25c8d784ea23f27324a0bd
-R cd6778cbc7950f234a6f4e35497db7c8
-U drh
-Z 1e0fc771971e482332435479dc5f8b1d
+P aa8fdadf2defed00a28366a3b35a3e2eefecf0ed
+R 67a5030e734fab5c2a42f6160a4ca2ff
+U mistachkin
+Z a73711c3af55fff2b6c43d8879780308

diff --git a/manifest.uuid b/manifest.uuid
index 74c82ba4837669cf8f0530d801088c8697accf85..e8bf42d48028ed85806410fd31246677b8e1b6c9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-aa8fdadf2defed00a28366a3b35a3e2eefecf0ed
\ No newline at end of file
+92aa4b6b6fbb83f965e4c4be0aa21a8b7e330ed8
\ No newline at end of file