TclKit batch tool updates for MSVC. Cherrypick of [bcec155e0d6c6b17] and [0c77935cf9...

FossilOrigin-Name: 96ff1675721c744b5c1173a99fc2ad3a2df64ca8e931738e3a87c72a6f8b1e72

diff --git a/manifest b/manifest
index 245e3193bd15b417847c9bd0888718739e66b5d9..215165f5948dcb45dc24e3a212a82db18fba3776 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Sync\sup\sthe\sMSVC\sautoconf\smakefile.
-D 2017-07-31T19:34:27.984
+C TclKit\sbatch\stool\supdates\sfor\sMSVC.\s\sCherrypick\sof\s[bcec155e0d6c6b17]\sand\s[0c77935cf9949099].
+D 2017-07-31T20:06:21.457
 F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 02b469e9dcd5b7ee63fc1fb05babc174260ee4cfa4e0ef2e48c3c6801567a016
@@ -1545,7 +1545,7 @@ F test/wordcount.c 06efb84b7c48a4973c2c24ea06c93d00bce24389
 F test/zeroblob.test 3857870fe681b8185654414a9bccfde80b62a0fa
 F test/zerodamage.test e59a56443d6298ecf7435f618f0b27654f0c849e
 F tool/GetFile.cs a15e08acb5dd7539b75ba23501581d7c2b462cb5
-F tool/GetTclKit.bat 6afa640edc7810725aec61c3076ac617c4aaf0b7
+F tool/GetTclKit.bat 8995df40c4209808b31f24de0b58f90930239a234f7591e3675d45bfbb990c5d
 F tool/Replace.cs 02c67258801c2fb5f63231e0ac0f220b4b36ba91
 F tool/addopcodes.tcl edbd53806bf20e25af2373ad0c091be4385081c1aa1813b916bf093f94ed8380
 F tool/build-all-msvc.bat c12328d06c45fec8baada5949e3d5af54bf8c887 x
@@ -1637,8 +1637,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P be0e24a0293f31b81fc5608a1d5aa1e57d3f5f7dddef6b368ae2e207bbdaf44c
-Q +b3b89f4ff92ee4b76f467d4e70fb42267470aef77af645f1ce71f9b1a675aabb
-R 1f295e828b184a6c74fcbbb8722d6e99
-U drh
-Z 0c4d0891e158e0355e09d09cdb3e351f
+P 44cebc6e684bcc1b6a4230f04b8ae9de237486476f5fe4ae4cfec4d899644c73
+Q +0c77935cf9949099d834ec51384c1d4dcdaf7b4422c859c9fce6d3cb3bde2645
+Q +bcec155e0d6c6b17ae09d5a366c080723d01ff40dbc1a0ad0bb669a91db1b850
+R d54edcf59605e0e896e53b6d832d1e46
+U mistachkin
+Z 1228dd0370b45437167fbbbc71c5129d

diff --git a/manifest.uuid b/manifest.uuid
index 9be6b7fcffe7ec331f762e4ec097f2da8bea4268..9c36a7ab3459b9ceeeb75d3f8c282b10345ee9cb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-44cebc6e684bcc1b6a4230f04b8ae9de237486476f5fe4ae4cfec4d899644c73
\ No newline at end of file
+96ff1675721c744b5c1173a99fc2ad3a2df64ca8e931738e3a87c72a6f8b1e72
\ No newline at end of file

diff --git a/tool/GetTclKit.bat b/tool/GetTclKit.bat
index 1c9f92bc120c0fed85e458afaa9b2401cf35d9d0..0cc62b3f8c7d4f278624d2458d55b06257cc0438 100644 (file)
--- a/tool/GetTclKit.bat
+++ b/tool/GetTclKit.bat
@@ -29,6 +29,8 @@ IF DEFINED PROCESSOR (
   GOTO usage\r
 )\r
 \r
+SET PROCESSOR=%PROCESSOR:AMD64=x64%\r
+\r
 %_VECHO% Processor = '%PROCESSOR%'\r
 \r
 SET DUMMY2=%2\r
@@ -193,12 +195,19 @@ ECHO.
 GOTO no_errors\r
 \r
 :fn_TclKitX86Variables\r
+  REM\r
+  REM NOTE: By default, use latest available version of the TclKit SDK\r
+  REM       for x86.  However, the "default" TclKit executable for x86\r
+  REM       is still used here because it is the only one "well-known"\r
+  REM       to be available for download.\r
+  REM\r
   IF NOT DEFINED TCLKIT_PATCHLEVEL (\r
-    SET TCLKIT_PATCHLEVEL=8.6.4\r
+    SET TCLKIT_PATCHLEVEL=8.6.6\r
   )\r
   SET TCLKIT_VERSION=%TCLKIT_PATCHLEVEL:.=%\r
   SET TCLKIT_VERSION=%TCLKIT_VERSION:~0,2%\r
-  SET TCLKIT_EXE=tclkit-%TCLKIT_PATCHLEVEL%.exe\r
+  REM SET TCLKIT_EXE=tclkit-%TCLKIT_PATCHLEVEL%.exe\r
+  SET TCLKIT_EXE=tclkit-8.6.4.exe\r
   SET TCLKIT_LIB=libtclkit%TCLKIT_PATCHLEVEL:.=%.lib\r
   SET TCLKIT_LIB_STUB=libtclstub%TCLKIT_VERSION:.=%.a\r
   SET TCLKIT_SDK=libtclkit-sdk-x86-%TCLKIT_PATCHLEVEL%\r
@@ -210,20 +219,19 @@ GOTO no_errors
   GOTO :EOF\r
 \r
 :fn_TclKitX64Variables\r
+  REM\r
+  REM NOTE: By default, use latest available version of the TclKit SDK\r
+  REM       for x64.  However, the "default" TclKit executable for x86\r
+  REM       is still used here because it is the only one "well-known"\r
+  REM       to be available for download.\r
+  REM\r
   IF NOT DEFINED TCLKIT_PATCHLEVEL (\r
-    REM\r
-    REM NOTE: By default, use latest available version of the TclKit SDK\r
-    REM       for x64.  However, the "default" TclKit executable for x86\r
-    REM       is still used here because it is the only one "well-known"\r
-    REM       to be available for download.\r
-    REM\r
-    SET TCLKIT_PATCHLEVEL=8.6.3\r
-    SET TCLKIT_EXE=tclkit-8.6.4.exe\r
-  ) ELSE (\r
-    SET TCLKIT_EXE=tclkit-%TCLKIT_PATCHLEVEL%.exe\r
+    SET TCLKIT_PATCHLEVEL=8.6.6\r
   )\r
   SET TCLKIT_VERSION=%TCLKIT_PATCHLEVEL:.=%\r
   SET TCLKIT_VERSION=%TCLKIT_VERSION:~0,2%\r
+  REM SET TCLKIT_EXE=tclkit-%TCLKIT_PATCHLEVEL%.exe\r
+  SET TCLKIT_EXE=tclkit-8.6.4.exe\r
   SET TCLKIT_LIB=libtclkit%TCLKIT_PATCHLEVEL:.=%.lib\r
   SET TCLKIT_LIB_STUB=libtclstub%TCLKIT_VERSION:.=%.a\r
   SET TCLKIT_SDK=libtclkit-sdk-x64-%TCLKIT_PATCHLEVEL%\r