p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade rpclib to fix race condition

This commit is contained in:
nsubiron 2019-07-03 19:19:57 +02:00 committed by Néstor Subirón
parent e0cdc80cc1
commit 1f0ca9dec5
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Util/BuildTools/Setup.sh
View File

@ -157,7 +157,7 @@ unset BOOST_BASENAME
# -- Get rpclib and compile it with libc++ and libstdc++ -----------------------
# ==============================================================================
RPCLIB_PATCH=v2.2.1_c1
RPCLIB_PATCH=v2.2.1_c2
RPCLIB_BASENAME=rpclib-${RPCLIB_PATCH}-${CXX_TAG}
RPCLIB_LIBCXX_INCLUDE=${PWD}/${RPCLIB_BASENAME}-libcxx-install/include

7
Util/InstallersWin/install_rpclib.bat
View File

@ -33,7 +33,7 @@ if not "%1"=="" (
goto :arg-parse
)
set RPC_VERSION=d1146b7
set RPC_VERSION=v2.2.1_c2
set RPC_SRC=rpclib-src
set RPC_SRC_DIR=%BUILD_DIR%%RPC_SRC%\
set RPC_INSTALL=rpclib-install
@ -49,11 +49,8 @@ if exist "%RPC_INSTALL_DIR%" (
if not exist "%RPC_SRC_DIR%" (
echo %FILE_N% Cloning rpclib - version "%RPC_VERSION%"...
call git clone https://github.com/rpclib/rpclib.git %RPC_SRC_DIR%
call git clone -b %RPC_VERSION% https://github.com/carla-simulator/rpclib.git %RPC_SRC_DIR%
if %errorlevel% neq 0 goto error_git
pushd %PUSHD_RPC%
call git reset --hard d1146b7
popd
) else (
echo %FILE_N% Not cloning rpclib because already exists a folder called "%RPC_SRC%".
)