Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-13 19:40:31 +03:00
Code Issues Wiki Activity

Added a quick way of building F7 targets only

Browse source
This commit is contained in:
Andrey Mironov 2018-03-28 11:36:45 +03:00
parent 114c92a65f
commit 2294518998
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.travis.yml
View file

@ -4,11 +4,7 @@ env:
# - PUBLISHDOCS=True # - PUBLISHDOCS=True
# Specify the main Mafile supported goals. # Specify the main Mafile supported goals.
- GOAL=test - GOAL=test
- GOAL=targets-group-1 - GOAL=targets-group-f7
- GOAL=targets-group-2
- GOAL=targets-group-3
- GOAL=targets-group-4
- GOAL=targets-group-rest
# - GOAL=all # - GOAL=all
# - GOAL=AFROMINI # - GOAL=AFROMINI
# - GOAL=AIORACERF3 # - GOAL=AIORACERF3

3
Makefile
View file

@ -345,6 +345,8 @@ targets-group-4: $(GROUP_4_TARGETS)
## targets-group-rest: build the rest of the targets (not listed in group 1, 2 or 3) ## targets-group-rest: build the rest of the targets (not listed in group 1, 2 or 3)
targets-group-rest: $(GROUP_OTHER_TARGETS) targets-group-rest: $(GROUP_OTHER_TARGETS)
targets-group-f7: $(GROUP_F7_TARGETS)
$(VALID_TARGETS): $(VALID_TARGETS):
$(V0) @echo "Building $@" && \ $(V0) @echo "Building $@" && \
$(MAKE) binary hex TARGET=$@ && \ $(MAKE) binary hex TARGET=$@ && \
@ -461,6 +463,7 @@ targets:
@echo "targets-group-3: $(GROUP_3_TARGETS)" @echo "targets-group-3: $(GROUP_3_TARGETS)"
@echo "targets-group-4: $(GROUP_4_TARGETS)" @echo "targets-group-4: $(GROUP_4_TARGETS)"
@echo "targets-group-rest: $(GROUP_OTHER_TARGETS)" @echo "targets-group-rest: $(GROUP_OTHER_TARGETS)"
@echo "targets-group-f7: $(GROUP_F7_TARGETS)"
## test : run the cleanflight test suite ## test : run the cleanflight test suite
## junittest : run the cleanflight test suite, producing Junit XML result files. ## junittest : run the cleanflight test suite, producing Junit XML result files.

9
make/targets.mk
View file

@ -6,6 +6,7 @@ OSD_SLAVE_TARGETS = SPRACINGF3OSD
VALID_TARGETS = $(dir $(wildcard $(ROOT)/src/main/target/*/target.mk)) VALID_TARGETS = $(dir $(wildcard $(ROOT)/src/main/target/*/target.mk))
VALID_TARGETS := $(subst /,, $(subst ./src/main/target/,, $(VALID_TARGETS))) VALID_TARGETS := $(subst /,, $(subst ./src/main/target/,, $(VALID_TARGETS)))
BASE_TARGETS := $(VALID_TARGETS)
VALID_TARGETS := $(VALID_TARGETS) $(ALT_TARGETS) VALID_TARGETS := $(VALID_TARGETS) $(ALT_TARGETS)
VALID_TARGETS := $(sort $(VALID_TARGETS)) VALID_TARGETS := $(sort $(VALID_TARGETS))
VALID_TARGETS := $(filter-out $(SKIP_TARGETS), $(VALID_TARGETS)) VALID_TARGETS := $(filter-out $(SKIP_TARGETS), $(VALID_TARGETS))
@ -135,6 +136,14 @@ GROUP_4_TARGETS := \
GROUP_OTHER_TARGETS := $(filter-out $(GROUP_1_TARGETS) $(GROUP_2_TARGETS) $(GROUP_3_TARGETS) $(GROUP_4_TARGETS), $(SUPPORTED_TARGETS)) GROUP_OTHER_TARGETS := $(filter-out $(GROUP_1_TARGETS) $(GROUP_2_TARGETS) $(GROUP_3_TARGETS) $(GROUP_4_TARGETS), $(SUPPORTED_TARGETS))
# a dirty way of getting F7 targets via parsing target.mk
GROUP_F7_TARGETS = $(foreach target, $(BASE_TARGETS), $(target)-$(shell grep -q F7 $(ROOT)/src/main/target/$(target)/target.mk && echo $$?))
GROUP_F7_TARGETS := $(filter %-0, $(GROUP_F7_TARGETS))
GROUP_F7_TARGETS := $(subst -0,, $(GROUP_F7_TARGETS))
ALT_F7_TARGETS = $(sort $(filter-out target, $(basename $(notdir $(foreach target, $(GROUP_F7_TARGETS), $(wildcard $(ROOT)/src/main/target/$(target)/*.mk))))))
GROUP_F7_TARGETS := $(GROUP_F7_TARGETS) $(ALT_F7_TARGETS)
GROUP_F7_TARGETS := $(filter-out ALIENWHOOPF4, $(GROUP_F7_TARGETS))
ifeq ($(filter $(TARGET),$(ALT_TARGETS)), $(TARGET)) ifeq ($(filter $(TARGET),$(ALT_TARGETS)), $(TARGET))
BASE_TARGET := $(firstword $(subst /,, $(subst ./src/main/target/,, $(dir $(wildcard $(ROOT)/src/main/target/*/$(TARGET).mk))))) BASE_TARGET := $(firstword $(subst /,, $(subst ./src/main/target/,, $(dir $(wildcard $(ROOT)/src/main/target/*/$(TARGET).mk)))))
include $(ROOT)/src/main/target/$(BASE_TARGET)/$(TARGET).mk include $(ROOT)/src/main/target/$(BASE_TARGET)/$(TARGET).mk