Index: third_party/sqlite/src/tool/GetTclKit.bat |
diff --git a/third_party/sqlite/src/tool/GetTclKit.bat b/third_party/sqlite/src/tool/GetTclKit.bat |
index 0a2487e6d638010f22e1c75df4c10941a71f1c85..c30d1075f816048d996ce1aa69723a30a79bfed4 100644 |
--- a/third_party/sqlite/src/tool/GetTclKit.bat |
+++ b/third_party/sqlite/src/tool/GetTclKit.bat |
@@ -77,6 +77,7 @@ IF /I "%PROCESSOR%" == "x86" ( |
%_VECHO% TclKitVersion = '%TCLKIT_VERSION%' |
%_VECHO% TclKitPatchLevel = '%TCLKIT_PATCHLEVEL%' |
+%_VECHO% TclKitNoEnv = '%TCLKIT_NOENV%' |
%_VECHO% TclKitNoSdk = '%TCLKIT_NOSDK%' |
%_VECHO% TclKitExe = '%TCLKIT_EXE%' |
%_VECHO% TclKitLib = '%TCLKIT_LIB%' |
@@ -147,6 +148,7 @@ FOR %%F IN (%TCLKIT_FILES%) DO ( |
) |
) |
+IF DEFINED TCLKIT_NOENV GOTO skip_sdkUnZip |
IF DEFINED TCLKIT_NOSDK GOTO skip_sdkUnZip |
IF NOT EXIST "%TEMP%\%TCLKIT_SDK%" ( |
@@ -167,6 +169,8 @@ IF ERRORLEVEL 1 ( |
:skip_sdkUnZip |
+IF DEFINED TCLKIT_NOENV GOTO skip_sdkEnvironment |
+ |
%__ECHO% ECHO SET TCLSH_CMD=%TEMP%\%TCLKIT_EXE%%OVERWRITE%"%ROOT%\SetTclKitEnv.bat" |
IF DEFINED TCLKIT_NOSDK GOTO skip_sdkVariables |
@@ -184,6 +188,8 @@ ECHO Wrote "%ROOT%\SetTclKitEnv.bat". |
ECHO Please run it to set the necessary Tcl environment variables. |
ECHO. |
+:skip_sdkEnvironment |
+ |
GOTO no_errors |
:fn_TclKitX86Variables |
@@ -198,7 +204,7 @@ GOTO no_errors |
SET TCLKIT_SDK=libtclkit-sdk-x86-%TCLKIT_PATCHLEVEL% |
SET TCLKIT_SDK_ZIP=%TCLKIT_SDK%.zip |
SET TCLKIT_FILES=%TCLKIT_EXE% |
- IF NOT DEFINED TCLKIT_NOSDK ( |
+ IF NOT DEFINED TCLKIT_NOENV IF NOT DEFINED TCLKIT_NOSDK ( |
SET TCLKIT_FILES=%TCLKIT_FILES% unzip.exe %TCLKIT_SDK_ZIP% |
) |
GOTO :EOF |
@@ -223,7 +229,7 @@ GOTO no_errors |
SET TCLKIT_SDK=libtclkit-sdk-x64-%TCLKIT_PATCHLEVEL% |
SET TCLKIT_SDK_ZIP=%TCLKIT_SDK%.zip |
SET TCLKIT_FILES=%TCLKIT_EXE% |
- IF NOT DEFINED TCLKIT_NOSDK ( |
+ IF NOT DEFINED TCLKIT_NOENV IF NOT DEFINED TCLKIT_NOSDK ( |
SET TCLKIT_FILES=%TCLKIT_FILES% unzip.exe %TCLKIT_SDK_ZIP% |
) |
GOTO :EOF |