Removed legacy targets from the list of targets built in CI.
This commit is contained in:
parent
c37a7c91a2
commit
971ded14e4
36
Makefile
36
Makefile
|
@ -430,11 +430,14 @@ $(OBJECT_DIR)/$(TARGET)/%.o: %.S
|
|||
$(V1) $(CROSS_CC) -c -o $@ $(ASFLAGS) $<
|
||||
|
||||
|
||||
## all : Build all targets (excluding unsupported)
|
||||
all: $(SUPPORTED_TARGETS)
|
||||
## all : Build all currently built targets
|
||||
all: $(CI_TARGETS)
|
||||
|
||||
## all_with_unsupported : Build all targets (including unsupported)
|
||||
all_with_unsupported: $(VALID_TARGETS)
|
||||
## all_all : Build all targets (including legacy / unsupported)
|
||||
all_all: $(VALID_TARGETS)
|
||||
|
||||
## legacy : Build legacy targets
|
||||
legacy: $(LEGACY_TARGETS)
|
||||
|
||||
## unsupported : Build 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:
|
||||
@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 "Target: $(TARGET)"
|
||||
@echo "Base target: $(BASE_TARGET)"
|
||||
|
@ -598,7 +602,7 @@ targets:
|
|||
@echo "targets-group-3: $(words $(GROUP_3_TARGETS)) targets"
|
||||
@echo "targets-group-4: $(words $(GROUP_4_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:
|
||||
|
@ -606,7 +610,7 @@ target-mcu:
|
|||
|
||||
## targets-by-mcu : make all targets that have a MCU_TYPE 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); \
|
||||
if [ "$${TARGET_MCU_TYPE}" = "$${MCU_TYPE}" ]; then \
|
||||
if [ "$${DO_BUILD}" = 1 ]; then \
|
||||
|
@ -625,24 +629,30 @@ targets-by-mcu:
|
|||
|
||||
## targets-f3 : make all F3 targets
|
||||
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:
|
||||
$(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:
|
||||
$(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:
|
||||
$(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:
|
||||
$(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:
|
||||
$(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
|
||||
## junittest : run the Betaflight test suite, producing Junit XML result files.
|
||||
|
|
|
@ -94,26 +94,83 @@ UNSUPPORTED_TARGETS := \
|
|||
X_RACERSPI \
|
||||
ZCOREF3
|
||||
|
||||
SUPPORTED_TARGETS := $(filter-out $(UNSUPPORTED_TARGETS), $(VALID_TARGETS))
|
||||
# Legacy targets are targets that have been replaced by Unified Target configurations
|
||||
LEGACY_TARGETS := AIKONF4 \
|
||||
ALIENFLIGHTF4 \
|
||||
BEEROTORF4 \
|
||||
CLRACINGF4 \
|
||||
CRAZYBEEF4FR \
|
||||
DYSF4PRO \
|
||||
ELINF405 \
|
||||
FF_RACEPIT \
|
||||
FLYWOOF405 \
|
||||
FLYWOOF411 \
|
||||
FURYF4OSD \
|
||||
HAKRCF411 \
|
||||
KAKUTEF4V2 \
|
||||
MAMBAF411 \
|
||||
MATEKF411 \
|
||||
MATEKF411RX \
|
||||
MERAKRCF405 \
|
||||
MLTEMPF4 \
|
||||
MLTYPHF4 \
|
||||
OMNIBUSF4 \
|
||||
OMNIBUSF4FW \
|
||||
OMNIBUSF4NANOV7 \
|
||||
OMNIBUSF4SD \
|
||||
OMNIBUSF4V6 \
|
||||
SPEEDYBEEF4 \
|
||||
SYNERGYF4 \
|
||||
TMOTORF4 \
|
||||
TRANSTECF411 \
|
||||
VGOODRCF4 \
|
||||
XILOF4 \
|
||||
AIRBOTF7 \
|
||||
AIRF7 \
|
||||
ALIENFLIGHTNGF7 \
|
||||
CLRACINGF7 \
|
||||
ELINF722 \
|
||||
EXF722DUAL \
|
||||
FLYWOOF7DUAL \
|
||||
FOXEERF722DUAL \
|
||||
FPVM_BETAFLIGHTF7 \
|
||||
JHEF7DUAL \
|
||||
KAKUTEF7 \
|
||||
KAKUTEF7MINI \
|
||||
LUXMINIF7 \
|
||||
MAMBAF722 \
|
||||
MATEKF722 \
|
||||
MATEKF722SE \
|
||||
MERAKRCF722 \
|
||||
NERO \
|
||||
OMNIBUSF7NANOV7 \
|
||||
OMNIBUSF7V2 \
|
||||
RUSHCORE7 \
|
||||
SPEEDYBEEF7 \
|
||||
SPRACINGF7DUAL \
|
||||
TMOTORF7 \
|
||||
TRANSTECF7 \
|
||||
|
||||
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
|
||||
TARGETS_PER_GROUP := $(shell expr $(TARGETS_TOTAL) / $(TARGET_GROUPS) )
|
||||
|
||||
ST := 1
|
||||
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)
|
||||
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)
|
||||
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)
|
||||
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))
|
||||
|
|
Loading…
Reference in New Issue