From 337f8666e4d631edf964707513b8a3693836620d Mon Sep 17 00:00:00 2001 From: Willem Date: Sun, 14 Jul 2024 22:39:03 +0200 Subject: [PATCH] Split help targets more. --- README.md | 4 ++-- lib/make/सिस्टमₚᵣₐᵧToੴ/mb_doc.mk | 14 +++++++++++++ lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk | 4 ++-- lib/make/𓃬𓍄𓋹𓀭/mb_flow_help.mk | 18 ++++++++++++++++ lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk | 25 +++++++++++------------ src/assert/msxhub/0module.mk | 2 +- src/example/dist-hello-qa-dos1/0module.mk | 2 +- src/example/dist-hello-qa-dos2/0module.mk | 2 +- src/example/dist-hello-qa-msx1/0module.mk | 2 +- src/tools/gluedos1/0module.mk | 2 +- 10 files changed, 53 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 4eb79c9..708d0a3 100644 --- a/README.md +++ b/README.md @@ -134,10 +134,10 @@ When you want to see whats happening do a debug run; real 0m4.226s manual test all packages on other MSX1 machine; - make DIST_QA_MSXHUB_MACHINE=Philips_VG_8000 bin/dist-qa-msxhub/@run + make ASSERT_MSXHUB_MACHINE=Philips_VG_8000 bin/assert/msxhub/@run view the make graph of an target; - make -Bnd bin/dist-qa-msx1/@assert | make2graph | dot -Tpng -o /tmp/out.png;open /tmp/out.png + make -Bnd bin/example/dist-hello-qa-msx1/@assert | make2graph | dot -Tpng -o /tmp/out.png;open /tmp/out.png ## Errata diff --git a/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_doc.mk b/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_doc.mk index 8242f8c..59aab60 100644 --- a/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_doc.mk +++ b/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_doc.mk @@ -32,6 +32,12 @@ MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,_mb_doc_variable4u_flow,MB_DOC_ MB_DOC_FIRE_TARGET_RUN ?= \\n MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,_mb_doc_variable4u_flow,MB_DOC_FIRE_TARGET_RUN,"Flow builder of firemake run target data.") +MB_DOC_FIRE_TARGET_MODULE ?= \\n +MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,_mb_doc_variable4u_flow,MB_DOC_FIRE_TARGET_MODULE,"Flow builder of firemake module target data.") + +MB_DOC_FIRE_TARGET_ASSERT ?= \\n +MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,_mb_doc_variable4u_flow,MB_DOC_FIRE_TARGET_ASSERT,"Flow builder of firemake assert target data.") + MB_DOC_FIRE_TARGET_HELP ?= \\n MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,_mb_doc_variable4u_flow,MB_DOC_FIRE_TARGET_HELP,"Flow builder of firemake help data.") @@ -149,4 +155,12 @@ define mb_doc_target_run $(MB_ᕽᕽᕽ   )$(eval MB_DOC_FIRE_TARGET_RUN += $$(call mb_make_call,_mb_doc_target_$$(MB_DOC_FORMAT),run,$(1),$(2))) endef MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,_mb_doc_function4u_deep,mb_doc_target_run,"Saves formatted documention of an run target."," [desc]") +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 +MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,_mb_doc_function4u_deep,mb_doc_target_module,"Saves formatted documention of an module target."," [desc]") +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 +MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,_mb_doc_function4u_deep,mb_doc_target_assert,"Saves formatted documention of an assert target."," [desc]") diff --git a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk index 8360ac1..f571133 100644 --- a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk +++ b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk @@ -8,7 +8,7 @@ $(1)/@assert/$(5)/$(2): $(1)/@build $(MB_@RECIPE)grep -q -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_proj_grow_assert_success,$(5)) -$(MB_ᕽᕽᕽ   )$$(call mb_make_call,mb_doc_target,$(1)/@assert/$(5)/$(2),"Asserts that $(3) output matches.") +$(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)) @@ -42,7 +42,7 @@ $(MB_@RECIPE)$$(call mb_make_call,mb_msxpipe_safe_assert,$(7),$(3) > $(3).out,$( $(MB_@RECIPE)grep -q $(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_proj_grow_assert_success,$(5)) -$(MB_ᕽᕽᕽ   )$$(call mb_make_call,mb_doc_target,$(1)/@assert/$(5)/$(2),"Asserts that $(3) output matches.") +$(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)) diff --git a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_help.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_help.mk index d01133c..7e52c72 100644 --- a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_help.mk +++ b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_help.mk @@ -74,6 +74,18 @@ $(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_RUN) $(MB_ᕽᕽᕽ   )$$(call mb_make_call,mb_doc_target_help,@help-target-run,"Lists runnable targets.") $(MB_ᕽᕽᕽ   )$$(call mb_make_call,mb_make_target_phony,@help-target-run) +@help-target-module: +$(MB_@RECIPE)@echo -e "Build one of the following module make targets;" +$(MB_@RECIPE)@echo -e $$(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-assert: +$(MB_@RECIPE)@echo -e "Build one of the following assert make targets;" +$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_ASSERT) +$(MB_ᕽᕽᕽ   )$$(call mb_make_call,mb_doc_target_help,@help-target-assert,"Lists assert targets.") +$(MB_ᕽᕽᕽ   )$$(call mb_make_call,mb_make_target_phony,@help-target-assert) + @help-all: $(MB_@RECIPE)@echo -e "Documention of all fire functions/variables/targets;\\n" $(MB_@RECIPE)$$(call mb_make_call,mb_os_echo_good,"Variables") @@ -98,6 +110,10 @@ $(MB_@RECIPE)$$(call mb_make_call,mb_os_echo_good,"Targets in the deep") $(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_DEEP) $(MB_@RECIPE)$$(call mb_make_call,mb_os_echo_good,"Targets that run away") $(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_RUN) +$(MB_@RECIPE)$$(call mb_make_call,mb_os_echo_good,"Targets from modules builds") +$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_MODULE) +$(MB_@RECIPE)$$(call mb_make_call,mb_os_echo_good,"Targets that assert hopefully") +$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_ASSERT) $(MB_@RECIPE)$$(call mb_make_call,mb_os_echo_good,"Targets main project help") $(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_HELP) $(MB_@RECIPE)$$(call mb_make_call,mb_os_echo_good,OK) @@ -118,6 +134,8 @@ $(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_FUNCTION_FLOW) $(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET) $(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_DEEP) $(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_RUN) +$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_MODULE) +$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_ASSERT) $(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_HELP) $(MB_@RECIPE)@echo -e $$(call mb_make_call,mb_make_xml_close,$$(MB_DOC_XML_ROOT)) $(MB_ᕽᕽᕽ   )$$(call mb_make_call,mb_doc_target_help,@help-firemake,"Output all documention in XML for IDE integration.") diff --git a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk index 780cadb..f87af48 100644 --- a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk +++ b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk @@ -67,7 +67,7 @@ $(3)@clean: $(3)@@clean $(3)@@clean-deps $(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),,_help),$(3)@clean,"Clean's the project build folders.") +$(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_make_target_phony,$(3)@clean) $(3)@@init: $(2) @@ -79,7 +79,7 @@ $(3)@init: $(3)@@init $(3)@@init-deps $(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),,_help),$(3)@init,"Create the project output folders.") +$(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_make_target_phony,$(3)@init) $(3)@@prepare: $(3)@init @@ -89,7 +89,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),,_help),$(3)@prepare,"Prepare sources before processing.") +$(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) $(3)@@process: $(3)@prepare @@ -99,7 +99,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),,_help),$(3)@process,"Process sources before compiling.") +$(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) $(3)@@compile: $(3)@process @@ -109,7 +109,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),,_help),$(3)@compile,"Compiles all project sources.") +$(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) $(3)@@link: $(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),,_help),$(3)@link,"Link all project intermediate files.") +$(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) $(3)@@build: $(3)@link @@ -129,7 +129,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),,_help),$(3)@build,"Build all project artifacts.") +$(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) $(3)@@test: $(3)@build @@ -140,7 +140,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_fail,$$(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),,_help),$(3)@test,"Run all assertion tests.") +$(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) $(3)@@package: $(3)@test @@ -150,7 +150,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),,_help),$(3)@package,"Create all packages of project.") +$(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) $(3)@@package-qa: $(3)@package @@ -161,7 +161,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_fail,$$(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),,_help),$(3)@package-qa,"Run all packages QA of project.") +$(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) $(3)@@package-deploy: $(3)@package-qa @@ -171,7 +171,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),,_help),$(3)@package-deploy,"Deploy all the packages.") +$(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) $(3)@@all: $(3)@package-qa @@ -181,7 +181,7 @@ $(3)@@all-deps:: $(MB_ᕽᕽᕽ   )$$(call mb_make_call,mb_make_target_phony,$(3)@@all-deps) $(3)@all: $(3)@@all $(3)@@all-deps $(MB_@RECIPE)$$(call mb_make_call,_mb_proj_flow_step_done) -$(MB_ᕽᕽᕽ   )$$(call mb_make_call,mb_doc_target$$(if $(3),,_help),$(3)@all,"Run full build and package QA tests.") +$(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) .RECIPEPREFIX := $(MB_@RECIPEPREFIX) @@ -288,7 +288,6 @@ define __mb_flow_proj_module_run $(1)/@run: $(1)/@build $(MB_@RECIPE)$$(call mb_make_call,mb_msxpipe_run_gui,$(1),,$(2)) -$(MB_ᕽᕽᕽ   )$$(call mb_make_call,mb_doc_target,$(1)/@run,"Run manually with gui.") $(MB_ᕽᕽᕽ   )$$(call mb_make_call,mb_doc_target_run,$(1)/@run,"Run manually with gui.") $(MB_ᕽᕽᕽ   )$$(call mb_make_call,mb_make_target_phony,$(1)/@run) diff --git a/src/assert/msxhub/0module.mk b/src/assert/msxhub/0module.mk index 30e3fa9..b533d8e 100644 --- a/src/assert/msxhub/0module.mk +++ b/src/assert/msxhub/0module.mk @@ -51,7 +51,7 @@ _$(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_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_MSXHUB_BIN)/@assert,"Asserts that all dist artifacts execute results.") +$(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) diff --git a/src/example/dist-hello-qa-dos1/0module.mk b/src/example/dist-hello-qa-dos1/0module.mk index eff178b..7eed1ab 100644 --- a/src/example/dist-hello-qa-dos1/0module.mk +++ b/src/example/dist-hello-qa-dos1/0module.mk @@ -14,7 +14,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,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert,"Assert binaries on msxdos1.") +$(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) diff --git a/src/example/dist-hello-qa-dos2/0module.mk b/src/example/dist-hello-qa-dos2/0module.mk index d5e101e..a12aed2 100644 --- a/src/example/dist-hello-qa-dos2/0module.mk +++ b/src/example/dist-hello-qa-dos2/0module.mk @@ -22,7 +22,7 @@ _$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_echo_assert,$(MB_I18N_ASSERT_SUC _$(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,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert,"Assert binaries on msxdos2.") +$(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) diff --git a/src/example/dist-hello-qa-msx1/0module.mk b/src/example/dist-hello-qa-msx1/0module.mk index ca6dd38..43c04da 100644 --- a/src/example/dist-hello-qa-msx1/0module.mk +++ b/src/example/dist-hello-qa-msx1/0module.mk @@ -25,7 +25,7 @@ _$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_echo_assert,$(MB_I18N_ASSERT_SUC _$(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,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert,"Assert binaries on MSX1 machine.") +$(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) diff --git a/src/tools/gluedos1/0module.mk b/src/tools/gluedos1/0module.mk index 2789843..5c57dc8 100644 --- a/src/tools/gluedos1/0module.mk +++ b/src/tools/gluedos1/0module.mk @@ -23,7 +23,7 @@ _$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(GLUED _$(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,$(GLUEDOS1_BIN)/@assert/@test/check-simple,"Assert binaries on msxdos1.") +$(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)