Gave module proj auto parent cycle and removed that for assert clones.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in 5s
All checks were successful
Run test asserts / Test-Asserts (push) Successful in 5s
This commit is contained in:
parent
e9f91f1e96
commit
bc70369c37
12 changed files with 82 additions and 53 deletions
|
|
@ -17,8 +17,8 @@ $(call mb-make-call,mb-doc-variable,MB_PROJ_META_DESCRIPTION,The project descrip
|
|||
MB_PROJ_META_WEBSITE ?=
|
||||
$(call mb-make-call,mb-doc-variable,MB_PROJ_META_WEBSITE,The project website location.)
|
||||
|
||||
MB_PROJ_PHASE_ALL = @clean @init @prepare @process @compile @link @build @test @package @package-qa @package-deploy @all
|
||||
$(call mb-make-call,mb-doc-variable-rock,MB_PROJ_PHASE_ALL,All the phases of an project with flow steps.)
|
||||
MB_PROJ_PHASE_GROW_DEPS = @prepare @process @compile @link @build @test @package @package-qa @package-deploy @all
|
||||
$(call mb-make-call,mb-doc-variable-rock,MB_PROJ_PHASE_GROW_DEPS,All the phases of an project with grow deps steps.)
|
||||
|
||||
MB_PROJ_FIRE_MODULE_INIT ?=
|
||||
$(call mb-make-call,mb-doc-variable-flow,MB_PROJ_FIRE_MODULE_INIT,List of unique module project structure targets.)
|
||||
|
|
@ -40,17 +40,17 @@ $(call mb-make-call,mb-doc-function-deep,mb-proj-grow-assert-success,Grow the su
|
|||
|
||||
define mb-proj-grow-deps-phase
|
||||
$(MB_ᕽᕽᕽ )$(call mb-make-call,mb-make-check-arg2,$(0),$(1),$(2))
|
||||
$(MB_ᕽᕽᕽ )$(call mb-make-call,mb-make-check-value-valid,$(0),$(1),$(MB_PROJ_PHASE_ALL))
|
||||
$(MB_ᕽᕽᕽ )$(call mb-make-call,mb-make-check-value-valid,$(0),$(1),$(MB_PROJ_PHASE_GROW_DEPS))
|
||||
$(MB_ᕽᕽᕽ )$(eval @$(1)-deps:: $(2))
|
||||
endef
|
||||
$(call mb-make-call,mb-doc-function-deep,mb-proj-grow-deps-phase,Grow the deps of the selected phase.,<phase> <slave-target>)
|
||||
|
||||
|
||||
define _mb-proj-flow-step-before
|
||||
$(MB_ᕽᕽᕽ )$(if $(filter $(subst @@,@,$@),$(MB_PROJ_PHASE_ALL)),$(call mb-make-call,mb-os-echo-phase,$(MB_I18N_PROJ_STEP_BEFORE) $@))
|
||||
$(MB_ᕽᕽᕽ )$(if $(filter $(subst @@,@,$@),$(MB_PROJ_PHASE_GROW_DEPS) @clean @init),$(call mb-make-call,mb-os-echo-phase,$(MB_I18N_PROJ_STEP_BEFORE) $@))
|
||||
endef
|
||||
define _mb-proj-flow-step-done
|
||||
$(MB_ᕽᕽᕽ )$(if $(filter $@,$(MB_PROJ_PHASE_ALL)),$(call mb-make-call,mb-os-echo-phase,$(MB_I18N_PROJ_STEP_AFTER) $@))
|
||||
$(MB_ᕽᕽᕽ )$(if $(filter $@,$(MB_PROJ_PHASE_GROW_DEPS) @clean @init),$(call mb-make-call,mb-os-echo-phase,$(MB_I18N_PROJ_STEP_AFTER) $@))
|
||||
$(MB_ᕽᕽᕽ )$(if $(value MAKECMDGOALS),$(if $(filter $@,$(MAKECMDGOALS)),$(call mb-make-call,mb-os-echo-report,$(MB_I18N_PROJ_OPENMSX_COUNT) $(words $(MB_OPENMSX_FIRE_PIPE_SMOKE)))))
|
||||
$(MB_ᕽᕽᕽ )$(if $(value MAKECMDGOALS),$(if $(filter $@,$(MAKECMDGOALS)),$(call mb-make-call,mb-os-echo-good,$(MB_I18N_PROJ_STEP_DONE) $@)))
|
||||
endef
|
||||
|
|
@ -62,9 +62,7 @@ define __mb-flow-proj-setup
|
|||
$(3)@@clean: $(2)
|
||||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-before)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-make-target-phony,$(3)@@clean)
|
||||
$(3)@@clean-deps:: $(2)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-make-target-phony,$(3)@@clean-deps)
|
||||
$(3)@clean: $(3)@@clean $(3)@@clean-deps
|
||||
$(3)@clean: $(3)@@clean
|
||||
$(MB_@RECIPE)$$(if $$(wildcard $(1)),$$(call mb-make-call,mb-os-echo-command,$$(MB_I18N_PROJ_DIR_DELETE) $(1)))
|
||||
$(MB_@RECIPE)$$(if $$(wildcard $(1)),$$(call mb-make-call,mb-os-dir-delete,$(1)))
|
||||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-done)
|
||||
|
|
@ -74,9 +72,7 @@ $(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-make-target-phony,$(3)@clean)
|
|||
$(3)@@init: $(2)
|
||||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-before)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-make-target-phony,$(3)@@init)
|
||||
$(3)@@init-deps:: $(2)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-make-target-phony,$(3)@@init-deps)
|
||||
$(3)@init: $(3)@@init $(3)@@init-deps
|
||||
$(3)@init: $(3)@@init
|
||||
$(MB_@RECIPE)$$(if $$(wildcard $(1)),,$$(call mb-make-call,mb-os-echo-command,$$(MB_I18N_PROJ_DIR_CREATE) $(1)))
|
||||
$(MB_@RECIPE)$$(if $$(wildcard $(1)),,$$(call mb-make-call,mb-os-dir-create,$(1)))
|
||||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-done)
|
||||
|
|
@ -92,6 +88,7 @@ $(3)@prepare: $(3)@@prepare $(3)@@prepare-deps
|
|||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-done)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-doc-target-$$(if $(3),module,help),$(3)@prepare,Prepare sources before processing.)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-make-target-phony,$(3)@prepare)
|
||||
$(MB_ᕽᕽᕽ )$$(if $(4),$$(call mb-make-call,mb-proj-grow-deps-phase,@prepare,$(3)@prepare))
|
||||
|
||||
$(3)@@process: $(3)@prepare
|
||||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-before)
|
||||
|
|
@ -102,6 +99,7 @@ $(3)@process: $(3)@@process $(3)@@process-deps
|
|||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-done)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-doc-target-$$(if $(3),module,help),$(3)@process,Process sources before compiling.)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-make-target-phony,$(3)@process)
|
||||
$(MB_ᕽᕽᕽ )$$(if $(4),$$(call mb-make-call,mb-proj-grow-deps-phase,@process,$(3)@process))
|
||||
|
||||
$(3)@@compile: $(3)@process
|
||||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-before)
|
||||
|
|
@ -112,6 +110,7 @@ $(3)@compile: $(3)@@compile $(3)@@compile-deps
|
|||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-done)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-doc-target-$$(if $(3),module,help),$(3)@compile,Compiles all project sources.)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-make-target-phony,$(3)@compile)
|
||||
$(MB_ᕽᕽᕽ )$$(if $(4),$$(call mb-make-call,mb-proj-grow-deps-phase,@compile,$(3)@compile))
|
||||
|
||||
$(3)@@link: $(3)@compile
|
||||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-before)
|
||||
|
|
@ -122,6 +121,7 @@ $(3)@link: $(3)@@link $(3)@@link-deps
|
|||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-done)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-doc-target-$$(if $(3),module,help),$(3)@link,Link all project intermediate files.)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-make-target-phony,$(3)@link)
|
||||
$(MB_ᕽᕽᕽ )$$(if $(4),$$(call mb-make-call,mb-proj-grow-deps-phase,@link,$(3)@link))
|
||||
|
||||
$(3)@@build: $(3)@link
|
||||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-before)
|
||||
|
|
@ -132,6 +132,7 @@ $(3)@build: $(3)@@build $(3)@@build-deps
|
|||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-done)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-doc-target-$$(if $(3),module,help),$(3)@build,Build all project artifacts.)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-make-target-phony,$(3)@build)
|
||||
$(MB_ᕽᕽᕽ )$$(if $(4),$$(call mb-make-call,mb-proj-grow-deps-phase,@build,$(3)@build))
|
||||
|
||||
$(3)@@test: $(3)@build
|
||||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-before)
|
||||
|
|
@ -143,6 +144,7 @@ $(MB_@RECIPE)$$(if $(3),,$$(call mb-make-call,mb-os-echo-report,$$(MB_I18N_PROJ_
|
|||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-done)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-doc-target-$$(if $(3),module,help),$(3)@test,Run all assertion tests.)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-make-target-phony,$(3)@test)
|
||||
$(MB_ᕽᕽᕽ )$$(if $(4),$$(call mb-make-call,mb-proj-grow-deps-phase,@test,$(3)@test))
|
||||
|
||||
$(3)@@package: $(3)@test
|
||||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-before)
|
||||
|
|
@ -153,6 +155,7 @@ $(3)@package: $(3)@@package $(3)@@package-deps
|
|||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-done)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-doc-target-$$(if $(3),module,help),$(3)@package,Create all packages of project.)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-make-target-phony,$(3)@package)
|
||||
$(MB_ᕽᕽᕽ )$$(if $(4),$$(call mb-make-call,mb-proj-grow-deps-phase,@package,$(3)@package))
|
||||
|
||||
$(3)@@package-qa: $(3)@package
|
||||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-before)
|
||||
|
|
@ -164,6 +167,7 @@ $(MB_@RECIPE)$$(if $(3),,$$(call mb-make-call,mb-os-echo-report,$$(MB_I18N_PROJ_
|
|||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-done)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-doc-target-$$(if $(3),module,help),$(3)@package-qa,Run all packages QA of project.)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-make-target-phony,$(3)@package-qa)
|
||||
$(MB_ᕽᕽᕽ )$$(if $(4),$$(call mb-make-call,mb-proj-grow-deps-phase,@package-qa,$(3)@package-qa))
|
||||
|
||||
$(3)@@package-deploy: $(3)@package-qa
|
||||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-before)
|
||||
|
|
@ -174,6 +178,7 @@ $(3)@package-deploy: $(3)@@package-deploy $(3)@@package-deploy-deps
|
|||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-done)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-doc-target-$$(if $(3),module,help),$(3)@package-deploy,Deploy all the packages.)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-make-target-phony,$(3)@package-deploy)
|
||||
$(MB_ᕽᕽᕽ )$$(if $(4),$$(call mb-make-call,mb-proj-grow-deps-phase,@package-deploy,$(3)@package-deploy))
|
||||
|
||||
$(3)@@all: $(3)@package-qa
|
||||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-before)
|
||||
|
|
@ -185,6 +190,7 @@ $(MB_@RECIPE)$$(if $$(value MAKECMDGOALS),,$$(call mb-make-call,mb-os-echo-repor
|
|||
$(MB_@RECIPE)$$(call mb-make-call,_mb-proj-flow-step-done)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-doc-target-$$(if $(3),module,help),$(3)@all,Run full build and package QA tests.)
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-make-target-phony,$(3)@all)
|
||||
$(MB_ᕽᕽᕽ )$$(if $(4),$$(call mb-make-call,mb-proj-grow-deps-phase,@all,$(3)@all))
|
||||
|
||||
.RECIPEPREFIX := $(MB_@RECIPEPREFIX)
|
||||
endef
|
||||
|
|
@ -196,11 +202,18 @@ $(MB_ᕽᕽᕽ )$(if $(3),,$(call mb-make-call,mb-make-check-variable,MB
|
|||
$(MB_ᕽᕽᕽ )$(if $(3),,$(call mb-make-call,mb-make-check-variable,MB_PROJ_META_NAME))
|
||||
$(MB_ᕽᕽᕽ )$(if $(3),,$(call mb-make-call,mb-make-check-variable,MB_PROJ_META_DESCRIPTION))
|
||||
$(MB_ᕽᕽᕽ )$(if $(3),,$(call mb-make-call,mb-make-check-variable,MB_PROJ_META_WEBSITE))
|
||||
$(MB_ᕽᕽᕽ )$(if $(filter $(if $(3),$(3)/@init,@init),$(MB_PROJ_FIRE_MODULE_INIT)),,$(eval $(call mb-make-call,__$(0),$(1),$(2),$(if $(3),$(3)/))))
|
||||
$(MB_ᕽᕽᕽ )$(if $(filter $(if $(3),$(3)/@init,@init),$(MB_PROJ_FIRE_MODULE_INIT)),,$(eval $(call mb-make-call,__$(0),$(1),$(2),$(if $(3),$(3)/),$(if $(3),$(3)/))))
|
||||
$(MB_ᕽᕽᕽ )$(if $(3),,$(if $(MB_I18N),$(if $(filter off,$(MB_I18N)),,$(call mb-make-call,_$(0)-i18n))))
|
||||
$(MB_ᕽᕽᕽ )$(eval MB_PROJ_FIRE_MODULE_INIT $(MB_MAKE_APPEND) $(if $(3),$(3)/@init,@init))
|
||||
endef
|
||||
$(call mb-make-call,mb-doc-function-flow,mb-flow-proj-setup,Inject flow of abstract project build cycle.,<bin-dir> [parent-glue] [bin-mod-dir])
|
||||
define mb-flow-proj-setup-orphan
|
||||
$(MB_ᕽᕽᕽ )$(call mb-make-call,mb-make-check-arg1,$(0),$(1))
|
||||
$(MB_ᕽᕽᕽ )$(if $(filter $(if $(3),$(3)/@init,@init),$(MB_PROJ_FIRE_MODULE_INIT)),,$(eval $(call mb-make-call,__mb-flow-proj-setup,$(1),$(2),$(if $(3),$(3)/))))
|
||||
$(MB_ᕽᕽᕽ )$(eval MB_PROJ_FIRE_MODULE_INIT $(MB_MAKE_APPEND) $(if $(3),$(3)/@init,@init))
|
||||
endef
|
||||
$(call mb-make-call,mb-doc-function-flow,mb-flow-proj-setup-orphan,Inject flow of abstract orphan project module.,<bin-dir> [parent-glue] [bin-mod-dir])
|
||||
|
||||
|
||||
|
||||
define __mb-flow-proj-setup-i18n
|
||||
|
|
@ -306,17 +319,19 @@ $(call mb-make-call,mb-doc-function-flow,mb-flow-proj-module-run,Inject flow mod
|
|||
define __mb-flow-proj-prepare-packages
|
||||
.RECIPEPREFIX := $(MB_@RECIPE)
|
||||
|
||||
$(1)/@@prepare-deps:: $(1)/@msxhub/$(2)
|
||||
$(1)/@msxhub/$(2): @@module-msxhub
|
||||
$(1)/@msxhub/$(2): $(MB_@INCLUDE_CHAIN)
|
||||
$(MB_@RECIPE)$$(if $$(wildcard $(1)$$(if $(3),/$(3))),,$$(call mb-make-call,mb-os-dir-create,$(1)$$(if $(3),/$(3))))
|
||||
$(MB_@RECIPE)$$(call mb-make-call,mb-msxhub-get-$(2),$(1)$$(if $(3),/$(3)))
|
||||
$(MB_ᕽᕽᕽ )$$(call mb-make-call,mb-make-target-phony,$(1)/@msxhub/$(2))
|
||||
$(MB_ᕽᕽᕽ )MB_@INCLUDE_CHAIN :$(MB_MAKE_EQUALS) $(1)/@msxhub/$(2)
|
||||
|
||||
.RECIPEPREFIX := $(MB_@RECIPEPREFIX)
|
||||
endef
|
||||
define mb-flow-proj-prepare-packages
|
||||
$(MB_ᕽᕽᕽ )$(call mb-make-call,mb-make-check-arg2,$(0),$(1),$(2))
|
||||
$(MB_ᕽᕽᕽ )$(eval MB_@INCLUDE_CHAIN :$(MB_MAKE_EQUALS) $(1)/@@prepare)
|
||||
$(MB_ᕽᕽᕽ )$(foreach _pack,$(2),$(eval $(call mb-make-call,__$(0),$(1),$(_pack),$(3))))
|
||||
$(MB_ᕽᕽᕽ )$(eval $(1)/@@prepare-deps:: $(MB_@INCLUDE_CHAIN))
|
||||
endef
|
||||
$(call mb-make-call,mb-doc-function-flow,mb-flow-proj-prepare-packages,Inject package fetch flow for module.,<bin-dir> <packages> [dest-dir])
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue