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

Python 2 returns.

This commit is contained in:
Axel 2020-10-01 16:12:15 +02:00 committed by Axel1092
parent 247c27e6af
commit b6c650d438
4 changed files with 101 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Jenkinsfile vendored
View File

@ -43,7 +43,7 @@ pipeline
{
steps
{
sh 'make setup ARGS="--python-version=3.7"'
sh 'make setup ARGS="--python-version=3.7,2"'
}
}
stage('ubuntu build')
@ -51,8 +51,7 @@ pipeline
steps
{
sh 'make LibCarla'
sh 'make PythonAPI ARGS="--python-version=3.7"'
sh 'make PythonAPI ARGS="--python-version=2"'
sh 'make PythonAPI ARGS="--python-version=3.7,2"'
sh 'make CarlaUE4Editor'
sh 'make examples'
}
@ -69,7 +68,7 @@ pipeline
{
steps
{
sh 'make check ARGS="--all --xml --python-version=3.7"'
sh 'make check ARGS="--all --xml --python-version=3.7,2"'
}
post
{
@ -91,8 +90,8 @@ pipeline
{
steps
{
sh 'make package ARGS="--python-version=3.7"'
sh 'make package ARGS="--packages=AdditionalMaps --clean-intermediate --python-version=3.7"'
sh 'make package ARGS="--python-version=3.7,2"'
sh 'make package ARGS="--packages=AdditionalMaps --clean-intermediate --python-version=3.7,2"'
sh 'make examples ARGS="localhost 3654"'
}
post

9
Util/BuildTools/BuildPythonAPI.sh
View File

@ -21,7 +21,7 @@ OPTS=`getopt -o h --long help,rebuild,clean,rss,python-version:,packages:,clean-
eval set -- "$OPTS"
PY_VERSION=3
PY_VERSION_LIST=3
while [[ $# -gt 0 ]]; do
case "$1" in
@ -30,7 +30,7 @@ while [[ $# -gt 0 ]]; do
BUILD_PYTHONAPI=true;
shift ;;
--python-version )
PY_VERSION="$2"
PY_VERSION_LIST="$2"
shift 2 ;;
--rss )
BUILD_RSS_VARIANT=true;
@ -53,6 +53,9 @@ if ! { ${REMOVE_INTERMEDIATE} || ${BUILD_PYTHONAPI} ; }; then
fatal_error "Nothing selected to be done."
fi
# Convert comma-separated string to array of unique elements.
IFS="," read -r -a PY_VERSION_LIST <<< "${PY_VERSION_LIST}"
pushd "${CARLA_PYTHONAPI_SOURCE_FOLDER}" >/dev/null
# ==============================================================================
@ -80,9 +83,11 @@ fi
if ${BUILD_PYTHONAPI} ; then
for PY_VERSION in ${PY_VERSION_LIST[@]} ; do
log "Building Python API for Python 3."
/usr/bin/env python${PY_VERSION} setup.py bdist_egg
done
fi

13
Util/BuildTools/Check.sh
View File

@ -42,7 +42,7 @@ OPTS=`getopt -o h --long help,gdb,xml,gtest_args:,all,libcarla-release,libcarla-
eval set -- "$OPTS"
PY_VERSION=3
PY_VERSION_LIST=3
while [[ $# -gt 0 ]]; do
case "$1" in
@ -80,7 +80,7 @@ while [[ $# -gt 0 ]]; do
GTEST_ARGS="--gtest_filter=benchmark*";
shift ;;
--python-version )
PY_VERSION="$2"
PY_VERSION_LIST="$2"
shift 2 ;;
-h | --help )
echo "$DOC_STRING"
@ -96,6 +96,9 @@ if ! { ${LIBCARLA_RELEASE} || ${LIBCARLA_DEBUG} || ${PYTHON_API} || ${SMOKE_TEST
fatal_error "Nothing selected to be done."
fi
# Convert comma-separated string to array of unique elements.
IFS="," read -r -a PY_VERSION_LIST <<< "${PY_VERSION_LIST}"
# ==============================================================================
# -- Download Content need it by the tests -------------------------------------
# ==============================================================================
@ -176,10 +179,14 @@ fi
if ${PYTHON_API} ; then
log "Running Python API for Python 3 unit tests."
for PY_VERSION in ${PY_VERSION_LIST[@]} ; do
log "Running Python API for Python ${PY_VERSION} unit tests."
/usr/bin/env python${PY_VERSION} -m nose2 ${EXTRA_ARGS}
done
if ${XML_OUTPUT} ; then
mv test-results.xml ${CARLA_TEST_RESULTS_FOLDER}/python-api-3.xml
fi

26
Util/BuildTools/Setup.sh
View File

@ -12,12 +12,12 @@ OPTS=`getopt -o h --long help,python-version: -n 'parse-options' -- "$@"`
eval set -- "$OPTS"
PY_VERSION=3
PY_VERSION_LIST=3
while [[ $# -gt 0 ]]; do
case "$1" in
--python-version )
PY_VERSION="$2";
PY_VERSION_LIST="$2";
shift 2 ;;
-h | --help )
echo "$DOC_STRING"
@ -44,6 +44,9 @@ export CXX=/usr/bin/clang++-8
source $(dirname "$0")/Environment.sh
# Convert comma-separated string to array of unique elements.
IFS="," read -r -a PY_VERSION_LIST <<< "${PY_VERSION_LIST}"
mkdir -p ${CARLA_BUILD_FOLDER}
pushd ${CARLA_BUILD_FOLDER} >/dev/null
@ -104,19 +107,20 @@ BOOST_BASENAME="boost-${BOOST_VERSION}-${CXX_TAG}"
BOOST_INCLUDE=${PWD}/${BOOST_BASENAME}-install/include
BOOST_LIBPATH=${PWD}/${BOOST_BASENAME}-install/lib
SHOULD_BUILD_BOOST=true
for PY_VERSION in ${PY_VERSION_LIST[@]} ; do
PYTHON_VERSION=$(/usr/bin/env python${PY_VERSION} -V)
LIB_NAME=${PYTHON_VERSION:7:3}
LIB_NAME=${LIB_NAME//.}
if [[ -d "${BOOST_BASENAME}-install" ]] ; then
SHOULD_BUILD_BOOST=true
PYTHON_VERSION=$(/usr/bin/env python${PY_VERSION} -V)
LIB_NAME=${PYTHON_VERSION:7:3}
LIB_NAME=${LIB_NAME//.}
if [[ -d "${BOOST_BASENAME}-install" ]] ; then
if [ -f "${BOOST_BASENAME}-install/lib/libboost_python${LIB_NAME}.a" ] ; then
SHOULD_BUILD_BOOST=false
log "${BOOST_BASENAME} already installed."
fi
fi
fi
if { ${SHOULD_BUILD_BOOST} ; } ; then
if { ${SHOULD_BUILD_BOOST} ; } ; then
rm -Rf ${BOOST_BASENAME}-source
BOOST_PACKAGE_BASENAME=boost_${BOOST_VERSION//./_}
@ -177,7 +181,9 @@ if { ${SHOULD_BUILD_BOOST} ; } ; then
cp -rf ${BOOST_BASENAME}-install/include/* ${LIBCARLA_INSTALL_CLIENT_FOLDER}/include/system
cp -rf ${BOOST_BASENAME}-install/lib/* ${LIBCARLA_INSTALL_CLIENT_FOLDER}/lib
fi
fi
done
unset BOOST_BASENAME