From 3560cd7340642c18ee2bf07f79de13d723aad155 Mon Sep 17 00:00:00 2001 From: Willem Date: Thu, 18 Jul 2024 15:57:00 +0200 Subject: [PATCH] Added help for orphan modules and renamed manual assert to be equal as others. --- lib/make/सिस्टमₚᵣₐᵧToੴ/mb_doc.mk | 6 ++-- lib/make/सिस्टमₚᵣₐᵧToੴ/mb_make_doc4u.mk | 2 ++ lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk | 24 ++++++++-------- lib/make/𓃬𓍄𓋹𓀭/mb_flow_help.mk | 28 ++++++++++++++++-- lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk | 30 ++++++++++---------- src/assert/msxhub/0module100.mk | 10 +++---- src/example/dist-hello-qa-dos1/0module010.mk | 8 +++--- src/example/dist-hello-qa-dos2/0module010.mk | 8 +++--- src/example/dist-hello-qa-msx1/0module010.mk | 8 +++--- src/tools/gluedos1/0module000.mk | 12 ++++---- 10 files changed, 82 insertions(+), 54 deletions(-) diff --git a/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_doc.mk b/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_doc.mk index cedf269..6b047e1 100644 --- a/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_doc.mk +++ b/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_doc.mk @@ -11,6 +11,7 @@ MB_DOC_FIRE_TARGET = $(call mb-make-call,mb-make-space-newline) MB_DOC_FIRE_TARGET_DEEP = $(call mb-make-call,mb-make-space-newline) MB_DOC_FIRE_TARGET_RUN = $(call mb-make-call,mb-make-space-newline) MB_DOC_FIRE_TARGET_MODULE = $(call mb-make-call,mb-make-space-newline) +MB_DOC_FIRE_TARGET_ORPHAN = $(call mb-make-call,mb-make-space-newline) MB_DOC_FIRE_TARGET_ASSERT = $(call mb-make-call,mb-make-space-newline) MB_DOC_FIRE_TARGET_HELP = $(call mb-make-call,mb-make-space-newline) MB_DOC_XML_ROOT := firemake @@ -57,7 +58,6 @@ $(MB_ᕽᕽᕽ　　　)$(eval MB_DOC_FIRE_VARIABLE_I18N += $$(call mb-make-call endef - define _mb-doc-function-txt $(MB_ᕽᕽᕽ　　　)* $(2) $(if $(4),$(MB_MAKE_EQUALS) $(4))$(if $(3),$(call mb-make-call,mb-make-space-newline)$(call mb-make-call,mb-make-space-tab)$(3)$(call mb-make-call,mb-make-space-newline))$\ $(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-space-newline) @@ -80,7 +80,6 @@ $(MB_ᕽᕽᕽ　　　)$(eval MB_DOC_FIRE_FUNCTION_FLOW += $$(call mb-make-call endef - define _mb-doc-target-txt $(MB_ᕽᕽᕽ　　　)* $(2)$(if $(3),$(call mb-make-call,mb-make-space-newline)$(call mb-make-call,mb-make-space-tab)$(3))$(call mb-make-call,mb-make-space-newline)$\ $(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-space-newline) @@ -106,6 +105,9 @@ endef define mb-doc-target-module $(MB_ᕽᕽᕽ　　　)$(eval MB_DOC_FIRE_TARGET_MODULE += $$(call mb-make-call,_mb-doc-target-$$(MB_DOC_FORMAT),module,$(1),$(2))) endef +define mb-doc-target-orphan +$(MB_ᕽᕽᕽ　　　)$(eval MB_DOC_FIRE_TARGET_ORPHAN += $$(call mb-make-call,_mb-doc-target-$$(MB_DOC_FORMAT),orphan,$(1),$(2))) +endef define mb-doc-target-assert $(MB_ᕽᕽᕽ　　　)$(eval MB_DOC_FIRE_TARGET_ASSERT += $$(call mb-make-call,_mb-doc-target-$$(MB_DOC_FORMAT),assert,$(1),$(2))) endef diff --git a/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_make_doc4u.mk b/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_make_doc4u.mk index 0486000..6587eaa 100644 --- a/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_make_doc4u.mk +++ b/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_make_doc4u.mk @@ -13,6 +13,7 @@ $(call mb-make-call,mb-doc-variable-flow,MB_DOC_FIRE_TARGET,Flow builder of fire $(call mb-make-call,mb-doc-variable-flow,MB_DOC_FIRE_TARGET_DEEP,Flow builder of firemake deep target data.) $(call mb-make-call,mb-doc-variable-flow,MB_DOC_FIRE_TARGET_RUN,Flow builder of firemake run target data.) $(call mb-make-call,mb-doc-variable-flow,MB_DOC_FIRE_TARGET_MODULE,Flow builder of firemake module target data.) +$(call mb-make-call,mb-doc-variable-flow,MB_DOC_FIRE_TARGET_ORPHAN,Flow builder of firemake orphan target data.) $(call mb-make-call,mb-doc-variable-flow,MB_DOC_FIRE_TARGET_ASSERT,Flow builder of firemake assert target data.) $(call mb-make-call,mb-doc-variable-flow,MB_DOC_FIRE_TARGET_HELP,Flow builder of firemake help data.) $(call mb-make-call,mb-doc-variable-rock,MB_DOC_XML_ROOT,XML root tag for firemake output.) @@ -37,6 +38,7 @@ $(call mb-make-call,mb-doc-function-deep,mb-doc-target-deep,Saves formatted docu $(call mb-make-call,mb-doc-function-deep,mb-doc-target-help,Saves formatted documention of an help target., [desc]) $(call mb-make-call,mb-doc-function-deep,mb-doc-target_run,Saves formatted documention of an run target., [desc]) $(call mb-make-call,mb-doc-function-deep,mb-doc-target-module,Saves formatted documention of an module target., [desc]) +$(call mb-make-call,mb-doc-function-deep,mb-doc-target-orphan,Saves formatted documention of an orphan target., [desc]) $(call mb-make-call,mb-doc-function-deep,mb-doc-target-assert,Saves formatted documention of an assert target., [desc]) # After doc, to have equal order to include order diff --git a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk index c700751..e15344f 100644 --- a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk +++ b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk @@ -2,16 +2,16 @@ define __mb-flow-assert-grep-binary-x .RECIPEPREFIX := $(MB_@RECIPE) -$(1)/@assert/$(5)/$(2): $(1)/@$(5) +$(1)/@assert/$(5)/@$(2): $(1)/@$(5) $(MB_@RECIPE)@echo -n "$(MB_I18N_OS_CRAYON_TAG) " $(MB_@RECIPE)grep --colour$(MB_MAKE_EQUALS)auto -U "$(4)" $(1)/$(3) -$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-assert,$$(MB_I18N_ASSERT_SUCCESS) $(1)/@assert/$(2)/$(5)) +$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-assert,$$(MB_I18N_ASSERT_SUCCESS) $(1)/@assert/$(2)/@$(5)) $(MB_@RECIPE)$$(call mb-make-call,mb-proj-grow-assert-success,$(5)) -$(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-assert,$(1)/@assert/$(5)/$(2),Asserts that $(3) output matches.) -$(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,$(1)/@assert/$(5)/$(2)) -$(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-proj-grow-deps-phase,$(5),$(1)/@assert/$(5)/$(2)) +$(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-assert,$(1)/@assert/$(5)/@$(2),Asserts that $(3) output matches.) +$(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,$(1)/@assert/$(5)/@$(2)) +$(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-proj-grow-deps-phase,$(5),$(1)/@assert/$(5)/@$(2)) -$(1)/@$(5)-deps:: $(1)/@assert/$(5)/$(2) +$(1)/@$(5)-deps:: $(1)/@assert/$(5)/@$(2) .RECIPEPREFIX := $(MB_@RECIPEPREFIX) endef define mb-flow-assert-grep-binary-test @@ -29,18 +29,18 @@ $(call mb-make-call,mb-doc-function-flow,mb-flow-assert-grep-binary-package-qa,I define __mb-flow-assert-msxpipe-grep-x .RECIPEPREFIX := $(MB_@RECIPE) -$(1)/@assert/$(5)/$(2): $(7)/@$(5) +$(1)/@assert/$(5)/@$(2): $(7)/@$(5) $(MB_@RECIPE)$$(if $$(wildcard $(7)/$(3).out),,$$(call mb-make-call,mb-os-file-delete,$(7)/$(3).out)) $(MB_@RECIPE)$$(call mb-make-call,mb-msxpipe-safe-assert,$(7),$(3) > $(3).out,$(6)) $(MB_@RECIPE)@echo -n "$(MB_I18N_OS_CRAYON_TAG) " $(MB_@RECIPE)grep --colour$(MB_MAKE_EQUALS)auto "$(4)" $(7)/$(3).out -$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-assert,$$(MB_I18N_ASSERT_SUCCESS) $(1)/@assert/$(2)/$(5)) +$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-assert,$$(MB_I18N_ASSERT_SUCCESS) $(1)/@assert/$(2)/@$(5)) $(MB_@RECIPE)$$(call mb-make-call,mb-proj-grow-assert-success,$(5)) -$(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-assert,$(1)/@assert/$(5)/$(2),Asserts that $(3) output matches.) -$(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,$(1)/@assert/$(5)/$(2)) -$(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-proj-grow-deps-phase,$(5),$(1)/@assert/$(5)/$(2)) +$(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-assert,$(1)/@assert/$(5)/@$(2),Asserts that $(3) output matches.) +$(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,$(1)/@assert/$(5)/@$(2)) +$(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-proj-grow-deps-phase,$(5),$(1)/@assert/$(5)/@$(2)) -$(1)/@$(5)-deps:: $(1)/@assert/$(5)/$(2) +$(1)/@$(5)-deps:: $(1)/@assert/$(5)/@$(2) .RECIPEPREFIX := $(MB_@RECIPEPREFIX) endef define mb-flow-assert-msxpipe-grep-test diff --git a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_help.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_help.mk index 3f22081..3e4adda 100644 --- a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_help.mk +++ b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_help.mk @@ -2,6 +2,9 @@ MB_FLOW_HELP_TEMP := $(shell mktemp) $(call mb-make-call,mb-doc-variable-rock,MB_FLOW_HELP_TEMP,Temp file to output help with.) +MB_FLOW_HELP_UNITEEN_XML ?= on +$(call mb-make-call,mb-doc-variable-rock,MB_FLOW_HELP_UNITEEN_XML,Test dutch unit-one flag XML attributes.) + # Never use echo to display real text: Argument List Too Long define _mb-flow-print-help @@ -12,6 +15,19 @@ $(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-os-file-delete,$(MB_FLOW_HELP_TEM endef +define _mb-flow-help-uniteen-xml +$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-space-newline)$\ +$(MB_ᕽᕽᕽ　　　　　　)$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-xml-open,uniteen,flag,orange,للَّٰهِilLצسُو,ₚᵣₐᵧToੴ)$(call mb-make-call,mb-make-space-newline)$\ +$(MB_ᕽᕽᕽ　　　　　　)$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-xml-close,uniteen)$(call mb-make-call,mb-make-space-newline)$\ +$(MB_ᕽᕽᕽ　　　　　　)$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-xml-open,uniteen,flag,red,𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕,ₚᵣₐᵧToੴ)$(call mb-make-call,mb-make-space-newline)$\ +$(MB_ᕽᕽᕽ　　　　　　)$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-xml-close,uniteen)$(call mb-make-call,mb-make-space-newline)$\ +$(MB_ᕽᕽᕽ　　　　　　)$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-xml-open,uniteen,flag,white,ᒡᒢᑊᒻᒻᓫᔿ,ₚᵣₐᵧToੴ)$(call mb-make-call,mb-make-space-newline)$\ +$(MB_ᕽᕽᕽ　　　　　　)$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-xml-close,uniteen)$(call mb-make-call,mb-make-space-newline)$\ +$(MB_ᕽᕽᕽ　　　　　　)$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-xml-open,uniteen,flag,blue,仙上主天,ₚᵣₐᵧToੴ)$(call mb-make-call,mb-make-space-newline)$\ +$(MB_ᕽᕽᕽ　　　　　　)$(call mb-make-call,mb-make-space-tab)$(call mb-make-call,mb-make-xml-close,uniteen)$(call mb-make-call,mb-make-space-newline) +endef + + define __mb-flow-doc-help .RECIPEPREFIX := $(MB_@RECIPE) @@ -79,6 +95,11 @@ $(MB_@RECIPE)$$(call mb-make-call,_mb-flow-print-help,MB_DOC_FIRE_TARGET_MODULE, $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-help,@help-target-module,Lists module targets.) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,@help-target-module) +@help-target-orphan: +$(MB_@RECIPE)$$(call mb-make-call,_mb-flow-print-help,MB_DOC_FIRE_TARGET_ORPHAN,Build one of the following orphan make targets;) +$(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-help,@help-target-orphan,Lists orphan targets.) +$(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,@help-target-orphan) + @help-target-assert: $(MB_@RECIPE)$$(call mb-make-call,_mb-flow-print-help,MB_DOC_FIRE_TARGET_ASSERT,Build one of the following assert make targets;) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-help,@help-target-assert,Lists assert targets.) @@ -93,7 +114,7 @@ $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,@help-machine) @help-all: \ $(MB_ᕽᕽᕽ　　　)@help-variable @help-variable-deep @help-variable-rock @help-variable-flow @help-variable-i18n \ $(MB_ᕽᕽᕽ　　　)@help-function @help-function-deep @help-function-flow \ -$(MB_ᕽᕽᕽ　　　)@help-target @help-target-deep @help-target-run @help-target-module @help-target-assert \ +$(MB_ᕽᕽᕽ　　　)@help-target @help-target-deep @help-target-run @help-target-module @help-target-orphan @help-target-assert \ $(MB_ᕽᕽᕽ　　　)@help-machine $(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-good,OK) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-help,@help-all,Lists all documented information.) @@ -101,7 +122,9 @@ $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,@help-all) @help-firemake: $(MB_@RECIPE)$$(eval MB_DOC_FORMAT :$(MB_MAKE_EQUALS) xml) -$(MB_@RECIPE)$$(file >$(MB_FLOW_HELP_TEMP),$$(call mb-make-call,mb-make-xml-open,$$(MB_DOC_XML_ROOT))) +$(MB_@RECIPE)$$(file >$(MB_FLOW_HELP_TEMP),$$(call mb-make-call,mb-make-xml-prolog)) +$(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(call mb-make-call,mb-make-xml-open,$$(MB_DOC_XML_ROOT))) +$(MB_@RECIPE)$$(if $$(filter on,$$(MB_FLOW_HELP_UNITEEN_XML)),$$(file >>$(MB_FLOW_HELP_TEMP),$$(call mb-make-call,_mb-flow-help-uniteen-xml))) $(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_VARIABLE)) $(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_VARIABLE_DEEP)) $(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_VARIABLE_ROCK)) @@ -114,6 +137,7 @@ $(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_TARGET)) $(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_TARGET_DEEP)) $(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_TARGET_RUN)) $(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_TARGET_MODULE)) +$(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_TARGET_ORPHAN)) $(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_TARGET_ASSERT)) $(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_TARGET_HELP)) $(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(call mb-make-call,mb-make-xml-close,$$(MB_DOC_XML_ROOT))) diff --git a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk index 8a4aaf6..9f6494d 100644 --- a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk +++ b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk @@ -66,7 +66,7 @@ $(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) -$(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-$$(if $(3),module,help),$(3)@clean,Clean's the project build folders.) +$(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-$(5),$(3)@clean,Clean's the project build folders.) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,$(3)@clean) $(3)@@init: $(2) @@ -76,7 +76,7 @@ $(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) -$(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-$$(if $(3),module,help),$(3)@init,Create the project output folders.) +$(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-$(5),$(3)@init,Create the project output folders.) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,$(3)@init) $(3)@@prepare: $(3)@init @@ -86,7 +86,7 @@ $(3)@@prepare-deps:: $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,$(3)@@prepare-deps) $(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-doc-target-$(5),$(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)) @@ -97,7 +97,7 @@ $(3)@@process-deps:: $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,$(3)@@process-deps) $(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-doc-target-$(5),$(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)) @@ -108,7 +108,7 @@ $(3)@@compile-deps:: $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,$(3)@@compile-deps) $(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-doc-target-$(5),$(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)) @@ -119,7 +119,7 @@ $(3)@@link-deps:: $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,$(3)@@link-deps) $(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-doc-target-$(5),$(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)) @@ -130,7 +130,7 @@ $(3)@@build-deps:: $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,$(3)@@build-deps) $(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-doc-target-$(5),$(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)) @@ -142,7 +142,7 @@ $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,$(3)@@test-dep $(3)@test: $(3)@@test $(3)@@test-deps $(MB_@RECIPE)$$(if $(3),,$$(call mb-make-call,mb-os-echo-report,$$(MB_I18N_PROJ_ASSERT_COUNT) @test: $$(words $$(filter @test,$$(MB_PROJ_FIRE_ASSERT_SUCCESS))))) $(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-doc-target-$(5),$(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)) @@ -153,7 +153,7 @@ $(3)@@package-deps:: $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,$(3)@@package-deps) $(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-doc-target-$(5),$(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)) @@ -165,7 +165,7 @@ $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,$(3)@@package- $(3)@package-qa: $(3)@@package-qa $(3)@@package-qa-deps $(MB_@RECIPE)$$(if $(3),,$$(call mb-make-call,mb-os-echo-report,$$(MB_I18N_PROJ_ASSERT_COUNT) @package-qa: $$(words $$(filter @package-qa,$$(MB_PROJ_FIRE_ASSERT_SUCCESS))))) $(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-doc-target-$(5),$(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)) @@ -176,7 +176,7 @@ $(3)@@package-deploy-deps:: $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,$(3)@@package-deploy-deps) $(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-doc-target-$(5),$(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)) @@ -186,9 +186,9 @@ $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,$(3)@@all) $(3)@@all-deps:: $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,$(3)@@all-deps) $(3)@all: $(3)@@all $(3)@@all-deps -$(MB_@RECIPE)$$(if $$(value MAKECMDGOALS),,$$(call mb-make-call,mb-os-echo-report,$$(MB_I18N_PROJ_OPENMSX_COUNT) $$(words $$(MB_OPENMSX_FIRE_PIPE_SMOKE)))) +$(MB_@RECIPE)$$(if $$(value MAKECMDGOALS),,$$(if $$(filter $$@,@all),$$(call mb-make-call,mb-os-echo-report,$$(MB_I18N_PROJ_OPENMSX_COUNT) $$(words $$(MB_OPENMSX_FIRE_PIPE_SMOKE))))) $(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-doc-target-$(5),$(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)) @@ -202,14 +202,14 @@ $(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)/),$(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)/),$$(if $(3),module,help)))) $(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., [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_ᕽᕽᕽ　　　)$(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)/),,orphan))) $(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., [parent-glue] [bin-mod-dir]) diff --git a/src/assert/msxhub/0module100.mk b/src/assert/msxhub/0module100.mk index 0d3b88e..b3a3d95 100644 --- a/src/assert/msxhub/0module100.mk +++ b/src/assert/msxhub/0module100.mk @@ -38,7 +38,7 @@ $(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-run,$(ASSERT_MSXHUB_BI $(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(ASSERT_MSXHUB_BIN)/@run) -$(ASSERT_MSXHUB_BIN)/@assert: | $(ASSERT_MSXHUB_BIN) +$(ASSERT_MSXHUB_BIN)/@assert/@test/@check-listing: | $(ASSERT_MSXHUB_BIN) _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-file-delete,$(ASSERT_MSXHUB_BIN)/utils.out) _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-write-default,$(ASSERT_MSXHUB_BIN),336) _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-safe-assert,$(ASSERT_MSXHUB_BIN),dir utils > utils.out) @@ -46,10 +46,10 @@ _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-exit,$(ASSERT_MSXHU _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-openmsx-dosctl,$(ASSERT_MSXHUB_BIN),$(ASSERT_MSXHUB_MACHINE)) _$(MB_ᕽᕽᕽ　　)grep -q "KONPASS COM" $(ASSERT_MSXHUB_BIN)/utils.out _$(MB_ᕽᕽᕽ　　)grep -q "MAKE COM" $(ASSERT_MSXHUB_BIN)/utils.out -_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-echo-assert,$(MB_I18N_ASSERT_SUCCESS) $(ASSERT_MSXHUB_BIN)/@assert) +_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-echo-assert,$(MB_I18N_ASSERT_SUCCESS) $(ASSERT_MSXHUB_BIN)/@assert/@test/@check-listing) _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-proj-grow-assert-success,@test) _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-proj-grow-assert-success,@test) -$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-assert,$(ASSERT_MSXHUB_BIN)/@assert,Asserts that all dist artifacts execute results.) -$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@test,$(ASSERT_MSXHUB_BIN)/@assert) -$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(ASSERT_MSXHUB_BIN)/@assert) +$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-assert,$(ASSERT_MSXHUB_BIN)/@assert/@test/@check-listing,Asserts that all dist artifacts execute results.) +$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@test,$(ASSERT_MSXHUB_BIN)/@assert/@test/@check-listing) +$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(ASSERT_MSXHUB_BIN)/@assert/@test/@check-listing) diff --git a/src/example/dist-hello-qa-dos1/0module010.mk b/src/example/dist-hello-qa-dos1/0module010.mk index d916038..fc2acce 100644 --- a/src/example/dist-hello-qa-dos1/0module010.mk +++ b/src/example/dist-hello-qa-dos1/0module010.mk @@ -6,7 +6,7 @@ EXAMPLE_DIST_HELLO_QA_DOS1_BIN := $(call mb-make-call,mb-make-module-path-bi $(call mb-make-call,mb-flow-clone-deps-proj-setup-orphan,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN),$(EXAMPLE_DIST_HELLO_BIN),$(EXAMPLE_DIST_HELLO_DEPS),msxdos1-boot) -$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert: $(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@build +$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert/@package-qa/@check-simple: $(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@build _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-write-default,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN),515) _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-safe-assert,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN),hello1) _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-safe-assert,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN),hello2) @@ -15,7 +15,7 @@ _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-safe-assert,$(EXAMP _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-exit,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)) _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-openmsx-dosctl,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)) _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-echo-assert,$(MB_I18N_ASSERT_SUCCESS) $(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert) -$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-assert,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert,Assert binaries on msxdos1.) -$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@package-qa,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert) -$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert) +$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-assert,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert/@package-qa/@check-simple,Assert binaries on msxdos1.) +$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@package-qa,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert/@package-qa/@check-simple) +$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert/@package-qa/@check-simple) diff --git a/src/example/dist-hello-qa-dos2/0module010.mk b/src/example/dist-hello-qa-dos2/0module010.mk index 7b2ab49..e97f1bb 100644 --- a/src/example/dist-hello-qa-dos2/0module010.mk +++ b/src/example/dist-hello-qa-dos2/0module010.mk @@ -6,7 +6,7 @@ EXAMPLE_DIST_HELLO_QA_DOS2_BIN := $(call mb-make-call,mb-make-module-path-bi $(call mb-make-call,mb-flow-clone-deps-proj-setup-orphan,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN),$(EXAMPLE_DIST_HELLO_BIN),$(EXAMPLE_DIST_HELLO_DEPS),msxdos2-boot) -$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert: $(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@build +$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert/@package-qa/@check-prefix: $(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@build _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-file-delete,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/ahello1.out) _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-file-delete,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/ahello2.out) _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-write-default,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN),515) @@ -25,7 +25,7 @@ _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-proj-grow-assert-success,@package-q _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-proj-grow-assert-success,@package-qa) _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-proj-grow-assert-success,@package-qa) _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-proj-grow-assert-success,@package-qa) -$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-assert,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert,Assert binaries on msxdos2.) -$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@package-qa,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert) -$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert) +$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-assert,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert/@package-qa/@check-prefix,Assert binaries on msxdos2.) +$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@package-qa,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert/@package-qa/@check-prefix) +$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert/@package-qa/@check-prefix) diff --git a/src/example/dist-hello-qa-msx1/0module010.mk b/src/example/dist-hello-qa-msx1/0module010.mk index 96c6fcf..a7cc8d5 100644 --- a/src/example/dist-hello-qa-msx1/0module010.mk +++ b/src/example/dist-hello-qa-msx1/0module010.mk @@ -9,7 +9,7 @@ $(call mb-make-call,mb-doc-variable,EXAMPLE_DIST_HELLO_QA_MSX1_MACHINE,The machi $(call mb-make-call,mb-flow-clone-deps-proj-setup-orphan,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),$(EXAMPLE_DIST_HELLO_BIN),$(EXAMPLE_DIST_HELLO_DEPS),,$(EXAMPLE_DIST_HELLO_QA_MSX1_MACHINE)) -$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert: $(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@build +$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert/@package-qa/@check-prefix: $(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@build _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-file-delete,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/ahello1.out) _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-file-delete,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/ahello2.out) _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-write-default,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),515) @@ -28,7 +28,7 @@ _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-proj-grow-assert-success,@package-q _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-proj-grow-assert-success,@package-qa) _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-proj-grow-assert-success,@package-qa) _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-proj-grow-assert-success,@package-qa) -$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-assert,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert,Assert binaries on MSX1 machine.) -$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@package-qa,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert) -$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert) +$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-assert,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert/@package-qa/@check-prefix,Assert binaries on MSX1 machine.) +$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@package-qa,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert/@package-qa/@check-prefix) +$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert/@package-qa/@check-prefix) diff --git a/src/tools/gluedos1/0module000.mk b/src/tools/gluedos1/0module000.mk index 576cc8f..23f57ca 100644 --- a/src/tools/gluedos1/0module000.mk +++ b/src/tools/gluedos1/0module000.mk @@ -13,8 +13,8 @@ $(call mb-make-call,mb-flow-sdcc-bdos-mono,$(GLUEDOS1_BIN),$(GLUEDOS1_SRC),set) $(call mb-make-call,mb-flow-sdcc-bdos-mono,$(GLUEDOS1_BIN),$(GLUEDOS1_SRC),ver) # (Manual) Test binaries -$(GLUEDOS1_BIN)/@@test-deps:: $(GLUEDOS1_BIN)/@assert/@test/check-simple -$(GLUEDOS1_BIN)/@assert/@test/check-simple: $(GLUEDOS1_BIN)/@build +$(GLUEDOS1_BIN)/@@test-deps:: $(GLUEDOS1_BIN)/@assert/@test/@check-simple +$(GLUEDOS1_BIN)/@assert/@test/@check-simple: $(GLUEDOS1_BIN)/@build _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-write-default,$(GLUEDOS1_BIN)) _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-safe-assert,$(GLUEDOS1_BIN),a:cls.com) _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-safe-assert,$(GLUEDOS1_BIN),a:echo.com) @@ -22,10 +22,10 @@ _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-safe-assert,$(GLUED _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-safe-assert,$(GLUEDOS1_BIN),a:ver.com) _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-exit,$(GLUEDOS1_BIN)) _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-openmsx-dosctl,$(GLUEDOS1_BIN)) -_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-echo-assert,$(MB_I18N_ASSERT_SUCCESS) $(GLUEDOS1_BIN)/@assert/@test/check-simple) -$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-assert,$(GLUEDOS1_BIN)/@assert/@test/check-simple,Assert binaries on msxdos1.) -$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@test,$(GLUEDOS1_BIN)/@assert/@test/check-simple) -$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(GLUEDOS1_BIN)/@assert/@test/check-simple) +_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-echo-assert,$(MB_I18N_ASSERT_SUCCESS) $(GLUEDOS1_BIN)/@assert/@test/@check-simple) +$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-assert,$(GLUEDOS1_BIN)/@assert/@test/@check-simple,Assert binaries on msxdos1.) +$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@test,$(GLUEDOS1_BIN)/@assert/@test/@check-simple) +$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(GLUEDOS1_BIN)/@assert/@test/@check-simple) # Release local $(GLUEDOS1_BIN)/@release-local: | $(GLUEDOS1_BIN)/@build