Enhancements to TclKit batch tool for MSVC.

FossilOrigin-Name: 2a8a4552112be6e39e3475e9a8579582b5157086d3efd37971463c0e3958068d

diff --git a/manifest b/manifest
index 0405d778b7d28a8754d7088226e49a865c84be8c..8d574d199e6a2c219c5150d2aea4919bb2f6f90c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,9 @@
 B 3e2643619d122616663688533977d6c60d45a269b4e2bdc330fd3ee5d39f2e03
-C Fix\stypo\sin\sa\sdocumentation\scomment.
-D 2020-10-14T21:30:56.712
+C Enhancements\sto\sTclKit\sbatch\stool\sfor\sMSVC.
+D 2020-10-14T21:31:20.801
 F src/sqlite.h.in ff32663b457306eb88c3039868280aa39da31162ed69c4e71fa8e028684e7277
-P 3e2643619d122616663688533977d6c60d45a269b4e2bdc330fd3ee5d39f2e03
-R f2cdeae9fbbf8c968aa0da3cd70c5e67
+F tool/GetTclKit.bat e95747c0f7a9fe279a9979178b71f6431a21f945b390fc3120244897ff3f5135
+P 462adc7d6b14de3862c2a3e57dba7efaf2ba9c104e1c127a5801a7b892059872
+R 3162f2d98ba7e72ea341cc0a18bf24df
 U mistachkin
-Z 6e1c34305348e206be5e4532458d1494
+Z ab2d12d31d9446cbfffdb488dc02a0a5

diff --git a/manifest.uuid b/manifest.uuid
index fd005eda89c5b1564b98c960470359b1f025792f..f46fc0229d1319b28bb4798086bac1cd5272f996 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-462adc7d6b14de3862c2a3e57dba7efaf2ba9c104e1c127a5801a7b892059872
\ No newline at end of file
+2a8a4552112be6e39e3475e9a8579582b5157086d3efd37971463c0e3958068d
\ No newline at end of file

diff --git a/tool/GetTclKit.bat b/tool/GetTclKit.bat
index 0cc62b3f8c7d4f278624d2458d55b06257cc0438..e2be7c7f6c1317d0b2b96eafd94725acd309a2bd 100644 (file)
--- a/tool/GetTclKit.bat
+++ b/tool/GetTclKit.bat
@@ -39,10 +39,11 @@ IF DEFINED DUMMY2 (
   GOTO usage\r
 )\r
 \r
-SET ROOT=%~dp0\..\r
-SET ROOT=%ROOT:\\=\%\r
+IF NOT DEFINED ENVDIR (\r
+  SET ENVDIR=%CD%\r
+)\r
 \r
-%_VECHO% Root = '%ROOT%'\r
+%_VECHO% EnvDir = '%ENVDIR%'\r
 \r
 SET TOOLS=%~dp0\r
 SET TOOLS=%TOOLS:~0,-1%\r
@@ -64,21 +65,42 @@ IF NOT DEFINED TEMP (
 %_VECHO% Temp = '%TEMP%'\r
 \r
 IF NOT DEFINED TCLKIT_URI (\r
-  SET TCLKIT_URI=https://tclsh.com/\r
+  SET TCLKIT_URI=https://urn.to/r/tclsh/\r
 )\r
 \r
 %_VECHO% TclKitUri = '%TCLKIT_URI%'\r
 \r
+IF NOT DEFINED TCLKIT_PATCHLEVEL (\r
+  SET TCLKIT_PATCHLEVEL=8.6.6\r
+)\r
+\r
+%_VECHO% TclKitPatchLevel = '%TCLKIT_PATCHLEVEL%'\r
+\r
+IF NOT DEFINED TCLKIT_EXE_PATCHLEVEL (\r
+  SET TCLKIT_EXE_PATCHLEVEL=8.6.4\r
+)\r
+\r
+%_VECHO% TclKitExePatchLevel = '%TCLKIT_EXE_PATCHLEVEL%'\r
+\r
 IF /I "%PROCESSOR%" == "x86" (\r
   CALL :fn_TclKitX86Variables\r
+\r
+  IF ERRORLEVEL 1 (\r
+    GOTO errors\r
+  )\r
 ) ELSE IF /I "%PROCESSOR%" == "x64" (\r
   CALL :fn_TclKitX64Variables\r
+\r
+  IF ERRORLEVEL 1 (\r
+    GOTO errors\r
+  )\r
 ) ELSE (\r
   GOTO usage\r
 )\r
 \r
 %_VECHO% TclKitVersion = '%TCLKIT_VERSION%'\r
 %_VECHO% TclKitPatchLevel = '%TCLKIT_PATCHLEVEL%'\r
+%_VECHO% TclKitExePatchLevel = '%TCLKIT_EXE_PATCHLEVEL%'\r
 %_VECHO% TclKitNoEnv = '%TCLKIT_NOENV%'\r
 %_VECHO% TclKitNoSdk = '%TCLKIT_NOSDK%'\r
 %_VECHO% TclKitExe = '%TCLKIT_EXE%'\r
@@ -173,20 +195,20 @@ IF ERRORLEVEL 1 (
 \r
 IF DEFINED TCLKIT_NOENV GOTO skip_sdkEnvironment\r
 \r
-%__ECHO% ECHO SET TCLSH_CMD=%TEMP%\%TCLKIT_EXE%%OVERWRITE%"%ROOT%\SetTclKitEnv.bat"\r
+%__ECHO% ECHO SET TCLSH_CMD=%TEMP%\%TCLKIT_EXE%%OVERWRITE%"%ENVDIR%\SetTclKitEnv.bat"\r
 \r
 IF DEFINED TCLKIT_NOSDK GOTO skip_sdkVariables\r
 \r
-%__ECHO% ECHO SET TCLINCDIR=%TEMP%\%TCLKIT_SDK%\include%APPEND%"%ROOT%\SetTclKitEnv.bat"\r
-%__ECHO% ECHO SET TCLLIBDIR=%TEMP%\%TCLKIT_SDK%\lib%APPEND%"%ROOT%\SetTclKitEnv.bat"\r
-%__ECHO% ECHO SET LIBTCLPATH=%TEMP%\%TCLKIT_SDK%\lib%APPEND%"%ROOT%\SetTclKitEnv.bat"\r
-%__ECHO% ECHO SET LIBTCL=%TCLKIT_LIB%%APPEND%"%ROOT%\SetTclKitEnv.bat"\r
-%__ECHO% ECHO SET LIBTCLSTUB=%TCLKIT_LIB_STUB%%APPEND%"%ROOT%\SetTclKitEnv.bat"\r
+%__ECHO% ECHO SET TCLINCDIR=%TEMP%\%TCLKIT_SDK%\include%APPEND%"%ENVDIR%\SetTclKitEnv.bat"\r
+%__ECHO% ECHO SET TCLLIBDIR=%TEMP%\%TCLKIT_SDK%\lib%APPEND%"%ENVDIR%\SetTclKitEnv.bat"\r
+%__ECHO% ECHO SET LIBTCLPATH=%TEMP%\%TCLKIT_SDK%\lib%APPEND%"%ENVDIR%\SetTclKitEnv.bat"\r
+%__ECHO% ECHO SET LIBTCL=%TCLKIT_LIB%%APPEND%"%ENVDIR%\SetTclKitEnv.bat"\r
+%__ECHO% ECHO SET LIBTCLSTUB=%TCLKIT_LIB_STUB%%APPEND%"%ENVDIR%\SetTclKitEnv.bat"\r
 \r
 :skip_sdkVariables\r
 \r
 ECHO.\r
-ECHO Wrote "%ROOT%\SetTclKitEnv.bat".\r
+ECHO Wrote "%ENVDIR%\SetTclKitEnv.bat".\r
 ECHO Please run it to set the necessary Tcl environment variables.\r
 ECHO.\r
 \r
@@ -202,12 +224,17 @@ GOTO no_errors
   REM       to be available for download.\r
   REM\r
   IF NOT DEFINED TCLKIT_PATCHLEVEL (\r
-    SET TCLKIT_PATCHLEVEL=8.6.6\r
+    ECHO The TCLKIT_PATCHLEVEL environment variable must be set first.\r
+    CALL :fn_SetErrorLevel\r
+    GOTO :EOF\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
+  IF DEFINED TCLKIT_EXE_PATCHLEVEL (\r
+    SET TCLKIT_EXE=tclkit-%TCLKIT_EXE_PATCHLEVEL%.exe\r
+  ) ELSE (\r
+    SET TCLKIT_EXE=tclkit-%TCLKIT_PATCHLEVEL%.exe\r
+  )\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
@@ -226,12 +253,17 @@ GOTO no_errors
   REM       to be available for download.\r
   REM\r
   IF NOT DEFINED TCLKIT_PATCHLEVEL (\r
-    SET TCLKIT_PATCHLEVEL=8.6.6\r
+    ECHO The TCLKIT_PATCHLEVEL environment variable must be set first.\r
+    CALL :fn_SetErrorLevel\r
+    GOTO :EOF\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
+  IF DEFINED TCLKIT_EXE_PATCHLEVEL (\r
+    SET TCLKIT_EXE=tclkit-%TCLKIT_EXE_PATCHLEVEL%.exe\r
+  ) ELSE (\r
+    SET TCLKIT_EXE=tclkit-%TCLKIT_PATCHLEVEL%.exe\r
+  )\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