Update comments in the MSVC batch build tool.

FossilOrigin-Name: 0414bb73ef83332bec3d06471d431690356dbe13

diff --git a/manifest b/manifest
index a322753db5089ced038555b431fb2ece27bfcd36..bf83d16b16eb6a5ccd0fff30401f95a8511cd08c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enable\ssome\smore\stests\son\sWindows.
-D 2013-10-31T06:13:57.969
+C Update\scomments\sin\sthe\sMSVC\sbatch\sbuild\stool.
+D 2013-10-31T06:39:15.748
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 0522b53cdc1fcfc18f3a98e0246add129136c654
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -1077,7 +1077,7 @@ F test/win32lock.test 7a6bd73a5dcdee39b5bb93e92395e1773a194361
 F test/win32longpath.test e2aafc07e6990fe86c69be22a3d1a0e210cd329b
 F test/zeroblob.test caaecfb4f908f7bc086ed238668049f96774d688
 F test/zerodamage.test 209d7ed441f44cc5299e4ebffbef06fd5aabfefd
-F tool/build-all-msvc.bat 38623a30fd58288fda5cc7f7df2682aaab75c9d5 x
+F tool/build-all-msvc.bat 1bac6adc3fdb4d9204f21d17b14be25778370e48 x
 F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
 F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
@@ -1126,7 +1126,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 1a0a88657f54874703fc05f828ce29ad115d9f28
-R 3ecce2c5ce21312a1dbb296432d69334
+P 72389c295bb240ec76746e289403b82e04189903
+R 1054ff58e814a30ba005df284390b721
 U mistachkin
-Z 202c1504aa0d2b90c6b0d6f25f8395e7
+Z 4b58002663daf257cb37f517515be69c

diff --git a/manifest.uuid b/manifest.uuid
index 57dee51f044614d843faa29c407727fad8cb2759..fcb87c7a76e7a8830073e0968fe26e5ce5c4dec1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-72389c295bb240ec76746e289403b82e04189903
\ No newline at end of file
+0414bb73ef83332bec3d06471d431690356dbe13
\ No newline at end of file

diff --git a/tool/build-all-msvc.bat b/tool/build-all-msvc.bat
index ed05f959fe6294eba746518e0f1190331448023f..c730943f68ee93e34a8bf176803024476457ed46 100755 (executable)
--- a/tool/build-all-msvc.bat
+++ b/tool/build-all-msvc.bat
@@ -252,7 +252,7 @@ FOR %%P IN (%PLATFORMS%) DO (
   CALL :fn_CopyVariable %%P_NAME PLATFORMNAME\r
 \r
   REM\r
-  REM NOTE: This is the inner loop.  There should be exactly one iteration.\r
+  REM NOTE: This is the second loop.  There should be exactly one iteration.\r
   REM       This loop is necessary because the PlatformName environment\r
   REM       variable was set above and that value is needed by some of the\r
   REM       commands contained in the inner loop.  If these commands were\r
@@ -289,6 +289,10 @@ FOR %%P IN (%PLATFORMS%) DO (
     REM\r
     SET PATH=%TOOLPATH%;%SystemRoot%\System32;%SystemRoot%\r
 \r
+    REM\r
+    REM NOTE: This is the inner loop.  There are normally two iterations, one\r
+    REM       for each supported build configuration, e.g. Debug or Retail.\r
+    REM\r
     FOR %%B IN (%CONFIGURATIONS%) DO (\r
       REM\r
       REM NOTE: When preparing the debug build, set the DEBUG and MEMDEBUG\r
@@ -318,6 +322,10 @@ FOR %%P IN (%PLATFORMS%) DO (
       REM          platform to the platform-specific directory beneath the\r
       REM          binary directory.\r
       REM\r
+      REM       5. Unless prevented from doing so, copy the "sqlite3.pdb"\r
+      REM          symbols file for this platform to the platform-specific\r
+      REM          directory beneath the binary directory.\r
+      REM\r
       "%ComSpec%" /C (\r
         REM\r
         REM NOTE: Attempt to setup the MSVC environment for this platform.\r
@@ -345,21 +353,30 @@ FOR %%P IN (%PLATFORMS%) DO (
         )\r
 \r
         REM\r
-        REM NOTE: When using MSVC 2012, the native SDK path cannot simply use\r
-        REM       the "lib" sub-directory beneath the location specified in the\r
-        REM       WindowsSdkDir environment variable because that location does\r
-        REM       not actually contain the necessary library files for x86.\r
-        REM       This must be done for each iteration because it relies upon\r
-        REM       the WindowsSdkDir environment variable being set by the batch\r
-        REM       file used to setup the MSVC environment.\r
+        REM NOTE: When using MSVC 2012 and/or 2013, the native SDK path cannot\r
+        REM       simply use the "lib" sub-directory beneath the location\r
+        REM       specified in the WindowsSdkDir environment variable because\r
+        REM       that location does not actually contain the necessary library\r
+        REM       files for x86.  This must be done for each iteration because\r
+        REM       it relies upon the WindowsSdkDir environment variable being\r
+        REM       set by the batch file used to setup the MSVC environment.\r
         REM\r
         IF DEFINED SET_NSDKLIBPATH (\r
+          REM\r
+          REM NOTE: The Windows Phone SDK has a slightly different directory\r
+          REM       structure and must be handled specially here.\r
+          REM\r
           IF DEFINED WindowsPhoneKitDir (\r
             CALL :fn_CopyVariable WindowsPhoneKitDir NSDKLIBPATH\r
             CALL :fn_AppendVariable NSDKLIBPATH \lib\x86\r
           ) ELSE IF DEFINED WindowsSdkDir (\r
             CALL :fn_CopyVariable WindowsSdkDir NSDKLIBPATH\r
 \r
+            REM\r
+            REM NOTE: The Windows 8.1 SDK has a slightly different directory\r
+            REM       naming convention.  Currently, this tool assumes that\r
+            REM       the Windows 8.1 SDK should only be used with MSVC 2013.\r
+            REM\r
             IF "%VisualStudioVersion%" == "12.0" (\r
               CALL :fn_AppendVariable NSDKLIBPATH \lib\winv6.3\um\x86\r
             ) ELSE (\r