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

Update "make deploy" to new import/export system

This commit is contained in:
nsubiron 2019-07-09 22:50:55 +02:00 committed by Néstor Subirón
parent 2b04e1c217
commit fb5ccf3f4e
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Util/BuildTools/Deploy.sh
View File

@ -95,19 +95,19 @@ fi
if ${UPLOAD_MAPS} ; then if ${UPLOAD_MAPS} ; then
mkdir -p ${CARLA_EXPORTED_MAPS_FOLDER} mkdir -p ${CARLA_DIST_FOLDER}
pushd "${CARLA_EXPORTED_MAPS_FOLDER}" >/dev/null
for MAP_PACKAGE in *.tar.gz; do pushd "${CARLA_DIST_FOLDER}" >/dev/null
DEPLOY_MAP_NAME=$(basename "${MAP_PACKAGE}" .tar.gz)_${REPOSITORY_TAG}.tar.gz for MAP_PACKAGE in *_${REPOSITORY_TAG}.tar.gz ; do if [[ ${MAP_PACKAGE} != ${LATEST_PACKAGE} ]] ; then
DEPLOY_MAP_URI=${S3_PREFIX}/${DEPLOY_MAP_NAME}
DEPLOY_MAP_URI=${S3_PREFIX}/${MAP_PACKAGE}
${AWS_COPY} ${MAP_PACKAGE} ${DEPLOY_MAP_URI} ${AWS_COPY} ${MAP_PACKAGE} ${DEPLOY_MAP_URI}
log "${MAP_PACKAGE} uploaded to ${DEPLOY_MAP_URI}." log "${MAP_PACKAGE} uploaded to ${DEPLOY_MAP_URI}."
done fi ; done
popd >/dev/null popd >/dev/null

1
Util/BuildTools/Vars.mk
View File

@ -3,7 +3,6 @@
CARLA_ROOT_FOLDER=${CURDIR} CARLA_ROOT_FOLDER=${CURDIR}
CARLA_BUILD_FOLDER=${CURDIR}/Build CARLA_BUILD_FOLDER=${CURDIR}/Build
CARLA_DIST_FOLDER=${CURDIR}/Dist CARLA_DIST_FOLDER=${CURDIR}/Dist
CARLA_EXPORTED_MAPS_FOLDER=${CURDIR}/ExportedMaps
CARLA_BUILD_TOOLS_FOLDER=${CURDIR}/Util/BuildTools CARLA_BUILD_TOOLS_FOLDER=${CURDIR}/Util/BuildTools
CARLA_TEST_RESULTS_FOLDER=${CARLA_BUILD_FOLDER}/test-results CARLA_TEST_RESULTS_FOLDER=${CARLA_BUILD_FOLDER}/test-results