mirror of
https://github.com/UpsilonNumworks/Upsilon.git
synced 2026-01-18 16:27:34 +01:00
[build] Use variants
- Move helpers functions into build/helpers.mak - Move official warning into official targets only
This commit is contained in:
Romain Goyet
Ecco
@@ -3,22 +3,9 @@
|
||||
PLATFORM ?= device
|
||||
DEBUG ?= 0
|
||||
|
||||
include build/defaults.mak
|
||||
include build/platform.$(PLATFORM).mak
|
||||
|
||||
EPSILON_VERSION ?= 13.0.0
|
||||
EPSILON_APPS ?= calculation graph code statistics probability solver sequence regression settings
|
||||
EPSILON_I18N ?= en fr es de pt
|
||||
EPSILON_GETOPT ?= 0
|
||||
EPSILON_TELEMETRY ?= 0
|
||||
ESCHER_LOG_EVENTS_BINARY ?= 0
|
||||
|
||||
ifndef USE_LIBA
|
||||
$(error platform.mak should define USE_LIBA)
|
||||
endif
|
||||
include build/toolchain.$(TOOLCHAIN).mak
|
||||
|
||||
SFLAGS += -DDEBUG=$(DEBUG)
|
||||
SFLAGS += -DEPSILON_GETOPT=$(EPSILON_GETOPT)
|
||||
SFLAGS += -DEPSILON_TELEMETRY=$(EPSILON_TELEMETRY)
|
||||
SFLAGS += -DESCHER_LOG_EVENTS_BINARY=$(ESCHER_LOG_EVENTS_BINARY)
|
||||
|
||||
@@ -2,6 +2,11 @@ HOSTCC = gcc
|
||||
HOSTCXX = g++
|
||||
PYTHON = python3
|
||||
|
||||
SFLAGS += -DDEBUG=$(DEBUG)
|
||||
SFLAGS += -DEPSILON_GETOPT=$(EPSILON_GETOPT)
|
||||
SFLAGS += -DEPSILON_TELEMETRY=$(EPSILON_TELEMETRY)
|
||||
SFLAGS += -DESCHER_LOG_EVENTS_BINARY=$(ESCHER_LOG_EVENTS_BINARY)
|
||||
|
||||
# Language-specific flags
|
||||
CFLAGS = -std=c99
|
||||
CXXFLAGS = -std=c++11 -fno-exceptions -fno-rtti -fno-threadsafe-statics
|
||||
|
||||
36
build/helpers.mk
Normal file
36
build/helpers.mk
Normal file
@@ -0,0 +1,36 @@
|
||||
# Define a standard rule helper
|
||||
# If passed a last parameter value of with_local_version, we also define an
|
||||
# extra rule that can build source files within the $(BUILD_DIR). This is useful
|
||||
# for rules that can be applied for intermediate objects (for example, when
|
||||
# going .png -> .cpp -> .o).
|
||||
|
||||
define rule_label
|
||||
@ echo "$(shell printf "%-8s" $(strip $(1)))$(@:$(BUILD_DIR)/%=%)"
|
||||
endef
|
||||
|
||||
define rule_for
|
||||
ifeq ($(strip $(5)),with_local_version)
|
||||
$(addprefix $$(BUILD_DIR)/,$(strip $(2))): $(addprefix $$(BUILD_DIR)/,$(strip $(3)))
|
||||
@ echo "$(shell printf "%-8s" $(strip $(1)))$$(@:$$(BUILD_DIR)/%=%)"
|
||||
$(Q) $(4)
|
||||
endif
|
||||
$(addprefix $$(BUILD_DIR)/,$(strip $(2))): $(strip $(3)) | $$$$(@D)/.
|
||||
@ echo "$(shell printf "%-8s" $(strip $(1)))$$(@:$$(BUILD_DIR)/%=%)"
|
||||
$(Q) $(4)
|
||||
endef
|
||||
|
||||
# Helper functions to work with variants
|
||||
|
||||
define direct_object_for
|
||||
$(addprefix $(BUILD_DIR)/,$(addsuffix .o,$(basename $(1))))
|
||||
endef
|
||||
|
||||
# Objects for source files in $(1) matching flavor $(2). A flavor is a dot
|
||||
# separated list of variants (e.g. large.speed).
|
||||
define flavored_object_for
|
||||
$(call direct_object_for,$(call filter_variants,$(1),$(sort $(subst ., ,$(2)))))
|
||||
endef
|
||||
|
||||
define object_for
|
||||
$(call direct_object_for,$(call any_variant,$(1)))
|
||||
endef
|
||||
@@ -1,16 +1,5 @@
|
||||
# Define standard compilation rules
|
||||
|
||||
.PHONY: official_authorization
|
||||
ifeq ($(ACCEPT_OFFICIAL_TOS),1)
|
||||
official_authorization:
|
||||
else
|
||||
official_authorization:
|
||||
@echo "CAUTION: You are trying to build an official NumWorks firmware."
|
||||
@echo "Distribution of such firmware by a third party is prohibited."
|
||||
@echo "Please set the ACCEPT_OFFICIAL_TOS environment variable to proceed."
|
||||
@exit -1
|
||||
endif
|
||||
|
||||
$(eval $(call rule_for, \
|
||||
AS, %.o, %.s, \
|
||||
$$(CC) $$(SFLAGS) -c $$< -o $$@ \
|
||||
@@ -22,12 +11,34 @@ $(eval $(call rule_for, \
|
||||
with_local_version \
|
||||
))
|
||||
|
||||
$(eval $(call rule_for, \
|
||||
CPP, %, %.inc, \
|
||||
$$(CPP) -P $$< $$@ \
|
||||
))
|
||||
|
||||
$(eval $(call rule_for, \
|
||||
CXX, %.o, %.cpp, \
|
||||
$$(CXX) $$(CXXFLAGS) $$(SFLAGS) -c $$< -o $$@, \
|
||||
with_local_version \
|
||||
))
|
||||
|
||||
$(eval $(call rule_for, \
|
||||
DFUSE, %.dfu, %.elf, \
|
||||
$$(PYTHON) build/device/elf2dfu.py $$< $$@, \
|
||||
with_local_version \
|
||||
))
|
||||
|
||||
$(eval $(call rule_for, \
|
||||
OBJCOPY, %.hex, %.elf, \
|
||||
$$(OBJCOPY) -O ihex $$< $$@ \
|
||||
))
|
||||
|
||||
$(eval $(call rule_for, \
|
||||
OBJCOPY, %.bin, %.elf, \
|
||||
$$(OBJCOPY) -O binary $$< $$@, \
|
||||
with_local_version \
|
||||
))
|
||||
|
||||
$(eval $(call rule_for, \
|
||||
OCC, %.o, %.m, \
|
||||
$$(CC) $$(CFLAGS) $$(SFLAGS) -c $$< -o $$@ \
|
||||
@@ -39,8 +50,8 @@ $(eval $(call rule_for, \
|
||||
))
|
||||
|
||||
$(eval $(call rule_for, \
|
||||
CPP, %, %.inc, \
|
||||
$$(CPP) -P $$< $$@ \
|
||||
WINDRES, %.o, %.rc, \
|
||||
$$(WINDRES) $$< -O coff -o $$@ \
|
||||
))
|
||||
|
||||
ifdef EXE
|
||||
@@ -61,8 +72,3 @@ $(eval $(call rule_for, \
|
||||
))
|
||||
endif
|
||||
endif
|
||||
|
||||
$(eval $(call rule_for, \
|
||||
WINDRES, %.o, %.rc, \
|
||||
$$(WINDRES) $$< -O coff -o $$@ \
|
||||
))
|
||||
|
||||
@@ -3,23 +3,6 @@ include build/targets.device.$(MODEL).mak
|
||||
HANDY_TARGETS += flasher.light flasher.verbose bench.ram bench.flash
|
||||
HANDY_TARGETS_EXTENSIONS += dfu hex bin
|
||||
|
||||
$(eval $(call rule_for, \
|
||||
DFUSE, %.dfu, %.$$(EXE), \
|
||||
$$(PYTHON) build/device/elf2dfu.py $$< $$@, \
|
||||
with_local_version \
|
||||
))
|
||||
|
||||
$(eval $(call rule_for, \
|
||||
OBJCOPY, %.hex, %.$$(EXE), \
|
||||
$$(OBJCOPY) -O ihex $$< $$@ \
|
||||
))
|
||||
|
||||
$(eval $(call rule_for, \
|
||||
OBJCOPY, %.bin, %.$$(EXE), \
|
||||
$$(OBJCOPY) -O binary $$< $$@, \
|
||||
with_local_version \
|
||||
))
|
||||
|
||||
.PHONY: %_size
|
||||
%_size: $(BUILD_DIR)/%.$(EXE)
|
||||
@echo "========= BUILD OUTPUT ========"
|
||||
@@ -47,16 +30,16 @@ openocd:
|
||||
|
||||
# The flasher target is defined here because otherwise $(%_src) has not been
|
||||
# fully filled
|
||||
flasher_src = $(ion_src) $(ion_device_flasher_src) $(liba_src) $(kandinsky_src)
|
||||
$(BUILD_DIR)/flasher.light.$(EXE): $(call flavored_object_for,$(flasher_src),light usbxip)
|
||||
$(BUILD_DIR)/flasher.verbose.$(EXE): $(call flavored_object_for,$(flasher_src),usbxip)
|
||||
$(BUILD_DIR)/flasher.%.$(EXE): LDFLAGS += -Lion/src/$(PLATFORM)/flasher
|
||||
$(BUILD_DIR)/flasher.%.$(EXE): LDSCRIPT = ion/src/$(PLATFORM)/shared/ram.ld
|
||||
flasher_base_src = $(ion_xip_src) $(liba_src) $(kandinsky_src)
|
||||
$(BUILD_DIR)/flasher.light.$(EXE): $(call object_for,$(flasher_base_src) $(ion_target_device_flasher_light_src))
|
||||
$(BUILD_DIR)/flasher.verbose.$(EXE): $(call object_for,$(flasher_base_src) $(ion_target_device_flasher_verbose_src))
|
||||
|
||||
#TODO Do not build all apps... Put elsewhere?
|
||||
bench_src = $(ion_src) $(liba_src) $(kandinsky_src) $(poincare_src) $(libaxx_src) $(app_shared_src) $(ion_device_bench_src)
|
||||
$(BUILD_DIR)/bench.ram.$(EXE): $(call flavored_object_for,$(bench_src),consoleuart usbxip)
|
||||
$(BUILD_DIR)/bench.ram.$(EXE): LDFLAGS += -Lion/src/$(PLATFORM)/bench
|
||||
$(BUILD_DIR)/bench.ram.$(EXE): LDSCRIPT = ion/src/$(PLATFORM)/shared/ram.ld
|
||||
$(BUILD_DIR)/bench.flash.$(EXE): $(call flavored_object_for,$(bench_src),consoleuart usbxip)
|
||||
$(BUILD_DIR)/bench.flash.$(EXE): LDSCRIPT = ion/src/$(PLATFORM)/$(MODEL)/internal_flash.ld
|
||||
bench_src = $(ion_xip_src) $(liba_src) $(kandinsky_src) $(poincare_src) $(libaxx_src) $(app_shared_src) $(ion_target_device_bench_src)
|
||||
$(BUILD_DIR)/bench.ram.$(EXE): $(call object_for,$(bench_src))
|
||||
$(BUILD_DIR)/bench.flash.$(EXE): $(call object_for,$(bench_src))
|
||||
|
||||
@@ -1,28 +1,8 @@
|
||||
# Define standard Epsilon targets
|
||||
base_src = $(liba_src) $(kandinsky_src) $(escher_src) $(libaxx_src) $(poincare_src) $(python_src)
|
||||
|
||||
epsilon_src = $(base_src) $(ion_default_src) $(apps_default_src)
|
||||
epsilon_official_src = $(base_src) $(ion_default_src) $(apps_official_default_src)
|
||||
|
||||
$(BUILD_DIR)/epsilon.$(EXE): $(call object_for,$(epsilon_src))
|
||||
$(BUILD_DIR)/epsilon.official.$(EXE): $(call object_for,$(epsilon_official_src))
|
||||
$(BUILD_DIR)/epsilon.onboarding.$(EXE): $(call object_for, $(base_src) $(ion_default_src) $(apps_onboarding_src))
|
||||
$(BUILD_DIR)/epsilon.official.onboarding.$(EXE): $(call object_for,$(base_src) $(ion_default_src) $(apps_official_onboarding_src))
|
||||
$(BUILD_DIR)/epsilon.onboarding.update.$(EXE): $(call object_for, $(base_src) $(ion_default_src) $(apps_onboarding_update_src))
|
||||
$(BUILD_DIR)/epsilon.official.onboarding.update.$(EXE): $(call object_for,$(base_src) $(ion_default_src) $(apps_official_onboarding_update_src))
|
||||
$(BUILD_DIR)/epsilon.onboarding.beta.$(EXE): $(call object_for, $(base_src) $(ion_default_src) $(apps_onboarding_beta_src))
|
||||
$(BUILD_DIR)/epsilon.official.onboarding.beta.$(EXE): $(call object_for,$(base_src) $(ion_default_src) $(apps_official_onboarding_beta_src))
|
||||
|
||||
test_base_src = $(base_src) $(apps_tests_src) $(runner_src) $(tests_src)
|
||||
|
||||
test_runner_src = $(test_base_src) $(ion_console_on_screen_src)
|
||||
$(BUILD_DIR)/test.$(EXE): $(call object_for,$(test_runner_src))
|
||||
|
||||
# Define handy targets
|
||||
# Those can be built easily by simply invoking "make target.ext". The named file
|
||||
# will be built in $(BUILD_DIR).
|
||||
|
||||
HANDY_TARGETS += epsilon epsilon.official epsilon.onboarding epsilon.official.onboarding epsilon.onboarding.update epsilon.official.onboarding.update epsilon.onboarding.beta epsilon.official.onboarding.beta test
|
||||
HANDY_TARGETS +=
|
||||
HANDY_TARGETS_EXTENSIONS += $(EXE)
|
||||
|
||||
define handy_target_rule
|
||||
@@ -30,10 +10,70 @@ define handy_target_rule
|
||||
$(1).$(2): $$(BUILD_DIR)/$(1).$(2)
|
||||
endef
|
||||
|
||||
# Epsilon base target
|
||||
|
||||
base_src = $(ion_src) $(liba_src) $(kandinsky_src) $(escher_src) $(libaxx_src) $(poincare_src) $(python_src)
|
||||
|
||||
epsilon_src = $(base_src) $(apps_src)
|
||||
|
||||
$(BUILD_DIR)/epsilon.$(EXE): $(call flavored_object_for,$(epsilon_src))
|
||||
|
||||
HANDY_TARGETS += epsilon
|
||||
|
||||
# Epsilon flavored targets
|
||||
|
||||
epsilon_flavors = \
|
||||
onboarding \
|
||||
onboarding.update \
|
||||
onboarding.beta
|
||||
|
||||
define rule_for_epsilon_flavor
|
||||
$$(BUILD_DIR)/epsilon.$(1).$$(EXE): $$(call flavored_object_for,$$(epsilon_src),$(1))
|
||||
endef
|
||||
|
||||
$(foreach flavor,$(epsilon_flavors),$(eval $(call rule_for_epsilon_flavor,$(flavor))))
|
||||
|
||||
HANDY_TARGETS += $(foreach flavor,$(epsilon_flavors),epsilon.$(flavor))
|
||||
|
||||
# Epsilon official targets
|
||||
|
||||
epsilon_official_flavors = \
|
||||
official \
|
||||
official.onboarding \
|
||||
official.onboarding.update \
|
||||
official.onboarding.beta
|
||||
|
||||
define rule_for_unconfirmed_official_flavor
|
||||
$$(BUILD_DIR)/epsilon.$(1).$$(EXE):
|
||||
@echo "CAUTION: You are trying to build an official NumWorks firmware."
|
||||
@echo "Distribution of such firmware by a third party is prohibited."
|
||||
@echo "Please set the ACCEPT_OFFICIAL_TOS environment variable to proceed."
|
||||
@exit -1
|
||||
endef
|
||||
|
||||
ifeq ($(ACCEPT_OFFICIAL_TOS),1)
|
||||
rule_for_official_epsilon_flavor = rule_for_epsilon_flavor
|
||||
else
|
||||
rule_for_official_epsilon_flavor = rule_for_unconfirmed_official_flavor
|
||||
endif
|
||||
|
||||
$(foreach flavor,$(epsilon_official_flavors),$(eval $(call $(rule_for_official_epsilon_flavor),$(flavor))))
|
||||
|
||||
HANDY_TARGETS += $(foreach flavor,$(epsilon_official_flavors),epsilon.$(flavor))
|
||||
|
||||
# Test
|
||||
|
||||
test_runner_src = $(base_src) $(apps_tests_src) $(runner_src) $(tests_src)
|
||||
|
||||
$(BUILD_DIR)/test.$(EXE): $(call flavored_object_for,$(test_runner_src),consoledisplay)
|
||||
|
||||
HANDY_TARGETS += test
|
||||
|
||||
# Load platform-specific targets
|
||||
# We include them before the standard ones to give them precedence.
|
||||
-include build/targets.$(PLATFORM).mak
|
||||
|
||||
# Generate handy targets rules
|
||||
$(foreach extension,$(HANDY_TARGETS_EXTENSIONS),$(foreach executable,$(HANDY_TARGETS),$(eval $(call handy_target_rule,$(executable),$(extension)))))
|
||||
|
||||
include build/targets.all.mak
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
# Headless targets
|
||||
epsilon_headless_src = $(base_src) $(ion_headless_src) $(apps_default_src)
|
||||
$(BUILD_DIR)/epsilon.headless.$(EXE): $(call object_for,$(epsilon_headless_src))
|
||||
$(eval $(call rule_for_epsilon_flavor,headless))
|
||||
|
||||
test_runner_headless_src = $(test_base_src) $(ion_headless_src)
|
||||
$(BUILD_DIR)/test.headless.$(EXE): $(call object_for,$(test_runner_headless_src))
|
||||
HANDY_TARGETS += epsilon.headless
|
||||
|
||||
HANDY_TARGETS += epsilon.headless test.headless
|
||||
$(BUILD_DIR)/test.headless.$(EXE): $(call flavored_object_for,$(test_runner_src),headless)
|
||||
|
||||
HANDY_TARGETS += test.headless
|
||||
|
||||
-include build/targets.simulator.$(TARGET).mak
|
||||
|
||||
63
build/variants.mak
Normal file
63
build/variants.mak
Normal file
@@ -0,0 +1,63 @@
|
||||
# Helper functions to work with variants
|
||||
# Make variants_test for an example
|
||||
|
||||
define available_variants_in
|
||||
$(sort $(patsubst +%,%,$(filter +%,$(subst :, ,$(1)))))
|
||||
endef
|
||||
|
||||
define without_any_variant_specifier
|
||||
$(filter-out $(foreach variant,$(call available_variants_in,$(1)),%:-$(variant) %:+$(variant)),$(1))
|
||||
endef
|
||||
|
||||
define with_variant_specifier_matching
|
||||
$(foreach variant,$(3),$(patsubst %:$(1)$(variant),%,$(filter %:$(1)$(variant),$(2))))
|
||||
endef
|
||||
|
||||
define without_any_variant_specifier_matching
|
||||
$(filter-out \
|
||||
$(call with_variant_specifier_matching,$(1),$(2),$(3)), \
|
||||
$(foreach variant,$(call available_variants_in,$(2)),$(call with_variant_specifier_matching,$(1),$(2),$(variant))) \
|
||||
)
|
||||
endef
|
||||
|
||||
# Return files in $(1) that match the variant $(2)
|
||||
define filter_variants
|
||||
$(sort \
|
||||
$(call without_any_variant_specifier,$(1)) \
|
||||
$(call with_variant_specifier_matching,+,$(1),$(2)) \
|
||||
$(call without_any_variant_specifier_matching,-,$(1),$(2)) \
|
||||
)
|
||||
endef
|
||||
|
||||
# Return all files in $(1) no matter their variant
|
||||
define any_variant
|
||||
$(sort $(filter-out -%,$(filter-out +%,$(subst :, ,$(1)))))
|
||||
endef
|
||||
|
||||
# Examples
|
||||
|
||||
variants_test_src = base.cpp
|
||||
variants_test_src += color/green.cpp:+green
|
||||
variants_test_src += color/red.cpp:+red
|
||||
variants_test_src += color/blue.cpp:-red
|
||||
variants_test_src += color/blue.cpp:-green
|
||||
variants_test_src += engine/fast.cpp:+nitro
|
||||
variants_test_src += engine/slow.cpp:-nitro
|
||||
|
||||
.PHONY: variants_test
|
||||
variants_test:
|
||||
$(info AVAILABLE_VARIANTS_IN)
|
||||
$(info --result: $(call available_variants_in,$(variants_test_src),))
|
||||
$(info --expected: green nitro red)
|
||||
$(info FILTER_VARIANTS)
|
||||
$(info --result: $(call filter_variants,$(variants_test_src),))
|
||||
$(info --expected: base.cpp color/blue.cpp engine/slow.cpp)
|
||||
$(info FILTER_VARIANTS red)
|
||||
$(info --result: $(call filter_variants,$(variants_test_src),red))
|
||||
$(info --expected: base.cpp color/red.cpp engine/slow.cpp)
|
||||
$(info FILTER_VARIANTS green speed)
|
||||
$(info --result: $(call filter_variants,$(variants_test_src),green nitro))
|
||||
$(info --expected: base.cpp color/green.cpp engine/fast.cpp)
|
||||
$(info ANY_VARIANT)
|
||||
$(info --result: $(call any_variant,$(variants_test_src)))
|
||||
$(info --expected: base.cpp color/blue.cpp color/green.cpp color/red.cpp engine/fast.cpp engine/slow.cpp)
|
||||
Reference in New Issue
Block a user