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

make ROS2 in a separate package

This commit is contained in:
bernatx 2023-11-08 22:29:28 +01:00
parent 272791266e
commit d3341d674f
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Jenkinsfile vendored
View File

@ -94,8 +94,9 @@ pipeline
{ {
steps steps
{ {
sh 'make package ARGS="--python-version=3.7,2 --target-wheel-platform=manylinux_2_27_x86_64 --chrono --ros2"' sh 'make package ARGS="--python-version=3.7,2 --target-wheel-platform=manylinux_2_27_x86_64 --chrono"'
sh 'make package ARGS="--packages=AdditionalMaps,Town06_Opt,Town07_Opt,Town11,Town12,Town13,Town15 --target-archive=AdditionalMaps --clean-intermediate --python-version=3.7,2 --target-wheel-platform=manylinux_2_27_x86_64"' sh 'make package ARGS="--packages=AdditionalMaps,Town06_Opt,Town07_Opt,Town11,Town12,Town13,Town15 --target-archive=AdditionalMaps --clean-intermediate --python-version=3.7,2 --target-wheel-platform=manylinux_2_27_x86_64"'
sh 'make package ARGS="--python-version=3.7,2 --target-wheel-platform=manylinux_2_27_x86_64 --archive-sufix=ROS2 --chrono --ros2"'
sh 'make examples ARGS="localhost 3654"' sh 'make examples ARGS="localhost 3654"'
} }
post post

35
Util/BuildTools/Package.sh
View File

@ -6,7 +6,7 @@
DOC_STRING="Makes a packaged version of CARLA and other content packages ready for distribution." DOC_STRING="Makes a packaged version of CARLA and other content packages ready for distribution."
USAGE_STRING="Usage: $0 [-h|--help] [--config={Debug,Development,Shipping}] [--no-zip] [--clean-intermediate] [--packages=Name1,Name2,...] [--target-archive=]" USAGE_STRING="Usage: $0 [-h|--help] [--config={Debug,Development,Shipping}] [--no-zip] [--clean-intermediate] [--packages=Name1,Name2,...] [--target-archive=] [--archive-sufix=]"
PACKAGES="Carla" PACKAGES="Carla"
DO_TARBALL=true DO_TARBALL=true
@ -15,8 +15,9 @@ PROPS_MAP_NAME=PropsMap
PACKAGE_CONFIG=Shipping PACKAGE_CONFIG=Shipping
USE_CARSIM=false USE_CARSIM=false
SINGLE_PACKAGE=false SINGLE_PACKAGE=false
ARCHIVE_SUFIX=""
OPTS=`getopt -o h --long help,config:,no-zip,clean-intermediate,carsim,packages:,python-version,target-archive:, -n 'parse-options' -- "$@"` OPTS=`getopt -o h --long help,config:,no-zip,clean-intermediate,carsim,packages:,python-version,target-archive:,archive-sufix:, -n 'parse-options' -- "$@"`
eval set -- "$OPTS" eval set -- "$OPTS"
@ -38,6 +39,9 @@ while [[ $# -gt 0 ]]; do
SINGLE_PACKAGE=true SINGLE_PACKAGE=true
TARGET_ARCHIVE="$2" TARGET_ARCHIVE="$2"
shift 2 ;; shift 2 ;;
--archive-sufix )
ARCHIVE_SUFIX="$2"
shift 2 ;;
--carsim ) --carsim )
USE_CARSIM=true; USE_CARSIM=true;
shift ;; shift ;;
@ -77,14 +81,24 @@ fi
REPOSITORY_TAG=$(get_git_repository_version) REPOSITORY_TAG=$(get_git_repository_version)
RELEASE_BUILD_FOLDER=${CARLA_DIST_FOLDER}/CARLA_${PACKAGE_CONFIG}_${REPOSITORY_TAG} if [[ ${ARCHIVE_SUFIX} != "" ]] ; then
RELEASE_BUILD_FOLDER=${CARLA_DIST_FOLDER}/CARLA_${PACKAGE_CONFIG}_${REPOSITORY_TAG}_${ARCHIVE_SUFIX}
else
RELEASE_BUILD_FOLDER=${CARLA_DIST_FOLDER}/CARLA_${PACKAGE_CONFIG}_${REPOSITORY_TAG}
fi
if [[ ${PACKAGE_CONFIG} == "Shipping" ]] ; then if [[ ${PACKAGE_CONFIG} == "Shipping" ]] ; then
RELEASE_PACKAGE_PATH=${CARLA_DIST_FOLDER}/CARLA_${REPOSITORY_TAG}.tar.gz RELEASE_PACKAGE_PATH=${CARLA_DIST_FOLDER}/CARLA_${REPOSITORY_TAG}
else else
RELEASE_PACKAGE_PATH=${CARLA_DIST_FOLDER}/CARLA_${PACKAGE_CONFIG}_${REPOSITORY_TAG}.tar.gz RELEASE_PACKAGE_PATH=${CARLA_DIST_FOLDER}/CARLA_${PACKAGE_CONFIG}_${REPOSITORY_TAG}
fi fi
if [[ ${ARCHIVE_SUFIX} != "" ]] ; then
RELEASE_PACKAGE_PATH=${RELEASE_PACKAGE_PATH}_${ARCHIVE_SUFIX}
fi
RELEASE_PACKAGE_PATH=${RELEASE_PACKAGE_PATH}.tar.gz
log "Packaging version '${REPOSITORY_TAG}' (${PACKAGE_CONFIG})." log "Packaging version '${REPOSITORY_TAG}' (${PACKAGE_CONFIG})."
# ============================================================================== # ==============================================================================
@ -231,7 +245,16 @@ for PACKAGE_NAME in "${PACKAGES[@]}" ; do if [[ ${PACKAGE_NAME} != "Carla" ]] ;
BUILD_FOLDER_TARGET=${CARLA_DIST_FOLDER}/${PACKAGE_NAME}_${REPOSITORY_TAG} BUILD_FOLDER_TARGET=${CARLA_DIST_FOLDER}/${PACKAGE_NAME}_${REPOSITORY_TAG}
fi fi
BUILD_FOLDER=${CARLA_DIST_FOLDER}/${PACKAGE_NAME}_${REPOSITORY_TAG} if [[ ${ARCHIVE_SUFIX} != "" ]] ; then
BUILD_FOLDER_TARGET=${BUILD_FOLDER_TARGET}_${ARCHIVE_SUFIX}
fi
if [[ ${ARCHIVE_SUFIX} != "" ]] ; then
BUILD_FOLDER=${CARLA_DIST_FOLDER}/${PACKAGE_NAME}_${REPOSITORY_TAG}_${ARCHIVE_SUFIX}
else
BUILD_FOLDER=${CARLA_DIST_FOLDER}/${PACKAGE_NAME}_${REPOSITORY_TAG}
fi
DESTINATION=${BUILD_FOLDER_TARGET}.tar DESTINATION=${BUILD_FOLDER_TARGET}.tar
PACKAGE_PATH=${CARLAUE4_ROOT_FOLDER}/Content/${PACKAGE_NAME} PACKAGE_PATH=${CARLAUE4_ROOT_FOLDER}/Content/${PACKAGE_NAME}