The TclKit batch tool should not download the TclKit SDK when the TCLKIT_NOSDK enviro...

FossilOrigin-Name: 7c5d583bac89f8db94e7f73df09e1d04f0f24990

diff --git a/manifest b/manifest
index 3b57e44a3088bf8ef92c2e996fb32911d2d53a15..1dab58c169639749e249ec0e79aca0cc710131c8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sTclKit\sbatch\stool\s(and\sMSVC\smakefile)\sto\ssupport\stargets\sthat\srequire\sthe\sTcl\sstub\slibrary.
-D 2015-10-10T23:39:55.377
+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
 F Makefile.in 2a247c733c2dd6fab703df04dd009b26413956f5
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc f846966b1c38bdc12a384bd48bfbdb257fb5b558
@@ -1332,7 +1332,7 @@ F test/wordcount.c 9915e06cb33d8ca8109b8700791afe80d305afda
 F test/zeroblob.test 3857870fe681b8185654414a9bccfde80b62a0fa
 F test/zerodamage.test cf6748bad89553cc1632be51a6f54e487e4039ac
 F tool/GetFile.cs a15e08acb5dd7539b75ba23501581d7c2b462cb5
-F tool/GetTclKit.bat 32000d7c7cb27e5aac5d58789535bb1be662138f
+F tool/GetTclKit.bat f8159730269bdbf5c334383134011dda4df45511
 F tool/addopcodes.tcl 7cc82ecca456a6b3148abf492b0419b83140881a
 F tool/build-all-msvc.bat 761d8c82a1a529261291812732a853a1b4256d85 x
 F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
@@ -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 0f9e205b28e013412b19dfd588f2a6cf341c40e8
-R 3257d1b5b394e4f53f94f7465d06faaf
+P bc6223b1d6c31a47c7b734cfb8a9ecf15ab809fc
+R 47fe09613250f52fb94741367469a8c4
 U mistachkin
-Z ec0928dd2133e890176fa11b64cc0e8a
+Z c3b529016ed8bb4851b8f9db9d7c6231

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

diff --git a/tool/GetTclKit.bat b/tool/GetTclKit.bat
index 8e250d9793dd06694adb4a24c2e64eff12801078..31988aadacba12d90b05ac10d965abaab19e4f4a 100644 (file)
--- a/tool/GetTclKit.bat
+++ b/tool/GetTclKit.bat
@@ -196,7 +196,10 @@ GOTO no_errors
   SET TCLKIT_LIB_STUB=libtclstub%TCLKIT_VERSION:.=%.a\r
   SET TCLKIT_SDK=libtclkit-sdk-x86-%TCLKIT_PATCHLEVEL%\r
   SET TCLKIT_SDK_ZIP=%TCLKIT_SDK%.zip\r
-  SET TCLKIT_FILES=%TCLKIT_EXE% unzip.exe %TCLKIT_SDK_ZIP%\r
+  SET TCLKIT_FILES=%TCLKIT_EXE%\r
+  IF NOT DEFINED TCLKIT_NOSDK (\r
+    SET TCLKIT_FILES=%TCLKIT_FILES% unzip.exe %TCLKIT_SDK_ZIP%\r
+  )\r
   GOTO :EOF\r
 \r
 :fn_TclKitX64Variables\r
@@ -218,7 +221,10 @@ GOTO no_errors
   SET TCLKIT_LIB_STUB=libtclstub%TCLKIT_VERSION:.=%.a\r
   SET TCLKIT_SDK=libtclkit-sdk-x64-%TCLKIT_PATCHLEVEL%\r
   SET TCLKIT_SDK_ZIP=%TCLKIT_SDK%.zip\r
-  SET TCLKIT_FILES=%TCLKIT_EXE% unzip.exe %TCLKIT_SDK_ZIP%\r
+  SET TCLKIT_FILES=%TCLKIT_EXE%\r
+  IF NOT DEFINED TCLKIT_NOSDK (\r
+    SET TCLKIT_FILES=%TCLKIT_FILES% unzip.exe %TCLKIT_SDK_ZIP%\r
+  )\r
   GOTO :EOF\r
 \r
 :fn_UnquoteVariable\r