fix use a new oficial boost repo
This commit is contained in:
parent
d29e596330
commit
f292becab4
|
@ -69,6 +69,7 @@ UNREAL_HOSTED_CFLAGS="--sysroot=$UE4_ROOT/Engine/Extras/ThirdPartyNotUE/SDKs/Hos
|
|||
|
||||
BOOST_VERSION=1.80.0
|
||||
BOOST_BASENAME="boost-${BOOST_VERSION}-${CXX_TAG}"
|
||||
BOOST_SHA256SUM="4b2136f98bdd1f5857f1c3dea9ac2018effe65286cf251534b6ae20cc45e1847"
|
||||
|
||||
BOOST_INCLUDE=${PWD}/${BOOST_BASENAME}-install/include
|
||||
BOOST_LIBPATH=${PWD}/${BOOST_BASENAME}-install/lib
|
||||
|
@ -91,9 +92,9 @@ for PY_VERSION in ${PY_VERSION_LIST[@]} ; do
|
|||
BOOST_PACKAGE_BASENAME=boost_${BOOST_VERSION//./_}
|
||||
|
||||
log "Retrieving boost."
|
||||
wget "https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/${BOOST_PACKAGE_BASENAME}.tar.gz" || true
|
||||
wget "https://archives.boost.io/release/${BOOST_VERSION}/source/${BOOST_PACKAGE_BASENAME}.tar.gz" || true
|
||||
# try to use the backup boost we have in Jenkins
|
||||
if [[ ! -f "${BOOST_PACKAGE_BASENAME}.tar.gz" ]] ; then
|
||||
if [[ ! -f "${BOOST_PACKAGE_BASENAME}.tar.gz" ] || [! echo "${BOOST_SHA256SUM} ${BOOST_PACKAGE_BASENAME}.tar.gz" | sha256sum -c --status]] ; then
|
||||
log "Using boost backup"
|
||||
wget "https://carla-releases.s3.eu-west-3.amazonaws.com/Backup/${BOOST_PACKAGE_BASENAME}.tar.gz" || true
|
||||
fi
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
@echo off
|
||||
setlocal
|
||||
setlocal enabledelayedexpansion
|
||||
|
||||
rem BAT script that downloads and installs a ready to use
|
||||
rem boost build for CARLA (carla.org).
|
||||
|
@ -66,12 +66,13 @@ rem -- Local Variables ---------------------------------------------------------
|
|||
rem ============================================================================
|
||||
|
||||
set BOOST_BASENAME=boost-%BOOST_VERSION%
|
||||
set BOOST_SHA256SUM="e34756f63abe8ac34b35352743f17d061fcc825969a2dd8458264edb38781782"
|
||||
|
||||
set BOOST_TEMP_FOLDER=boost_%BOOST_VERSION:.=_%
|
||||
set BOOST_TEMP_FILE=%BOOST_TEMP_FOLDER%.zip
|
||||
set BOOST_TEMP_FILE_DIR=%BUILD_DIR%%BOOST_TEMP_FILE%
|
||||
|
||||
set BOOST_REPO=https://boostorg.jfrog.io/artifactory/main/release/%BOOST_VERSION%/source/%BOOST_TEMP_FILE%
|
||||
set BOOST_REPO=https://archives.boost.io/release/%BOOST_VERSION%/source/%BOOST_TEMP_FILE%
|
||||
set BOOST_SRC_DIR=%BUILD_DIR%%BOOST_BASENAME%-source\
|
||||
set BOOST_INSTALL_DIR=%BUILD_DIR%%BOOST_BASENAME%-install\
|
||||
set BOOST_LIB_DIR=%BOOST_INSTALL_DIR%lib\
|
||||
|
@ -84,16 +85,20 @@ if exist "%BOOST_INSTALL_DIR%" (
|
|||
goto already_build
|
||||
)
|
||||
|
||||
set _checksum=""
|
||||
|
||||
if not exist "%BOOST_SRC_DIR%" (
|
||||
if not exist "%BOOST_TEMP_FILE_DIR%" (
|
||||
echo %FILE_N% Retrieving boost.
|
||||
powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%BOOST_REPO%', '%BOOST_TEMP_FILE_DIR%')"
|
||||
call :CheckSumEvaluate %BOOST_TEMP_FILE_DIR%,%BOOST_SHA256SUM%,_checksum
|
||||
)
|
||||
if not exist "%BOOST_TEMP_FILE_DIR%" (
|
||||
if "!_checksum!" == "1" (
|
||||
echo %FILE_N% Using Boost backup
|
||||
powershell -Command "(New-Object System.Net.WebClient).DownloadFile('https://carla-releases.s3.eu-west-3.amazonaws.com/Backup/%BOOST_TEMP_FILE%', '%BOOST_TEMP_FILE_DIR%')"
|
||||
call :CheckSumEvaluate %BOOST_TEMP_FILE_DIR%,%BOOST_SHA256SUM%,_checksum
|
||||
)
|
||||
if %errorlevel% neq 0 goto error_download
|
||||
if "!_checksum!" == "1" goto error_download
|
||||
echo %FILE_N% Extracting boost from "%BOOST_TEMP_FILE%", this can take a while...
|
||||
if exist "%ProgramW6432%/7-Zip/7z.exe" (
|
||||
"%ProgramW6432%/7-Zip/7z.exe" x "%BOOST_TEMP_FILE_DIR%" -o"%BUILD_DIR%" -y
|
||||
|
@ -197,3 +202,25 @@ rem ============================================================================
|
|||
echo %FILE_N% Exiting with error...
|
||||
endlocal
|
||||
exit /b %errorlevel%
|
||||
|
||||
:CheckSumEvaluate
|
||||
set filepath=%1
|
||||
set checksum=%2
|
||||
|
||||
echo %FILE_N% calculating %filepath% checksum...
|
||||
|
||||
set PsCommand="(Get-FileHash %filepath%).Hash -eq '%checksum%'"
|
||||
|
||||
for /f %%F in ('Powershell -C %PsCommand%') do (
|
||||
set filechecksum=%%F
|
||||
)
|
||||
|
||||
if %filechecksum% == True (
|
||||
echo %FILE_N% %filepath% checksum OK
|
||||
set "%~3=0"
|
||||
exit /b 0
|
||||
) else (
|
||||
echo %FILE_N% %filepath% BAD SHA256 checksum
|
||||
set "%~3=1"
|
||||
exit /b 1
|
||||
)
|
Loading…
Reference in New Issue