aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tools: sim_vehicle.py: remove old --build-system

Browse Source 
We haven't supported make for a very long time
This commit is contained in:
Peter Barker 2022-07-12 15:09:28 +10:00 committed by Peter Barker
parent f49211b021
commit f604eedf65
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Tools/autotest/sim_vehicle.py
View File

@ -646,13 +646,10 @@ def start_antenna_tracker(opts):
oldpwd = os.getcwd()
os.chdir(vehicledir)
tracker_uarta = "tcp:127.0.0.1:" + str(5760 + 10 * tracker_instance)
if cmd_opts.build_system == "waf":
binary_basedir = "build/sitl"
exe = os.path.join(root_dir,
binary_basedir,
"bin/antennatracker")
else:
exe = os.path.join(vehicledir, "AntennaTracker.elf")
binary_basedir = "build/sitl"
exe = os.path.join(root_dir,
binary_basedir,
"bin/antennatracker")
run_in_terminal_window("AntennaTracker",
["nice",
exe,
@ -1048,11 +1045,6 @@ group_build.add_option("-b", "--build-target",
default=None,
type='string',
help="override SITL build target")
group_build.add_option("-s", "--build-system",
default="waf",
type='choice',
choices=["make", "waf"],
help="build system to use")
group_build.add_option("--enable-math-check-indexes",
default=False,
action="store_true",
@ -1540,13 +1532,11 @@ if True:
if cmd_opts.vehicle_binary is not None:
vehicle_binary = cmd_opts.vehicle_binary
elif cmd_opts.build_system == "waf":
else:
binary_basedir = "build/sitl"
vehicle_binary = os.path.join(root_dir,
binary_basedir,
frame_infos["waf_target"])
else:
vehicle_binary = os.path.join(vehicle_dir, cmd_opts.vehicle + ".elf")
if not os.path.exists(vehicle_binary):
print("Vehicle binary (%s) does not exist" % (vehicle_binary,))