Index: apps/build.tcl =================================================================== diff -u -rdd6a0a0b50197df4c8b442b7c9f43ec4410f2b8f -r00ac4c06c0bd3ffbf16c098d703040974f439ae0 --- apps/build.tcl (.../build.tcl) (revision dd6a0a0b50197df4c8b442b7c9f43ec4410f2b8f) +++ apps/build.tcl (.../build.tcl) (revision 00ac4c06c0bd3ffbf16c098d703040974f439ae0) @@ -32,29 +32,36 @@ ::http::geturl $URL \ -binary true \ -channel $fh + close $fh + # seek $fh 0 + # zlib push gunzip $fh + # ::tar::untar $fh -chan + + exec >@stdout 2>@stderr bash -lc "7z x $tarball -so | 7z x -aoa -si -ttar -o tcl" - seek $fh 0 - zlib push gunzip $fh - ::tar::untar $fh -chan - } on error {e opts} { file delete -force tcl return -options $opts $e } finally { - close $fh + catch {close $fh} file delete -force $tarball } + + + } else { # fall back to using curl exec >@stdout 2>@stderr bash -lc "curl -L -k -o $tarball $URL" - set fh [open $tarball rb] + # set fh [open $tarball rb] try { - zlib push gunzip $fh - ::tar::untar $fh -chan + # zlib push gunzip $fh + # ::tar::untar $fh -chan + exec >@stdout 2>@stderr bash -lc "7z x $tarball -so | 7z x -aoa -si -ttar -o tcl" + } finally { - close $fh + # close $fh file delete -force $tarball } } Index: appveyor.yml =================================================================== diff -u -ra0e21882d0c0039a2059bf3b4eef202ae6275ace -r00ac4c06c0bd3ffbf16c098d703040974f439ae0 --- appveyor.yml (.../appveyor.yml) (revision a0e21882d0c0039a2059bf3b4eef202ae6275ace) +++ appveyor.yml (.../appveyor.yml) (revision 00ac4c06c0bd3ffbf16c098d703040974f439ae0) @@ -61,7 +61,6 @@ - if not exist "%MINGW_ARCHIVE%" appveyor DownloadFile "%MINGW_URL%" -FileName "%MINGW_ARCHIVE%" - 7z x -y "%MINGW_ARCHIVE%" > nul - if not exist "%TCLKIT%" appveyor DownloadFile "%TCLKIT_URL%" -FileName "%TCLKIT%" - - echo PWD=%CD% - dir %MINGW_DIR% build_script: @@ -75,6 +74,7 @@ - if "%TOOLCHAIN%" == "autoconf-tea" bash -lc "cd && echo \"export PATH=/c/projects/nsf-2ylk0/mingw64/bin:\$PATH; export MSYSTEM=MINGW64; export MINGW_PREFIX=/c; alias make='/c/msys64/usr/bin/make'; shopt -s expand_aliases; \" >> .profile" - if "%TOOLCHAIN%" == "autoconf-tea" bash -lc "sh --version" - if "%TOOLCHAIN%" == "autoconf-tea" bash -lc "make --version" + - dir %CD% - tclkit.exe apps/build.tcl %CD% %APPVEYOR_BUILD_FOLDER% %TCLTAG% %TOOLCHAIN% on_failure: