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

Use bjam user-config for travis builds alone

This commit is contained in:
Praveen Palanisamy 2018-12-04 12:57:57 -05:00
parent 330febeb07
commit eb1e32b6e0
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Util/BuildTools/Setup.sh
View File

@ -103,7 +103,14 @@ else
--prefix=../boost-install \
--with-libraries=python,filesystem \
--with-python=${py2} --with-python-root=${py2_root}
echo "using python : ${pyv} : ${py2_root}/bin/python2 ;" > project-config.jam
if ${CI}
then
echo "using python : ${pyv} : ${py2_root}/bin/python2 ;" > ${HOME}/user-config.jam
else
echo "using python : ${pyv} : ${py2_root}/bin/python2 ;" > project-config.jam
fi
./b2 toolset="${BOOST_TOOLSET}" cxxflags="${BOOST_CFLAGS}" --prefix="../${BOOST_BASENAME}-install" -j ${CARLA_BUILD_CONCURRENCY} stage release
./b2 toolset="${BOOST_TOOLSET}" cxxflags="${BOOST_CFLAGS}" --prefix="../${BOOST_BASENAME}-install" -j ${CARLA_BUILD_CONCURRENCY} install
./b2 toolset="${BOOST_TOOLSET}" cxxflags="${BOOST_CFLAGS}" --prefix="../${BOOST_BASENAME}-install" -j ${CARLA_BUILD_CONCURRENCY} --clean-all
@ -124,7 +131,14 @@ else
--prefix=../boost-install \
--with-libraries=python \
--with-python=${py3} --with-python-root=${py3_root}
echo "using python : ${pyv} : ${py3_root}/bin/python3 ;" > project-config.jam
if ${CI}
then
echo "using python : ${pyv} : ${py3_root}/bin/python3 ;" > ${HOME}/user-config.jam
else
echo "using python : ${pyv} : ${py3_root}/bin/python3 ;" > project-config.jam
fi
./b2 toolset="${BOOST_TOOLSET}" cxxflags="${BOOST_CFLAGS}" --prefix="../${BOOST_BASENAME}-install" -j ${CARLA_BUILD_CONCURRENCY} stage release
./b2 toolset="${BOOST_TOOLSET}" cxxflags="${BOOST_CFLAGS}" --prefix="../${BOOST_BASENAME}-install" -j ${CARLA_BUILD_CONCURRENCY} install