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

Revert not required Setup.sh changes

This commit is contained in:
Bernd Gassmann 2020-03-24 19:34:06 +01:00
parent 9139af555a
commit 45d0554483
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Util/BuildTools/Setup.sh
View File

@ -109,17 +109,15 @@ else
--with-libraries=python,filesystem,system,program_options \
--with-python=${py2} --with-python-root=${py2_root}
EXTRA_B2_ARGS=""
if [ "${TRAVIS}" == "true" ] ; then
if ${TRAVIS} ; 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
EXTRA_B2_ARGS="--ignore-user-config"
fi
./b2 "${EXTRA_B2_ARGS}" toolset="${BOOST_TOOLSET}" cxxflags="${BOOST_CFLAGS}" --prefix="../${BOOST_BASENAME}-install" -j "${CARLA_BUILD_CONCURRENCY}" stage release
./b2 "${EXTRA_B2_ARGS}" toolset="${BOOST_TOOLSET}" cxxflags="${BOOST_CFLAGS}" --prefix="../${BOOST_BASENAME}-install" -j "${CARLA_BUILD_CONCURRENCY}" install
./b2 "${EXTRA_B2_ARGS}" toolset="${BOOST_TOOLSET}" cxxflags="${BOOST_CFLAGS}" --prefix="../${BOOST_BASENAME}-install" -j "${CARLA_BUILD_CONCURRENCY}" --clean-all
./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
# Get rid of python2 build artifacts completely & do a clean build for python3
popd >/dev/null
@ -145,15 +143,14 @@ else
--with-libraries=python \
--with-python=${py3} --with-python-root=${py3_root}
if [ "${TRAVIS}" == "true" ] ; then
if ${TRAVIS} ; 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
EXTRA_B2_ARGS="--ignore-user-config"
fi
./b2 "${EXTRA_B2_ARGS}" toolset="${BOOST_TOOLSET}" cxxflags="${BOOST_CFLAGS}" --prefix="../${BOOST_BASENAME}-install" -j "${CARLA_BUILD_CONCURRENCY}" stage release
./b2 "${EXTRA_B2_ARGS}" 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} stage release
./b2 toolset="${BOOST_TOOLSET}" cxxflags="${BOOST_CFLAGS}" --prefix="../${BOOST_BASENAME}-install" -j ${CARLA_BUILD_CONCURRENCY} install
popd >/dev/null