Remove AWK requirement from the MSVC batch build tool.

FossilOrigin-Name: 6d9cdb931cf4e2f0830184cff32e441e4966bd7e

diff --git a/manifest b/manifest
index 1dab58c169639749e249ec0e79aca0cc710131c8..439f387bb5b44d4aac9e998ba6c33d7f45f523f6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\sTclKit\sbatch\stool\sshould\snot\sdownload\sthe\sTclKit\sSDK\swhen\sthe\sTCLKIT_NOSDK\senvironment\svariable\sis\sset.
-D 2015-10-12T03:44:39.745
+C Remove\sAWK\srequirement\sfrom\sthe\sMSVC\sbatch\sbuild\stool.
+D 2015-10-12T03:56:21.327
 F Makefile.in 2a247c733c2dd6fab703df04dd009b26413956f5
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc f846966b1c38bdc12a384bd48bfbdb257fb5b558
@@ -1334,7 +1334,7 @@ F test/zerodamage.test cf6748bad89553cc1632be51a6f54e487e4039ac
 F tool/GetFile.cs a15e08acb5dd7539b75ba23501581d7c2b462cb5
 F tool/GetTclKit.bat f8159730269bdbf5c334383134011dda4df45511
 F tool/addopcodes.tcl 7cc82ecca456a6b3148abf492b0419b83140881a
-F tool/build-all-msvc.bat 761d8c82a1a529261291812732a853a1b4256d85 x
+F tool/build-all-msvc.bat 2b1703b322da121e56b955cb58de091107f777c3 x
 F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
 F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2
 F tool/extract.c 054069d81b095fbdc189a6f5d4466e40380505e2
@@ -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 bc6223b1d6c31a47c7b734cfb8a9ecf15ab809fc
-R 47fe09613250f52fb94741367469a8c4
+P 7c5d583bac89f8db94e7f73df09e1d04f0f24990
+R 47cd1b08f2579a86c3f7eed6daa15a48
 U mistachkin
-Z c3b529016ed8bb4851b8f9db9d7c6231
+Z 42590804f6e58f764778427b7ddbdea9

diff --git a/manifest.uuid b/manifest.uuid
index d6008337643396bc0a7415a94bde1b96ba3d6431..03917d0b4dbd5f26ad7cfefcd8a9fcd4e7bdb064 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7c5d583bac89f8db94e7f73df09e1d04f0f24990
\ No newline at end of file
+6d9cdb931cf4e2f0830184cff32e441e4966bd7e
\ No newline at end of file

diff --git a/tool/build-all-msvc.bat b/tool/build-all-msvc.bat
index 4842dc40744f8b37de2d9ab329c4ed82bb5e3a8b..a8ba1bc293412a6340c4a541c00372c9564e9c3b 100755 (executable)
--- a/tool/build-all-msvc.bat
+++ b/tool/build-all-msvc.bat
@@ -29,9 +29,9 @@ REM source tree for SQLite and "C:\Temp" represents the final destination
 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 associated with this batch script requires a Tcl shell to be present\r
+REM in a directory contained in the PATH environment variable unless a\r
+REM 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
@@ -232,25 +232,22 @@ REM NOTE: Check for the external tools needed during the build process ^(i.e.
 REM       those that do not get compiled as part of the build process itself^)\r
 REM       along the PATH.\r
 REM\r
-FOR %%T IN (gawk.exe tclsh85.exe) DO (\r
-  SET %%T_PATH=%%~dp$PATH:T\r
+IF DEFINED TCLSH_CMD (\r
+  SET TCLSH_FILE=%TCLSH_CMD%\r
+) ELSE (\r
+  SET TCLSH_FILE=tclsh85.exe\r
 )\r
 \r
-REM\r
-REM NOTE: The Gawk executable "gawk.exe" is required during the SQLite build\r
-REM       process unless a pre-existing amalgamation file is used.\r
-REM\r
-IF NOT DEFINED gawk.exe_PATH (\r
-  ECHO The Gawk executable "gawk.exe" is required to be in the PATH.\r
-  GOTO errors\r
+FOR %%T IN (%TCLSH_FILE%) DO (\r
+  SET %%T_PATH=%%~dp$PATH:T\r
 )\r
 \r
 REM\r
-REM NOTE: The Tcl 8.5 executable "tclsh85.exe" is required during the SQLite\r
-REM       build process unless a pre-existing amalgamation file is used.\r
+REM NOTE: A Tcl shell executable is required during the SQLite build process\r
+REM       unless a pre-existing amalgamation file is used.\r
 REM\r
-IF NOT DEFINED tclsh85.exe_PATH (\r
-  ECHO The Tcl 8.5 executable "tclsh85.exe" is required to be in the PATH.\r
+IF NOT DEFINED %TCLSH_FILE%_PATH (\r
+  ECHO The Tcl shell executable "%TCLSH_FILE%" is required to be in the PATH.\r
   GOTO errors\r
 )\r
 \r
@@ -258,7 +255,7 @@ REM
 REM NOTE: Set the TOOLPATH variable to contain all the directories where the\r
 REM       external tools were found in the search above.\r
 REM\r
-SET TOOLPATH=%gawk.exe_PATH%;%tclsh85.exe_PATH%\r
+CALL :fn_CopyVariable %TCLSH_FILE%_PATH TOOLPATH\r
 \r
 %_VECHO% ToolPath = '%TOOLPATH%'\r
 \r