Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tools: adjust usage of --enable for uppercase names

Browse Source
This commit is contained in:
Andrew Tridgell 2024-09-11 06:16:12 +10:00
parent b2b9226863
commit bcf19b6d0d
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/autotest/rover.py
View File

@ -6603,7 +6603,7 @@ Brakes have negligible effect (with=%0.2fm without=%0.2fm delta=%0.2fm)
self.progress('rebuilding rover with ppp enabled') self.progress('rebuilding rover with ppp enabled')
import shutil import shutil
shutil.copy('build/sitl/bin/ardurover', 'build/sitl/bin/ardurover.noppp') shutil.copy('build/sitl/bin/ardurover', 'build/sitl/bin/ardurover.noppp')
util.build_SITL('bin/ardurover', clean=False, configure=True, extra_configure_args=['--enable-ppp', '--debug']) util.build_SITL('bin/ardurover', clean=False, configure=True, extra_configure_args=['--enable-PPP', '--debug'])
self.reboot_sitl() self.reboot_sitl()

6
Tools/autotest/sim_vehicle.py
View File

@ -379,10 +379,10 @@ def do_build(opts, frame_options):
cmd_configure.append("--enable-math-check-indexes") cmd_configure.append("--enable-math-check-indexes")
if opts.enable_ekf2: if opts.enable_ekf2:
cmd_configure.append("--enable-ekf2") cmd_configure.append("--enable-EKF2")
if opts.disable_ekf3: if opts.disable_ekf3:
cmd_configure.append("--disable-ekf3") cmd_configure.append("--disable-EKF3")
if opts.postype_single: if opts.postype_single:
cmd_configure.append("--postype-single") cmd_configure.append("--postype-single")
@ -415,7 +415,7 @@ def do_build(opts, frame_options):
cmd_configure.append("--disable-networking") cmd_configure.append("--disable-networking")
if opts.enable_ppp: if opts.enable_ppp:
cmd_configure.append("--enable-ppp") cmd_configure.append("--enable-PPP")
if opts.enable_networking_tests: if opts.enable_networking_tests:
cmd_configure.append("--enable-networking-tests") cmd_configure.append("--enable-networking-tests")

2
Tools/ros2/ardupilot_sitl/CMakeLists.txt
View File

@ -34,7 +34,7 @@ set(WAF_DISABLE_SCRIPTING $<$<BOOL:${ARDUPILOT_DISABLE_SCRIPTING}>:"--disable-sc
set(WAF_DISABLE_WATCHDOG $<$<BOOL:${ARDUPILOT_DISABLE_WATCHDOG}>:"--disable-watchdog">) set(WAF_DISABLE_WATCHDOG $<$<BOOL:${ARDUPILOT_DISABLE_WATCHDOG}>:"--disable-watchdog">)
set(WAF_ENABLE_DDS $<$<BOOL:${ARDUPILOT_ENABLE_DDS}>:"--enable-dds">) set(WAF_ENABLE_DDS $<$<BOOL:${ARDUPILOT_ENABLE_DDS}>:"--enable-dds">)
set(WAF_ENABLE_NETWORKING_TESTS $<$<BOOL:${ARDUPILOT_ENABLE_NETWORKING_TESTS}>:"--enable-networking-tests">) set(WAF_ENABLE_NETWORKING_TESTS $<$<BOOL:${ARDUPILOT_ENABLE_NETWORKING_TESTS}>:"--enable-networking-tests">)
set(WAF_ENABLE_PPP $<$<BOOL:${ARDUPILOT_ENABLE_PPP}>:"--enable-ppp">) set(WAF_ENABLE_PPP $<$<BOOL:${ARDUPILOT_ENABLE_PPP}>:"--enable-PPP">)
add_custom_target(ardupilot_configure ALL add_custom_target(ardupilot_configure ALL
${WAF_COMMAND} configure --board sitl ${WAF_COMMAND} configure --board sitl

4
Tools/scripts/build_ci.sh
View File

@ -321,7 +321,7 @@ for t in $CI_BUILD_TARGET; do
if [ "$t" == "CubeOrange-PPP" ]; then if [ "$t" == "CubeOrange-PPP" ]; then
echo "Building CubeOrange-PPP" echo "Building CubeOrange-PPP"
$waf configure --board CubeOrange --enable-ppp $waf configure --board CubeOrange --enable-PPP
$waf clean $waf clean
$waf copter $waf copter
continue continue
@ -329,7 +329,7 @@ for t in $CI_BUILD_TARGET; do
if [ "$t" == "CubeOrange-EKF2" ]; then if [ "$t" == "CubeOrange-EKF2" ]; then
echo "Building CubeOrange with EKF2 enabled" echo "Building CubeOrange with EKF2 enabled"
$waf configure --board CubeOrange --enable-ekf2 $waf configure --board CubeOrange --enable-EKF2
$waf clean $waf clean
$waf copter $waf copter
continue continue