Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-26 17:53:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

mk: stop ignoring exit status of mavlink header generation

Browse Source 
Accept a 0 exit status, or a status >127 (indicating a signal
caused the process to exit) as success.

The original intent of ignoring the exit status was that
the python executable was segfaulting after successfully
building headers.

Recently builds have been failing because people have not been
doing recursive submodule updates, and the mavlink header generation
has failed.  Since we are ignoring the error the build rumbles on
and fails later with a failed #include.

This patch tightens our ignoring of a bad exit status to just
signals.

Note that the waf build system does the same check.
This commit is contained in:
Peter Barker 2016-11-07 11:40:25 +11:00 committed by Francisco Ferreira
parent c3cbd7c6f4
commit e94c23e0a1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk/mavgen.mk
View File

@ -9,4 +9,4 @@ $(MAVLINK_HEADERS): $(MESSAGE_DEFINITIONS)/ardupilotmega.xml $(MESSAGE_DEFINITIO
echo "Generating MAVLink headers..." echo "Generating MAVLink headers..."
#goto mavlink module directory and run the most recent generator script #goto mavlink module directory and run the most recent generator script
echo "Generating C code using mavgen.py located at" $(SKETCHBOOK)/modules/mavlink/ echo "Generating C code using mavgen.py located at" $(SKETCHBOOK)/modules/mavlink/
-PYTHONPATH=$(MAVLINK_DIR) python $(MAVLINK_DIR)/pymavlink/tools/mavgen.py --lang=C --wire-protocol=$(MAVLINK_WIRE_PROTOCOL) --output=$(MAVLINK_OUTPUT_DIR) $(MESSAGE_DEFINITIONS)/ardupilotmega.xml PYTHONPATH=$(MAVLINK_DIR) python $(MAVLINK_DIR)/pymavlink/tools/mavgen.py --lang=C --wire-protocol=$(MAVLINK_WIRE_PROTOCOL) --output=$(MAVLINK_OUTPUT_DIR) $(MESSAGE_DEFINITIONS)/ardupilotmega.xml; if [ $$? -le 0 -o $$? -gt 128 ]; then echo "mavgen: success"; exit 0; else echo "mavgen: failed"; exit 1; fi