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

Removed legacy targets from the list of targets built in CI. (#9049)

Browse source 
Removed legacy targets from the list of targets built in CI.
This commit is contained in:
Michael Keller 2019-10-28 16:46:28 +13:00 • committed by mikeller
parent 3b5ca878e9
commit 0cf0d2d664
2 changed files with 33 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Makefile
View file

@ -430,11 +430,14 @@ $(OBJECT_DIR)/$(TARGET)/%.o: %.S
$(V1) $(CROSS_CC) -c -o $@ $(ASFLAGS) $< $(V1) $(CROSS_CC) -c -o $@ $(ASFLAGS) $<
## all : Build all targets (excluding unsupported) ## all : Build all currently built targets
all: $(SUPPORTED_TARGETS) all: $(CI_TARGETS)
## all_with_unsupported : Build all targets (including unsupported) ## all_all : Build all targets (including legacy / unsupported)
all_with_unsupported: $(VALID_TARGETS) all_all: $(VALID_TARGETS)
## legacy : Build legacy targets
legacy: $(LEGACY_TARGETS)
## unsupported : Build unsupported targets ## unsupported : Build unsupported targets
unsupported: $(UNSUPPORTED_TARGETS) unsupported: $(UNSUPPORTED_TARGETS)
@ -583,7 +586,8 @@ help: Makefile make/tools.mk
## targets : print a list of all valid target platforms (for consumption by scripts) ## targets : print a list of all valid target platforms (for consumption by scripts)
targets: targets:
@echo "Valid targets: $(VALID_TARGETS)" @echo "Valid targets: $(VALID_TARGETS)"
@echo "Supported targets: $(SUPPORTED_TARGETS)" @echo "Built targets: $(CI_TARGETS)"
@echo "Legacy targets: $(LEGACY_TARGETS)"
@echo "Unsupported targets: $(UNSUPPORTED_TARGETS)" @echo "Unsupported targets: $(UNSUPPORTED_TARGETS)"
@echo "Target: $(TARGET)" @echo "Target: $(TARGET)"
@echo "Base target: $(BASE_TARGET)" @echo "Base target: $(BASE_TARGET)"
@ -598,7 +602,7 @@ targets:
@echo "targets-group-3: $(words $(GROUP_3_TARGETS)) targets" @echo "targets-group-3: $(words $(GROUP_3_TARGETS)) targets"
@echo "targets-group-4: $(words $(GROUP_4_TARGETS)) targets" @echo "targets-group-4: $(words $(GROUP_4_TARGETS)) targets"
@echo "targets-group-rest: $(words $(GROUP_OTHER_TARGETS)) targets" @echo "targets-group-rest: $(words $(GROUP_OTHER_TARGETS)) targets"
@echo "total in all groups $(words $(SUPPORTED_TARGETS)) targets" @echo "total in all groups $(words $(CI_TARGETS)) targets"
## target-mcu : print the MCU type of the target ## target-mcu : print the MCU type of the target
target-mcu: target-mcu:
@ -606,7 +610,7 @@ target-mcu:
## targets-by-mcu : make all targets that have a MCU_TYPE mcu ## targets-by-mcu : make all targets that have a MCU_TYPE mcu
targets-by-mcu: targets-by-mcu:
$(V1) for target in $(VALID_TARGETS); do \ $(V1) for target in $${TARGETS}; do \
TARGET_MCU_TYPE=$$($(MAKE) -s TARGET=$${target} target-mcu); \ TARGET_MCU_TYPE=$$($(MAKE) -s TARGET=$${target} target-mcu); \
if [ "$${TARGET_MCU_TYPE}" = "$${MCU_TYPE}" ]; then \ if [ "$${TARGET_MCU_TYPE}" = "$${MCU_TYPE}" ]; then \
if [ "$${DO_BUILD}" = 1 ]; then \ if [ "$${DO_BUILD}" = 1 ]; then \
@ -625,24 +629,30 @@ targets-by-mcu:
## targets-f3 : make all F3 targets ## targets-f3 : make all F3 targets
targets-f3: targets-f3:
$(V1) $(MAKE) -s targets-by-mcu MCU_TYPE=STM32F3 DO_BUILD=1 $(V1) $(MAKE) -s targets-by-mcu MCU_TYPE=STM32F3 TARGETS="$(VALID_TARGETS)" DO_BUILD=1
targets-f3-print: targets-f3-print:
$(V1) $(MAKE) -s targets-by-mcu MCU_TYPE=STM32F3 $(V1) $(MAKE) -s targets-by-mcu MCU_TYPE=STM32F3 TARGETS="$(VALID_TARGETS)"
## targets-f4 : make all F4 targets ## targets-f4 : make all F4 targets
targets-f4: targets-f4:
$(V1) $(MAKE) -s targets-by-mcu MCU_TYPE=STM32F4 DO_BUILD=1 $(V1) $(MAKE) -s targets-by-mcu MCU_TYPE=STM32F4 TARGETS="$(VALID_TARGETS)" DO_BUILD=1
targets-f4-print: targets-f4-print:
$(V1) $(MAKE) -s targets-by-mcu MCU_TYPE=STM32F4 $(V1) $(MAKE) -s targets-by-mcu MCU_TYPE=STM32F4 TARGETS="$(VALID_TARGETS)"
targets-ci-f4-print:
$(V1) $(MAKE) -s targets-by-mcu MCU_TYPE=STM32F4 TARGETS="$(CI_TARGETS)"
## targets-f7 : make all F7 targets ## targets-f7 : make all F7 targets
targets-f7: targets-f7:
$(V1) $(MAKE) -s targets-by-mcu MCU_TYPE=STM32F7 DO_BUILD=1 $(V1) $(MAKE) -s targets-by-mcu MCU_TYPE=STM32F7 TARGETS="$(VALID_TARGETS)" DO_BUILD=1
targets-f7-print: targets-f7-print:
$(V1) $(MAKE) -s targets-by-mcu MCU_TYPE=STM32F7 $(V1) $(MAKE) -s targets-by-mcu MCU_TYPE=STM32F7 TARGETS="$(VALID_TARGETS)"
targets-ci-f7-print:
$(V1) $(MAKE) -s targets-by-mcu MCU_TYPE=STM32F7 TARGETS="$(CI_TARGETS)"
## test : run the Betaflight test suite ## test : run the Betaflight test suite
## junittest : run the Betaflight test suite, producing Junit XML result files. ## junittest : run the Betaflight test suite, producing Junit XML result files.

17
make/targets_list.mk
View file

@ -94,26 +94,29 @@ UNSUPPORTED_TARGETS := \
X_RACERSPI \ X_RACERSPI \
ZCOREF3 ZCOREF3
SUPPORTED_TARGETS := $(filter-out $(UNSUPPORTED_TARGETS), $(VALID_TARGETS)) # Legacy targets are targets that have been replaced by Unified Target configurations
LEGACY_TARGETS := MATEKF405
TARGETS_TOTAL := $(words $(SUPPORTED_TARGETS)) CI_TARGETS := $(filter-out $(LEGACY_TARGETS), $(filter-out $(UNSUPPORTED_TARGETS), $(VALID_TARGETS)))
TARGETS_TOTAL := $(words $(CI_TARGETS))
TARGET_GROUPS := 5 TARGET_GROUPS := 5
TARGETS_PER_GROUP := $(shell expr $(TARGETS_TOTAL) / $(TARGET_GROUPS) ) TARGETS_PER_GROUP := $(shell expr $(TARGETS_TOTAL) / $(TARGET_GROUPS) )
ST := 1 ST := 1
ET := $(shell expr $(ST) + $(TARGETS_PER_GROUP)) ET := $(shell expr $(ST) + $(TARGETS_PER_GROUP))
GROUP_1_TARGETS := $(wordlist $(ST), $(ET), $(SUPPORTED_TARGETS)) GROUP_1_TARGETS := $(wordlist $(ST), $(ET), $(CI_TARGETS))
ST := $(shell expr $(ET) + 1) ST := $(shell expr $(ET) + 1)
ET := $(shell expr $(ST) + $(TARGETS_PER_GROUP)) ET := $(shell expr $(ST) + $(TARGETS_PER_GROUP))
GROUP_2_TARGETS := $(wordlist $(ST), $(ET), $(SUPPORTED_TARGETS)) GROUP_2_TARGETS := $(wordlist $(ST), $(ET), $(CI_TARGETS))
ST := $(shell expr $(ET) + 1) ST := $(shell expr $(ET) + 1)
ET := $(shell expr $(ST) + $(TARGETS_PER_GROUP)) ET := $(shell expr $(ST) + $(TARGETS_PER_GROUP))
GROUP_3_TARGETS := $(wordlist $(ST), $(ET), $(SUPPORTED_TARGETS)) GROUP_3_TARGETS := $(wordlist $(ST), $(ET), $(CI_TARGETS))
ST := $(shell expr $(ET) + 1) ST := $(shell expr $(ET) + 1)
ET := $(shell expr $(ST) + $(TARGETS_PER_GROUP)) ET := $(shell expr $(ST) + $(TARGETS_PER_GROUP))
GROUP_4_TARGETS := $(wordlist $(ST), $(ET), $(SUPPORTED_TARGETS)) GROUP_4_TARGETS := $(wordlist $(ST), $(ET), $(CI_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), $(CI_TARGETS))