Support python3 only systems

Ubuntu 20.04 and latest Cygwin come with no Python 2 and no link
from python to python3. To not mess with the system we detect
python3 for seamless support.
This commit is contained in:
Matthias Grob
2020-03-28 17:08:23 +01:00
committed by Nuno Marques
parent b8576cccc8
commit 6602e8d16b
3 changed files with 9 additions and 3 deletions
+7 -1
View File
@@ -6,8 +6,14 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
export APPSDIR="`pwd`/../apps" export APPSDIR="`pwd`/../apps"
export CONFIG_ARCH_BOARD_CUSTOM=y export CONFIG_ARCH_BOARD_CUSTOM=y
if [ "command -v python3" ]; then
PYTHON_EXECUTABLE=python3
else
PYTHON_EXECUTABLE=python
fi
if [ "${1}" = "--olddefconfig" ]; then if [ "${1}" = "--olddefconfig" ]; then
PYTHONPATH=${DIR} python ${DIR}/olddefconfig.py > /dev/null PYTHONPATH=${DIR} ${PYTHON_EXECUTABLE} ${DIR}/olddefconfig.py > /dev/null
else else
echo "ERROR: ${@} unsupported" echo "ERROR: ${@} unsupported"
exit 1 exit 1
+1 -1
View File
@@ -93,7 +93,7 @@ foreach(DSDLC_INPUT ${DSDLC_INPUTS})
list(APPEND DSDLC_INPUT_FILES ${DSDLC_NEW_INPUT_FILES}) list(APPEND DSDLC_INPUT_FILES ${DSDLC_NEW_INPUT_FILES})
endforeach(DSDLC_INPUT) endforeach(DSDLC_INPUT)
add_custom_command(OUTPUT px4_uavcan_dsdlc_run.stamp add_custom_command(OUTPUT px4_uavcan_dsdlc_run.stamp
COMMAND ${PYTHON} ${LIBUAVCAN_DIR}/libuavcan/dsdl_compiler/libuavcan_dsdlc ${DSDLC_INPUTS} -O${DSDLC_OUTPUT} COMMAND ${PYTHON_EXECUTABLE} ${LIBUAVCAN_DIR}/libuavcan/dsdl_compiler/libuavcan_dsdlc ${DSDLC_INPUTS} -O${DSDLC_OUTPUT}
COMMAND ${CMAKE_COMMAND} -E touch px4_uavcan_dsdlc_run.stamp COMMAND ${CMAKE_COMMAND} -E touch px4_uavcan_dsdlc_run.stamp
DEPENDS ${DSDLC_INPUT_FILES} DEPENDS ${DSDLC_INPUT_FILES}
COMMENT "PX4 UAVCAN dsdl compiler" COMMENT "PX4 UAVCAN dsdl compiler"