Match the MSVC batch build tool sub-routine 'fn_UnsetVariable' a bit more robust.

FossilOrigin-Name: 1edd5f31b9e6f91bb5434055a539428c000f1084

diff --git a/manifest b/manifest
index 07acca67796b4e1eff436358e4d3ddb0ca3d7863..7bd8b070a65ee6c8044a3e0c54ae96fcb3b89f27 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Support\sbuilding\sfor\sWindows\s10\sdesktop\susing\s'MinCore.lib'.
-D 2016-01-27T07:28:33.525
+C Match\sthe\sMSVC\sbatch\sbuild\stool\ssub-routine\s'fn_UnsetVariable'\sa\sbit\smore\srobust.
+D 2016-01-27T23:50:14.931
 F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 72b7858f02017611c3ac1ddc965251017fed0845
@@ -1363,7 +1363,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 204a039f985d5a4f4f9df3a3aa594fd17848c37e x
+F tool/build-all-msvc.bat 6def0b5cebba36db69da8a92a9a31daf92714b4f x
 F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
 F tool/cg_anno.tcl 692ce4b8693d59e3a3de77ca97f4139ecfa641b0 x
 F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2
@@ -1422,7 +1422,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P a3d7b8ac53f94d29a11362f193fd1967f30583df
-R 626d84a8bdebb7b947f7c1e376ac97c5
+P 4bf89891fbb076364dc45a6bf3246efa6bc33d5d
+R 9e8aa43303c9d43f019b8eceec782e78
 U mistachkin
-Z 136b0599f548728406750a73608ec6f4
+Z 8662626dcb0cb6b59115e089abf15292

diff --git a/manifest.uuid b/manifest.uuid
index 20f348c1ae60b320db17892da1f7ef2389ca9fab..60bd1f672e11dc31b84b25151ea33aea3fe595ab 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4bf89891fbb076364dc45a6bf3246efa6bc33d5d
\ No newline at end of file
+1edd5f31b9e6f91bb5434055a539428c000f1084
\ No newline at end of file

diff --git a/tool/build-all-msvc.bat b/tool/build-all-msvc.bat
index 87794132b6449f9a1988b020909e32f1dafe2cb6..30371177dbd7d3e6c11ef50c5f9b04c886e32792 100755 (executable)
--- a/tool/build-all-msvc.bat
+++ b/tool/build-all-msvc.bat
@@ -729,8 +729,9 @@ GOTO no_errors
   GOTO :EOF\r
 \r
 :fn_UnsetVariable\r
-  IF NOT "%1" == "" (\r
-    SET %1=\r
+  SET VALUE=%1\r
+  IF DEFINED VALUE (\r
+    SET %VALUE%=\r
     CALL :fn_ResetErrorLevel\r
   )\r
   GOTO :EOF\r