Improve documentation and comments in the MSVC batch build tool.

FossilOrigin-Name: ca64ef079811006f3e0526919871ffd286c3e714

diff --git a/manifest b/manifest
index 594e27b7eb5b800d40c29cc3aeafd7a3242d086e..3bd105c4f77c09e29e8a250ebf8991a4bce29c48 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Work\sin\sprogress\son\smaking\sVSIX\spackages\sfor\sthe\sVisual\sStudio\s2015\sCTP.
-D 2015-04-19T06:18:10.467
+C Improve\sdocumentation\sand\scomments\sin\sthe\sMSVC\sbatch\sbuild\stool.
+D 2015-04-19T18:58:29.991
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in faaf75b89840659d74501bea269c7e33414761c1
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -1196,7 +1196,7 @@ F test/without_rowid6.test db0dbf03c49030aa3c1ba5f618620334bd2baf5f
 F test/wordcount.c 9915e06cb33d8ca8109b8700791afe80d305afda
 F test/zeroblob.test fb3c0e4ab172d386954deda24c03f500e121d80d
 F test/zerodamage.test cf6748bad89553cc1632be51a6f54e487e4039ac
-F tool/build-all-msvc.bat 62f4f74b55781757d5b20e12651650d5d94ef2cf x
+F tool/build-all-msvc.bat 78d530f024c22828ce882a3f0b892490aaaf3201 x
 F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
 F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
@@ -1251,10 +1251,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 917e3c36293a1bf052a16116c93e5037ed712f96
-R db56dc9284c6212139225593eec3e32c
-T *branch * vsix2015
-T *sym-vsix2015 *
-T -sym-trunk *
+P 8469d651a0442a2bc572a869a0457a6ea8c06bc7
+R 05d8b709a19efc6c268ced1a9d746700
 U mistachkin
-Z af05882e14ca6800d4b8b20f52645692
+Z 13c315b8e34663ea44d46ce0d67e7224

diff --git a/manifest.uuid b/manifest.uuid
index b8085cc5cf845e1b54ac3bbd5c9112d1e89c7258..f0b523375154afbf7e13aa63bdda8426d5439b73 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8469d651a0442a2bc572a869a0457a6ea8c06bc7
\ No newline at end of file
+ca64ef079811006f3e0526919871ffd286c3e714
\ No newline at end of file

diff --git a/tool/build-all-msvc.bat b/tool/build-all-msvc.bat
index 5fe343c074a2cb97a92e29faac88037d886bfba2..090c6266d12f44943eceec7714c4544bf927193f 100755 (executable)
--- a/tool/build-all-msvc.bat
+++ b/tool/build-all-msvc.bat
@@ -28,6 +28,11 @@ REM In the example above, "C:\dev\sqlite\core" represents the root of the
 REM source tree for SQLite and "C:\Temp" represents the final destination\r
 REM directory for the generated output files.\r
 REM\r
+REM Please note that the SQLite build process performed by the Makefile\r
+REM associated with this batch script requires both Gawk ^(gawk.exe^) and Tcl\r
+REM 8.5 ^(tclsh85.exe^) to be present in a directory contained in the PATH\r
+REM environment variable unless a pre-existing amalgamation file is used.\r
+REM\r
 REM There are several environment variables that may be set to modify the\r
 REM behavior of this batch script and its associated Makefile.  The list of\r
 REM platforms to build may be overriden by using the PLATFORMS environment\r
@@ -37,17 +42,50 @@ REM being used.  The list of configurations to build may be overridden by
 REM setting the CONFIGURATIONS environment variable, which should contain a\r
 REM list of configurations to build ^(e.g. Debug Retail^).  Neither of these\r
 REM variable values may contain any double quotes, surrounding or embedded.\r
-REM Finally, the NCRTLIBPATH and NSDKLIBPATH environment variables may be set\r
-REM to specify the location of the CRT and SDK, respectively, needed to compile\r
-REM executables native to the architecture of the build machine during any\r
-REM cross-compilation that may be necessary, depending on the platforms to be\r
-REM built.  These values in these two variables should be surrounded by double\r
-REM quotes if they contain spaces.\r
 REM\r
-REM Please note that the SQLite build process performed by the Makefile\r
-REM associated with this batch script requires both Gawk ^(gawk.exe^) and Tcl\r
-REM 8.5 ^(tclsh85.exe^) to be present in a directory contained in the PATH\r
-REM environment variable unless a pre-existing amalgamation file is used.\r
+REM Finally, the NCRTLIBPATH, NUCRTLIBPATH, and NSDKLIBPATH environment\r
+REM variables may be set to specify the location of the CRT, Universal CRT, and\r
+REM Windows SDK, respectively, that may be needed to compile executables native\r
+REM to the architecture of the build machine during any cross-compilation that\r
+REM may be necessary, depending on the platforms to be built.  These values in\r
+REM these three variables should be surrounded by double quotes if they contain\r
+REM spaces.\r
+REM\r
+REM There are a few other environment variables that impact the build process\r
+REM when set ^(to anything^), they are:\r
+REM\r
+REM                        NOCLEAN\r
+REM\r
+REM When set, the "clean" target will not be used during each build iteration.\r
+REM However, the target binaries, if any, will still be deleted manually prior\r
+REM to being rebuilt.  Setting this environment variable is only rarely needed\r
+REM and could cause issues in some circumstances; therefore, setting it is not\r
+REM recommended.\r
+REM\r
+REM                        NOSYMBOLS\r
+REM\r
+REM When set, copying of symbol files ^(*.pdb^) created during the build will\r
+REM be skipped and they will not appear in the final destination directory.\r
+REM Setting this environment variable is never strictly needed and could cause\r
+REM issues in some circumstances; therefore, setting it is not recommended.\r
+REM\r
+REM                        BUILD_ALL_SHELL\r
+REM\r
+REM When set, the command line shell will be built for each selected platform\r
+REM and configuration as well.  In addition, the command line shell binaries\r
+REM will be copied, with their symbols, to the final destination directory.\r
+REM\r
+REM                        USE_WINV63_NSDKLIBPATH\r
+REM\r
+REM When set, modifies how the NSDKLIBPATH environment variable is built, based\r
+REM on the WindowsSdkDir environment variable.  It forces this batch script to\r
+REM assume the Windows 8.1 SDK location should be used.\r
+REM\r
+REM                        USE_WINV100_NSDKLIBPATH\r
+REM\r
+REM When set, modifies how the NSDKLIBPATH environment variable is built, based\r
+REM on the WindowsSdkDir environment variable.  It causes this batch script to\r
+REM assume the Windows 10.0 SDK location should be used.\r
 REM\r
 SETLOCAL\r
 \r
@@ -432,7 +470,7 @@ FOR %%P IN (%PLATFORMS%) DO (
             CALL :fn_CopyVariable WindowsSdkDir NSDKLIBPATH\r
 \r
             REM\r
-            REM NOTE: The Windows 8.x and Windows 10 SDKs have a slightly\r
+            REM NOTE: The Windows 8.x and Windows 10.0 SDKs have a slightly\r
             REM       different directory naming conventions.\r
             REM\r
             IF DEFINED USE_WINV100_NSDKLIBPATH (\r