dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

add crazyflie to builds (#5516) 

* Makefile simplify check and quick_check

* make check add crazyflie_default
This commit is contained in:
Daniel Agar 2016-09-20 15:05:44 -04:00 committed by Lorenz Meier
parent 21ce157763
commit 9fb167b642
1 changed files with 22 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Makefile
View File

@ -185,8 +185,8 @@ run_sitl_ros: _sitl_deprecation
# Other targets # Other targets
# -------------------------------------------------------------------- # --------------------------------------------------------------------
.PHONY: uavcan_firmware check check_format unittest tests qgc_firmware package_firmware clean submodulesclean distclean .PHONY: uavcan_firmware check check_format format unittest tests qgc_firmware package_firmware clean submodulesclean distclean
.NOTPARALLEL: uavcan_firmware check check_format unittest tests qgc_firmware package_firmware clean submodulesclean distclean .NOTPARALLEL:
# All targets with just dependencies but no recipe must either be marked as phony (or have the special @: as recipe). # All targets with just dependencies but no recipe must either be marked as phony (or have the special @: as recipe).
.PHONY: checks_defaults checks_bootloaders checks_tests checks_alts checks_uavcan checks_sitls checks_last quick_check check_px4fmu-v4_default tests extra_firmware .PHONY: checks_defaults checks_bootloaders checks_tests checks_alts checks_uavcan checks_sitls checks_last quick_check check_px4fmu-v4_default tests extra_firmware
@ -197,34 +197,30 @@ ifeq ($(VECTORCONTROL),1)
@(rm -rf vectorcontrol && git clone --quiet --depth 1 https://github.com/thiemar/vectorcontrol.git && cd vectorcontrol && BOARD=s2740vc_1_0 make --silent --no-print-directory && BOARD=px4esc_1_6 make --silent --no-print-directory && ../Tools/uavcan_copy.sh) @(rm -rf vectorcontrol && git clone --quiet --depth 1 https://github.com/thiemar/vectorcontrol.git && cd vectorcontrol && BOARD=s2740vc_1_0 make --silent --no-print-directory && BOARD=px4esc_1_6 make --silent --no-print-directory && ../Tools/uavcan_copy.sh)
endif endif
checks_defaults: \ check_px4fmu-v4_default: uavcan_firmware
check_px4fmu-v1_default \ check_px4fmu-v4_default_and_uavcan: check_px4fmu-v4_default
@echo
ifeq ($(VECTORCONTROL),1)
@echo "Cleaning up vectorcontrol firmware"
@rm -rf vectorcontrol
@rm -rf ROMFS/px4fmu_common/uavcan
endif
# All default targets that don't require a special build environment (currently built on semaphore-ci)
check: check_px4fmu-v1_default \
check_px4fmu-v2_default \ check_px4fmu-v2_default \
check_px4fmu-v4_default \ check_px4fmu-v2_test \
check_px4fmu-v4_default_and_uavcan \
check_mindpx-v2_default \ check_mindpx-v2_default \
check_tap-v1_default check_posix_sitl_default \
check_tap-v1_default \
checks_bootloaders: \
checks_tests: \
check_px4fmu-v2_test
checks_alts: \
check_asc-v1_default \ check_asc-v1_default \
check_px4-stm32f4discovery_default check_px4-stm32f4discovery_default \
check_crazyflie_default \
checks_uavcan: \
check_px4fmu-v4_default_and_uavcan
checks_sitls: \
check_posix_sitl_default
checks_last: \
check_tests \ check_tests \
check_format \ check_format
check: checks_defaults checks_tests checks_alts checks_uavcan checks_bootloaders checks_last # quick_check builds a single nuttx and posix target, runs testing, and checks the style
quick_check: check_posix_sitl_default check_px4fmu-v4_default check_tests check_format quick_check: check_posix_sitl_default check_px4fmu-v4_default check_tests check_format
check_format: check_format:
@ -242,15 +238,6 @@ check_%:
@$(MAKE) --no-print-directory $(subst check_,,$@) @$(MAKE) --no-print-directory $(subst check_,,$@)
@echo @echo
check_px4fmu-v4_default: uavcan_firmware
check_px4fmu-v4_default_and_uavcan: check_px4fmu-v4_default
@echo
ifeq ($(VECTORCONTROL),1)
@echo "Cleaning up vectorcontrol firmware"
@rm -rf vectorcontrol
@rm -rf ROMFS/px4fmu_common/uavcan
endif
unittest: posix_sitl_default unittest: posix_sitl_default
$(call cmake-build-other,unittest, ../unittests) $(call cmake-build-other,unittest, ../unittests)
@(cd build_unittest && ctest -j2 --output-on-failure) @(cd build_unittest && ctest -j2 --output-on-failure)
@ -260,7 +247,7 @@ run_tests_posix: posix_sitl_default
tests: check_unittest run_tests_posix tests: check_unittest run_tests_posix
# QGroundControl flashable firmware # QGroundControl flashable firmware (currently built by travis-ci)
qgc_firmware: \ qgc_firmware: \
check_px4fmu-v1_default \ check_px4fmu-v1_default \
check_px4fmu-v2_default \ check_px4fmu-v2_default \
@ -269,10 +256,6 @@ qgc_firmware: \
check_px4fmu-v4_default_and_uavcan \ check_px4fmu-v4_default_and_uavcan \
check_format check_format
extra_firmware: \
check_px4-stm32f4discovery_default \
check_px4fmu-v2_test
package_firmware: package_firmware:
@zip --junk-paths Firmware.zip `find . -name \*.px4` @zip --junk-paths Firmware.zip `find . -name \*.px4`