Further improvements to the MSVC batch build tool.

FossilOrigin-Name: 90dd6eb1fec22460473d670519d0e730bb37067d

diff --git a/manifest b/manifest
index 8223b99bf96e2c774690ba199a4ad90fb488b97c..66116a44c0ae66933e5958f0cc2357c68c84ab1c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\sthe\sinstall\slocation\sfor\sthe\sUWP\sVSIX\spackage.
-D 2016-02-18T21:00:29.393
+C Further\simprovements\sto\sthe\sMSVC\sbatch\sbuild\stool.
+D 2016-02-19T00:47:18.626
 F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 30f075dc4f27a07abb76088946b2944178d85347
@@ -1367,7 +1367,7 @@ F test/zerodamage.test cf6748bad89553cc1632be51a6f54e487e4039ac
 F tool/GetFile.cs a15e08acb5dd7539b75ba23501581d7c2b462cb5
 F tool/GetTclKit.bat 629d87562e0487c386db630033931d12d62e6372
 F tool/addopcodes.tcl 4ca9c3ef196f08da30add5d07ce0c9458dc8c633
-F tool/build-all-msvc.bat 31866578036cd1d962628059b0760d407c3ce4d8 x
+F tool/build-all-msvc.bat ab27285398404cdf99c56430fda7a98f5b1121c2 x
 F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
 F tool/cg_anno.tcl 692ce4b8693d59e3a3de77ca97f4139ecfa641b0 x
 F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2
@@ -1427,10 +1427,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh ef6ebc6fd8d2dc35db3b622015c16a023d4fef4f
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 3d862f207e3adc00f78066799ac5a8c282430a5f
-R def276118187d24a6d1ced842c1b577e
-T *branch * branch-3.11
-T *sym-branch-3.11 *
-T -sym-trunk *
+P b47d03027e973e3c8d77246a2d2100881f6a9bd2
+R 52407255ef725bc9c494bd471eda3f67
 U mistachkin
-Z 6d321d146d87ca8038cd070ce8c81c6a
+Z 739640b3c8a946907b4aabf37d1a947b

diff --git a/manifest.uuid b/manifest.uuid
index bd1171e6f55913c6e69f3a80299b33dd55a91281..a1149e2673f6282f37a208aacdc51d102e611863 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b47d03027e973e3c8d77246a2d2100881f6a9bd2
\ No newline at end of file
+90dd6eb1fec22460473d670519d0e730bb37067d
\ No newline at end of file

diff --git a/tool/build-all-msvc.bat b/tool/build-all-msvc.bat
index 84528e37c2fee208bd3219f7e0ed89a874268cb4..c64a4e289ca663ffb8161984587baf2599433dbe 100755 (executable)
--- a/tool/build-all-msvc.bat
+++ b/tool/build-all-msvc.bat
@@ -69,6 +69,11 @@ REM be skipped and they will not appear in the final destination directory.
 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                        NOMEMDEBUG\r
+REM\r
+REM When set, disables use of MEMDEBUG when building binaries for the "Debug"\r
+REM configuration.\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
@@ -99,6 +104,15 @@ REM Using the above command before running this tool will cause the compiled
 REM binaries to target the WinRT environment, which provides a subset of the\r
 REM Win32 API.\r
 REM\r
+REM                        DLL_FILE_NAME\r
+REM                        DLL_PDB_FILE_NAME\r
+REM                        LIB_FILE_NAME\r
+REM                        EXE_FILE_NAME\r
+REM                        EXE_PDB_FILE_NAME\r
+REM\r
+REM When set, these values will override the associated target file name used\r
+REM for the build.\r
+REM\r
 SETLOCAL\r
 \r
 REM SET __ECHO=ECHO\r
@@ -255,6 +269,30 @@ IF NOT DEFINED %TCLSH_FILE%_PATH (
   GOTO errors\r
 )\r
 \r
+REM\r
+REM NOTE: Setup the default names for the build targets we are creating.  Any\r
+REM       ^(or all^) of these may end up being overridden.\r
+REM\r
+IF NOT DEFINED DLL_FILE_NAME (\r
+  SET DLL_FILE_NAME=sqlite3.dll\r
+)\r
+\r
+IF NOT DEFINED DLL_PDB_FILE_NAME (\r
+  SET DLL_PDB_FILE_NAME=sqlite3.pdb\r
+)\r
+\r
+IF NOT DEFINED LIB_FILE_NAME (\r
+  SET LIB_FILE_NAME=sqlite3.lib\r
+)\r
+\r
+IF NOT DEFINED EXE_FILE_NAME (\r
+  SET EXE_FILE_NAME=sqlite3.exe\r
+)\r
+\r
+IF NOT DEFINED EXE_PDB_FILE_NAME (\r
+  SET EXE_PDB_FILE_NAME=sqlite3sh.pdb\r
+)\r
+\r
 REM\r
 REM NOTE: Set the TOOLPATH variable to contain all the directories where the\r
 REM       external tools were found in the search above.\r
@@ -434,7 +472,9 @@ FOR %%P IN (%PLATFORMS%) DO (
         REM NOTE: Setting this to non-zero should enable the SQLITE_MEMDEBUG\r
         REM       define.\r
         REM\r
-        SET MEMDEBUG=1\r
+        IF NOT DEFINED NOMEMDEBUG (\r
+          SET MEMDEBUG=1\r
+        )\r
       ) ELSE (\r
         CALL :fn_UnsetVariable DEBUG\r
         CALL :fn_UnsetVariable MEMDEBUG\r
@@ -559,7 +599,7 @@ FOR %%P IN (%PLATFORMS%) DO (
           REM       specifically wanting to build for each platform.\r
           REM\r
           %_AECHO% Cleaning final core library output files only...\r
-          %__ECHO% DEL /Q *.lo sqlite3.dll sqlite3.lib sqlite3.pdb 2%REDIRECT% NUL\r
+          %__ECHO% DEL /Q *.lo "%DLL_FILE_NAME%" "%LIB_FILE_NAME%" "%DLL_PDB_FILE_NAME%" 2%REDIRECT% NUL\r
         )\r
 \r
         REM\r
@@ -569,10 +609,10 @@ FOR %%P IN (%PLATFORMS%) DO (
         REM       Also, disable looking for and/or linking to the native Tcl\r
         REM       runtime library.\r
         REM\r
-        %__ECHO% %NMAKE_CMD% sqlite3.dll XCOMPILE=1 USE_NATIVE_LIBPATHS=1 NO_TCL=1 %NMAKE_ARGS%\r
+        %__ECHO% %NMAKE_CMD% "%DLL_FILE_NAME%" "PLATFORM=%%D" XCOMPILE=1 USE_NATIVE_LIBPATHS=1 NO_TCL=1 %NMAKE_ARGS%\r
 \r
         IF ERRORLEVEL 1 (\r
-          ECHO Failed to build %%B "sqlite3.dll" for platform %%P.\r
+          ECHO Failed to build %%B "%DLL_FILE_NAME%" for platform %%P.\r
           GOTO errors\r
         )\r
 \r
@@ -580,10 +620,10 @@ FOR %%P IN (%PLATFORMS%) DO (
         REM NOTE: Copy the "sqlite3.dll" file to the appropriate directory for\r
         REM       the build and platform beneath the binary directory.\r
         REM\r
-        %__ECHO% XCOPY sqlite3.dll "%BINARYDIRECTORY%\%%B\%%D\" %FFLAGS% %DFLAGS%\r
+        %__ECHO% XCOPY "%DLL_FILE_NAME%" "%BINARYDIRECTORY%\%%B\%%D\" %FFLAGS% %DFLAGS%\r
 \r
         IF ERRORLEVEL 1 (\r
-          ECHO Failed to copy "sqlite3.dll" to "%BINARYDIRECTORY%\%%B\%%D\".\r
+          ECHO Failed to copy "%DLL_FILE_NAME%" to "%BINARYDIRECTORY%\%%B\%%D\".\r
           GOTO errors\r
         )\r
 \r
@@ -591,10 +631,10 @@ FOR %%P IN (%PLATFORMS%) DO (
         REM NOTE: Copy the "sqlite3.lib" file to the appropriate directory for\r
         REM       the build and platform beneath the binary directory.\r
         REM\r
-        %__ECHO% XCOPY sqlite3.lib "%BINARYDIRECTORY%\%%B\%%D\" %FFLAGS% %DFLAGS%\r
+        %__ECHO% XCOPY "%LIB_FILE_NAME%" "%BINARYDIRECTORY%\%%B\%%D\" %FFLAGS% %DFLAGS%\r
 \r
         IF ERRORLEVEL 1 (\r
-          ECHO Failed to copy "sqlite3.lib" to "%BINARYDIRECTORY%\%%B\%%D\".\r
+          ECHO Failed to copy "%LIB_FILE_NAME%" to "%BINARYDIRECTORY%\%%B\%%D\".\r
           GOTO errors\r
         )\r
 \r
@@ -604,10 +644,10 @@ FOR %%P IN (%PLATFORMS%) DO (
         REM       are prevented from doing so.\r
         REM\r
         IF NOT DEFINED NOSYMBOLS (\r
-          %__ECHO% XCOPY sqlite3.pdb "%BINARYDIRECTORY%\%%B\%%D\" %FFLAGS% %DFLAGS%\r
+          %__ECHO% XCOPY "%DLL_PDB_FILE_NAME%" "%BINARYDIRECTORY%\%%B\%%D\" %FFLAGS% %DFLAGS%\r
 \r
           IF ERRORLEVEL 1 (\r
-            ECHO Failed to copy "sqlite3.pdb" to "%BINARYDIRECTORY%\%%B\%%D\".\r
+            ECHO Failed to copy "%DLL_PDB_FILE_NAME%" to "%BINARYDIRECTORY%\%%B\%%D\".\r
             GOTO errors\r
           )\r
         )\r
@@ -627,7 +667,7 @@ FOR %%P IN (%PLATFORMS%) DO (
             REM       specifically wanting to build for each platform.\r
             REM\r
             %_AECHO% Cleaning final shell executable output files only...\r
-            %__ECHO% DEL /Q sqlite3.exe sqlite3sh.pdb 2%REDIRECT% NUL\r
+            %__ECHO% DEL /Q "%EXE_FILE_NAME%" "%EXE_PDB_FILE_NAME%" 2%REDIRECT% NUL\r
           )\r
 \r
           REM\r
@@ -637,10 +677,10 @@ FOR %%P IN (%PLATFORMS%) DO (
           REM       Also, disable looking for and/or linking to the native Tcl\r
           REM       runtime library.\r
           REM\r
-          %__ECHO% %NMAKE_CMD% sqlite3.exe XCOMPILE=1 USE_NATIVE_LIBPATHS=1 NO_TCL=1 %NMAKE_ARGS%\r
+          %__ECHO% %NMAKE_CMD% "%EXE_FILE_NAME%" "PLATFORM=%%D" XCOMPILE=1 USE_NATIVE_LIBPATHS=1 NO_TCL=1 %NMAKE_ARGS%\r
 \r
           IF ERRORLEVEL 1 (\r
-            ECHO Failed to build %%B "sqlite3.exe" for platform %%P.\r
+            ECHO Failed to build %%B "%EXE_FILE_NAME%" for platform %%P.\r
             GOTO errors\r
           )\r
 \r
@@ -648,10 +688,10 @@ FOR %%P IN (%PLATFORMS%) DO (
           REM NOTE: Copy the "sqlite3.exe" file to the appropriate directory\r
           REM       for the build and platform beneath the binary directory.\r
           REM\r
-          %__ECHO% XCOPY sqlite3.exe "%BINARYDIRECTORY%\%%B\%%D\" %FFLAGS% %DFLAGS%\r
+          %__ECHO% XCOPY "%EXE_FILE_NAME%" "%BINARYDIRECTORY%\%%B\%%D\" %FFLAGS% %DFLAGS%\r
 \r
           IF ERRORLEVEL 1 (\r
-            ECHO Failed to copy "sqlite3.exe" to "%BINARYDIRECTORY%\%%B\%%D\".\r
+            ECHO Failed to copy "%EXE_FILE_NAME%" to "%BINARYDIRECTORY%\%%B\%%D\".\r
             GOTO errors\r
           )\r
 \r
@@ -661,10 +701,10 @@ FOR %%P IN (%PLATFORMS%) DO (
           REM       unless we are prevented from doing so.\r
           REM\r
           IF NOT DEFINED NOSYMBOLS (\r
-            %__ECHO% XCOPY sqlite3sh.pdb "%BINARYDIRECTORY%\%%B\%%D\" %FFLAGS% %DFLAGS%\r
+            %__ECHO% XCOPY "%EXE_PDB_FILE_NAME%" "%BINARYDIRECTORY%\%%B\%%D\" %FFLAGS% %DFLAGS%\r
 \r
             IF ERRORLEVEL 1 (\r
-              ECHO Failed to copy "sqlite3sh.pdb" to "%BINARYDIRECTORY%\%%B\%%D\".\r
+              ECHO Failed to copy "%EXE_PDB_FILE_NAME%" to "%BINARYDIRECTORY%\%%B\%%D\".\r
               GOTO errors\r
             )\r
           )\r