From 5e4e82ab2e1dc4bdf6254d9592401e19b6ceba76 Mon Sep 17 00:00:00 2001 From: bernatx Date: Mon, 17 Oct 2022 09:37:49 +0200 Subject: [PATCH] upgrade zlib to 1.2.13 and add backup --- Util/InstallersWin/install_zlib.bat | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Util/InstallersWin/install_zlib.bat b/Util/InstallersWin/install_zlib.bat index 731e7c3cf..daa08ab4a 100644 --- a/Util/InstallersWin/install_zlib.bat +++ b/Util/InstallersWin/install_zlib.bat @@ -48,14 +48,14 @@ rem -- Local Variables --------------------------------------------------------- rem ============================================================================ set ZLIB_BASENAME=zlib -set ZLIB_VERSION=1.2.12 +set ZLIB_VERSION=1.2.13 set ZLIB_TEMP_FOLDER=%ZLIB_BASENAME%-%ZLIB_VERSION% set ZLIB_TEMP_FILE=%ZLIB_TEMP_FOLDER%.zip set ZLIB_TEMP_FILE_DIR=%BUILD_DIR%%ZLIB_TEMP_FILE% -set ZLIB_REPO=http://www.zlib.net/zlib%ZLIB_VERSION:.=%.zip - +set ZLIB_REPO=https://www.zlib.net/zlib%ZLIB_VERSION:.=%.zip +set ZLIB_BACKUP_REPO=https://carla-releases.s3.eu-west-3.amazonaws.com/Backup/zlib%ZLIB_VERSION:.=%.zip set ZLIB_SRC_DIR=%BUILD_DIR%%ZLIB_BASENAME%-source\ set ZLIB_INSTALL_DIR=%BUILD_DIR%%ZLIB_BASENAME%-install\ @@ -71,6 +71,10 @@ if not exist "%ZLIB_SRC_DIR%" ( if not exist "%ZLIB_TEMP_FILE_DIR%" ( echo %FILE_N% Retrieving %ZLIB_BASENAME%. powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%ZLIB_REPO%', '%ZLIB_TEMP_FILE_DIR%')" + if %errorlevel% == 0 ( + echo %FILE_N% Retrieving %ZLIB_BASENAME% from backup. + powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%ZLIB_BACKUP_REPO%', '%ZLIB_TEMP_FILE_DIR%')" + ) if %errorlevel% neq 0 goto error_download ) rem Extract the downloaded library