/ Check-in [baceb988]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Minor enhancement to the TclKit batch tool: it should download the TclKit EXE alone when the TCLKIT_NOENV environment variable is set.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: baceb988c6f4e93134e6a63173e846af2b73531a
User & Date: mistachkin 2016-09-17 22:46:13
Context
2016-09-18
16:08
Revise the implementation of OP_Once so that it is smaller, faster, and uses less memory. This also fixes an obscure bug introduced 3 days ago by check-in [5990a1bdb4a073]. check-in: 6bf5ba10 user: drh tags: trunk
2016-09-17
22:46
Minor enhancement to the TclKit batch tool: it should download the TclKit EXE alone when the TCLKIT_NOENV environment variable is set. check-in: baceb988 user: mistachkin tags: trunk
19:34
Small performance optimization in the freeSpace() routine of btree.c. check-in: 63962e2a user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to tool/GetTclKit.bat.

    73     73     CALL :fn_TclKitX64Variables
    74     74   ) ELSE (
    75     75     GOTO usage
    76     76   )
    77     77   
    78     78   %_VECHO% TclKitVersion = '%TCLKIT_VERSION%'
    79     79   %_VECHO% TclKitPatchLevel = '%TCLKIT_PATCHLEVEL%'
           80  +%_VECHO% TclKitNoEnv = '%TCLKIT_NOENV%'
    80     81   %_VECHO% TclKitNoSdk = '%TCLKIT_NOSDK%'
    81     82   %_VECHO% TclKitExe = '%TCLKIT_EXE%'
    82     83   %_VECHO% TclKitLib = '%TCLKIT_LIB%'
    83     84   %_VECHO% TclKitLibStub = '%TCLKIT_LIB_STUB%'
    84     85   %_VECHO% TclKitSdk = '%TCLKIT_SDK%'
    85     86   %_VECHO% TclKitSdkZip = '%TCLKIT_SDK_ZIP%'
    86     87   %_VECHO% TclKitFiles = '%TCLKIT_FILES%'
................................................................................
   143    144       IF ERRORLEVEL 1 (
   144    145         ECHO Download of "%%F" from "%TCLKIT_URI%" failed.
   145    146         GOTO errors
   146    147       )
   147    148     )
   148    149   )
   149    150   
          151  +IF DEFINED TCLKIT_NOENV GOTO skip_sdkUnZip
   150    152   IF DEFINED TCLKIT_NOSDK GOTO skip_sdkUnZip
   151    153   
   152    154   IF NOT EXIST "%TEMP%\%TCLKIT_SDK%" (
   153    155     %__ECHO% MKDIR "%TEMP%\%TCLKIT_SDK%"
   154    156   
   155    157     IF ERRORLEVEL 1 (
   156    158       ECHO Could not create directory "%TEMP%\%TCLKIT_SDK%".
................................................................................
   162    164   
   163    165   IF ERRORLEVEL 1 (
   164    166     ECHO Could not unzip "%TEMP%\%TCLKIT_SDK_ZIP%" to "%TEMP%\%TCLKIT_SDK%".
   165    167     GOTO errors
   166    168   )
   167    169   
   168    170   :skip_sdkUnZip
          171  +
          172  +IF DEFINED TCLKIT_NOENV GOTO skip_sdkEnvironment
   169    173   
   170    174   %__ECHO% ECHO SET TCLSH_CMD=%TEMP%\%TCLKIT_EXE%%OVERWRITE%"%ROOT%\SetTclKitEnv.bat"
   171    175   
   172    176   IF DEFINED TCLKIT_NOSDK GOTO skip_sdkVariables
   173    177   
   174    178   %__ECHO% ECHO SET TCLINCDIR=%TEMP%\%TCLKIT_SDK%\include%APPEND%"%ROOT%\SetTclKitEnv.bat"
   175    179   %__ECHO% ECHO SET TCLLIBDIR=%TEMP%\%TCLKIT_SDK%\lib%APPEND%"%ROOT%\SetTclKitEnv.bat"
................................................................................
   180    184   :skip_sdkVariables
   181    185   
   182    186   ECHO.
   183    187   ECHO Wrote "%ROOT%\SetTclKitEnv.bat".
   184    188   ECHO Please run it to set the necessary Tcl environment variables.
   185    189   ECHO.
   186    190   
          191  +:skip_sdkEnvironment
          192  +
   187    193   GOTO no_errors
   188    194   
   189    195   :fn_TclKitX86Variables
   190    196     IF NOT DEFINED TCLKIT_PATCHLEVEL (
   191    197       SET TCLKIT_PATCHLEVEL=8.6.4
   192    198     )
   193    199     SET TCLKIT_VERSION=%TCLKIT_PATCHLEVEL:.=%
................................................................................
   194    200     SET TCLKIT_VERSION=%TCLKIT_VERSION:~0,2%
   195    201     SET TCLKIT_EXE=tclkit-%TCLKIT_PATCHLEVEL%.exe
   196    202     SET TCLKIT_LIB=libtclkit%TCLKIT_PATCHLEVEL:.=%.lib
   197    203     SET TCLKIT_LIB_STUB=libtclstub%TCLKIT_VERSION:.=%.a
   198    204     SET TCLKIT_SDK=libtclkit-sdk-x86-%TCLKIT_PATCHLEVEL%
   199    205     SET TCLKIT_SDK_ZIP=%TCLKIT_SDK%.zip
   200    206     SET TCLKIT_FILES=%TCLKIT_EXE%
   201         -  IF NOT DEFINED TCLKIT_NOSDK (
          207  +  IF NOT DEFINED TCLKIT_NOENV IF NOT DEFINED TCLKIT_NOSDK (
   202    208       SET TCLKIT_FILES=%TCLKIT_FILES% unzip.exe %TCLKIT_SDK_ZIP%
   203    209     )
   204    210     GOTO :EOF
   205    211   
   206    212   :fn_TclKitX64Variables
   207    213     IF NOT DEFINED TCLKIT_PATCHLEVEL (
   208    214       REM
................................................................................
   219    225     SET TCLKIT_VERSION=%TCLKIT_PATCHLEVEL:.=%
   220    226     SET TCLKIT_VERSION=%TCLKIT_VERSION:~0,2%
   221    227     SET TCLKIT_LIB=libtclkit%TCLKIT_PATCHLEVEL:.=%.lib
   222    228     SET TCLKIT_LIB_STUB=libtclstub%TCLKIT_VERSION:.=%.a
   223    229     SET TCLKIT_SDK=libtclkit-sdk-x64-%TCLKIT_PATCHLEVEL%
   224    230     SET TCLKIT_SDK_ZIP=%TCLKIT_SDK%.zip
   225    231     SET TCLKIT_FILES=%TCLKIT_EXE%
   226         -  IF NOT DEFINED TCLKIT_NOSDK (
          232  +  IF NOT DEFINED TCLKIT_NOENV IF NOT DEFINED TCLKIT_NOSDK (
   227    233       SET TCLKIT_FILES=%TCLKIT_FILES% unzip.exe %TCLKIT_SDK_ZIP%
   228    234     )
   229    235     GOTO :EOF
   230    236   
   231    237   :fn_UnquoteVariable
   232    238     IF NOT DEFINED %1 GOTO :EOF
   233    239     SETLOCAL