Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alberto Ruiz Garcia
Firmware
Commits
9fb167b6
Commit
9fb167b6
authored
8 years ago
by
Daniel Agar
Committed by
Lorenz Meier
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
add crazyflie to builds (#5516)
* Makefile simplify check and quick_check * make check add crazyflie_default
parent
21ce1577
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Makefile
+22
-39
22 additions, 39 deletions
Makefile
with
22 additions
and
39 deletions
Makefile
+
22
−
39
View file @
9fb167b6
...
...
@@ -185,8 +185,8 @@ run_sitl_ros: _sitl_deprecation
# Other targets
# --------------------------------------------------------------------
.PHONY
:
uavcan_firmware check check_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
.PHONY
:
uavcan_firmware check check_format
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).
.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
)
endif
checks_defaults
:
\
check_px4fmu-v1_default
\
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
# 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-v4_default
\
check_px4fmu-v2_test
\
check_px4fmu-v4_default_and_uavcan
\
check_mindpx-v2_default
\
check_tap-v1_default
checks_bootloaders
:
\
checks_tests
:
\
check_px4fmu-v2_test
checks_alts
:
\
check_posix_sitl_default
\
check_tap-v1_default
\
check_asc-v1_default
\
check_px4-stm32f4discovery_default
checks_uavcan
:
\
check_px4fmu-v4_default_and_uavcan
checks_sitls
:
\
check_posix_sitl_default
checks_last
:
\
check_px4-stm32f4discovery_default
\
check_crazyflie_default
\
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
check_format
:
...
...
@@ -242,15 +238,6 @@ check_%:
@$(
MAKE
)
--no-print-directory
$(
subst check_,,
$@
)
@
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
$(
call cmake-build-other,unittest, ../unittests
)
@
(
cd
build_unittest
&&
ctest
-j2
--output-on-failure
)
...
...
@@ -260,7 +247,7 @@ run_tests_posix: posix_sitl_default
tests
:
check_unittest run_tests_posix
# QGroundControl flashable firmware
# QGroundControl flashable firmware
(currently built by travis-ci)
qgc_firmware
:
\
check_px4fmu-v1_default
\
check_px4fmu-v2_default
\
...
...
@@ -269,10 +256,6 @@ qgc_firmware: \
check_px4fmu-v4_default_and_uavcan
\
check_format
extra_firmware
:
\
check_px4-stm32f4discovery_default
\
check_px4fmu-v2_test
package_firmware
:
@
zip
--junk-paths
Firmware.zip
`
find
.
-name
\*
.px4
`
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment