From e7f1b75a1f58e08122b0ac2df9441615e0d5516a Mon Sep 17 00:00:00 2001 From: Willem Date: Sun, 7 Jul 2024 14:29:32 +0200 Subject: [PATCH] Moved run phase into firemake run target help system. --- lib/make/mb_doc.mk | 44 +++++++++++++++++++++++++++-------- lib/make/mb_proj.mk | 34 +++++---------------------- lib/make/mb_tool.mk | 6 ++--- src/dist-qa-dos1/0module.mk | 5 ++-- src/dist-qa-dos2/0module.mk | 5 ++-- src/dist-qa-msx1/0module.mk | 3 +-- src/dist-qa-msxhub/0module.mk | 3 +-- src/make-on-msx/0module.mk | 3 +-- 8 files changed, 49 insertions(+), 54 deletions(-) diff --git a/lib/make/mb_doc.mk b/lib/make/mb_doc.mk index 0dd0054..dfa6599 100644 --- a/lib/make/mb_doc.mk +++ b/lib/make/mb_doc.mk @@ -3,31 +3,34 @@ MB_DOC_FIRE_VARIABLE_FLOW ?= "" #*** Recursive variable: MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_DOC_FIRE_VARIABLE_FLOW,"Flow builder of fire flow variable data.") MB_DOC_FIRE_HELP ?= "" -MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_DOC_FIRE_HELP,"Flow builder of fire help data.") +MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_DOC_FIRE_HELP,"Flow builder of firemake help data.") MB_DOC_FIRE_TARGET ?= "" -MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_DOC_FIRE_TARGET,"Flow builder of fire target data.") +MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_DOC_FIRE_TARGET,"Flow builder of firemake target data.") MB_DOC_FIRE_TARGET_DEEP ?= "" -MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_DOC_FIRE_TARGET_DEEP,"Flow builder of fire deep target data.") +MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_DOC_FIRE_TARGET_DEEP,"Flow builder of firemake deep target data.") + +MB_DOC_FIRE_TARGET_RUN ?= "" +MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_DOC_FIRE_TARGET_RUN,"Flow builder of firemake run target data.") MB_DOC_FIRE_VARIABLE ?= "" -MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_DOC_FIRE_VARIABLE,"Flow builder of fire variable data.") +MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_DOC_FIRE_VARIABLE,"Flow builder of firemake variable data.") MB_DOC_FIRE_VARIABLE_DEEP ?= "" -MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_DOC_FIRE_VARIABLE_DEEP,"Flow builder of fire deep variable data.") +MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_DOC_FIRE_VARIABLE_DEEP,"Flow builder of makefire deep variable data.") MB_DOC_FIRE_VARIABLE_ROCK ?= "" -MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_DOC_FIRE_VARIABLE_ROCK,"Flow builder of fire rock variable data.") +MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_DOC_FIRE_VARIABLE_ROCK,"Flow builder of makefire rock variable data.") MB_DOC_FIRE_FUNCTION ?= "" -MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_DOC_FIRE_FUNCTION,"Flow builder of fire function data.") +MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_DOC_FIRE_FUNCTION,"Flow builder of firemake function data.") MB_DOC_FIRE_FUNCTION_DEEP ?= "" -MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_DOC_FIRE_FUNCTION_DEEP,"Flow builder of fire deep function data.") +MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_DOC_FIRE_FUNCTION_DEEP,"Flow builder of firemake deep function data.") MB_DOC_FIRE_FUNCTION_FLOW ?= "" -MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_DOC_FIRE_FUNCTION_FLOW,"Flow builder of fire flow function data.") +MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_DOC_FIRE_FUNCTION_FLOW,"Flow builder of firemake flow function data.") MB_DOC_XML_ROOT := firemake MB_DOC_FIRE_VARIABLE_ROCK += $(call mb_make_call,mb_doc_variable_rock,MB_DOC_XML_ROOT,"XML root tag for firemake output.") @@ -48,7 +51,7 @@ MB_DOC_XML_TAG_VALUE := value MB_DOC_FIRE_VARIABLE_ROCK += $(call mb_make_call,mb_doc_variable_rock,MB_DOC_XML_TAG_VALUE,"XML value tag for firemake output.") MB_DOC_FORMAT ?= txt -MB_DOC_FIRE_VARIABLE_DEEP += $(call mb_make_call,mb_doc_variable_deep,MB_DOC_FORMAT,"Output format of documention$(MB_MAKE_COMMA) only 'txt' is supported currently.") +MB_DOC_FIRE_VARIABLE_DEEP += $(call mb_make_call,mb_doc_variable_deep,MB_DOC_FORMAT,"Output format of documention$(MB_MAKE_COMMA) only 'txt' or 'xml' is supported.") define _mb_doc_variable_txt @@ -113,6 +116,10 @@ define mb_doc_target_help $(call mb_make_call,_mb_doc_target_$(MB_DOC_FORMAT),help,$(1),$(2)) endef MB_DOC_FIRE_FUNCTION_DEEP += $(call mb_make_call,mb_doc_function_deep,mb_doc_target_help,"Prints formatted documention of an help target."," [desc]") +define mb_doc_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_function_deep,mb_doc_target_run,"Prints formatted documention of an run target."," [desc]") define mb_doc_flow_help @@ -205,6 +212,15 @@ MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@help-target,"Lists MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@help-target-deep,"Lists deep targets.") +@help-target-run: + $$(if $$(filter txt,$$(MB_DOC_FORMAT)),@echo "Build one of the following run make targets;\\n") + $$(if $$(filter xml,$$(MB_DOC_FORMAT)),@echo $$(call mb_make_call,mb_make_xml_open,$$(MB_DOC_XML_ROOT))) + @echo $$(MB_DOC_FIRE_TARGET_RUN) + $$(if $$(filter xml,$$(MB_DOC_FORMAT)),@echo $$(call mb_make_call,mb_make_xml_close,$$(MB_DOC_XML_ROOT))) +.PHONY: @help-target-run +MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@help-target-run,"Lists runnable targets.") + + @help-all: $$(if $$(filter txt,$$(MB_DOC_FORMAT)),@echo "Documention of all fire functions/variables/targets;\\n") $$(if $$(filter xml,$$(MB_DOC_FORMAT)),@echo $$(call mb_make_call,mb_make_xml_open,$$(MB_DOC_XML_ROOT))) @@ -226,10 +242,18 @@ MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@help-target-deep,"L @echo $$(MB_DOC_FIRE_TARGET) $$(if $$(filter txt,$$(MB_DOC_FORMAT)),$$(call mb_make_call,mb_make_echo_good,"Targets in the deep\\n")) @echo $$(MB_DOC_FIRE_TARGET_DEEP) + $$(if $$(filter txt,$$(MB_DOC_FORMAT)),$$(call mb_make_call,mb_make_echo_good,"Targets that run away\\n")) + @echo $$(MB_DOC_FIRE_TARGET_RUN) $$(if $$(filter xml,$$(MB_DOC_FORMAT)),@echo $$(call mb_make_call,mb_make_xml_close,$$(MB_DOC_XML_ROOT))) $$(if $$(filter txt,$$(MB_DOC_FORMAT)),$$(call mb_make_call,mb_make_echo_good,OK)) .PHONY: @help-all MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@help-all,"Lists all documented information.") + + +@help-firemake: + MB_DOC_FORMAT=xml $$(MAKE) -s @help-all +MB_DOC_FIRE_HELP += $(call mb_make_call,mb_doc_target_help,@help-firemake,"Output all documention in XML for IDE integration.") +.PHONY: @help-firemake endef MB_DOC_FIRE_FUNCTION_FLOW += $(call mb_make_call,mb_doc_function_flow,mb_doc_flow_help,"Prints flow of fire help target.","[project-name]") diff --git a/lib/make/mb_proj.mk b/lib/make/mb_proj.mk index 400cd71..629133b 100644 --- a/lib/make/mb_proj.mk +++ b/lib/make/mb_proj.mk @@ -42,8 +42,6 @@ MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_PROJ_PH MB_PROJ_PHASE_PACKAGE_DEPLOY_DEPS ?= MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_PROJ_PHASE_PACKAGE_QA_DEPLOY,"The targets to trigger by project @package-deploy target.") -MB_PROJ_PHASE_RUN_DEPS ?= -MB_DOC_FIRE_VARIABLE_FLOW += $(call mb_make_call,mb_doc_variable_flow,MB_PROJ_PHASE_QA_DEPS,"The targets to trigger by project @run target.") define mb_proj_module_path_src @@ -80,10 +78,7 @@ define _mb_proj_run_init $(foreach folder,$(1),$(if $(wildcard $(folder)),,$(call mb_make_call,mb_make_echo_command,Creating folder $(folder));)) $(foreach folder,$(1),$(if $(wildcard $(folder)),,$(call mb_make_call,mb_mkdir,$(folder)))) endef -define _mb_proj_run_selector - @$(MB_OS_ECHO) -e -n "Please run one of the following targets;\n\n " - @$(MB_OS_ECHO) -e $(subst bin,"* bin",$(subst @run,@run\\\n,$(MB_PROJ_PHASE_RUN_DEPS))) -endef + define mb_proj_flow_setup @@ -107,7 +102,7 @@ MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@clean,"Clean's the @init: @@init $$(call mb_make_call,_mb_proj_run_init,$(1)) $$(call mb_make_call,_mb_proj_flow_step_done) -MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@init,"Setup and project output folder.") +MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@init,"Create the project output folders.") .PHONY: @init @@ -173,7 +168,7 @@ MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@test,"Run all asser @package: @@package $$(MB_PROJ_PHASE_PACKAGE_DEPS) $$(call mb_make_call,_mb_proj_flow_step_done) -MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@package,"Create package/packages of project.") +MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@package,"Create all packages of project.") .PHONY: @package @@ -184,7 +179,7 @@ MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@package,"Create pac @package-qa: @@package-qa $$(MB_PROJ_PHASE_PACKAGE_QA_DEPS) $$(call mb_make_call,_mb_proj_flow_step_done) -MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@package-qa,"Run all package QA of project.") +MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@package-qa,"Run all packages QA of project.") .PHONY: @package-qa @@ -195,20 +190,8 @@ MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@package-qa,"Run all @package-deploy: @@package-deploy $$(MB_PROJ_PHASE_PACKAGE_DEPLOY_DEPS) $$(call mb_make_call,_mb_proj_flow_step_done) -MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@package-deploy,"Deploy the package/packages.") +MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@package-deploy,"Deploy all the packages.") .PHONY: @package-deploy - - -@@run: - $$(call mb_make_call,_mb_proj_flow_step_before) -.PHONY: @@run - - -@run: @@run - $$(call mb_make_call,_mb_proj_run_selector) - $$(call mb_make_call,_mb_proj_flow_step_done) -MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@run,"Run one or more artifacts.") -.PHONY: @run endef MB_DOC_FIRE_FUNCTION_FLOW += $(call mb_make_call,mb_doc_function_flow,mb_proj_flow_setup,"Prints flow of abstract project build cycle.","") @@ -263,11 +246,6 @@ MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@パッケージの $$(call mb_make_call,_mb_proj_flow_step_done) MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@パッケージのデプロイ,"パッケージをデプロイします。") .PHONY: @パッケージのデプロイ - -@走る: @run - $$(call mb_make_call,_mb_proj_flow_step_done) -MB_DOC_FIRE_HELP += $$(call mb_make_call,mb_doc_target_help,@走る,"1 つ以上のアーティファクトを実行します。") -.PHONY: @走る endef MB_DOC_FIRE_FUNCTION_FLOW += $(call mb_make_call,mb_doc_function_flow,mb_proj_flow_setup_jp,"Prints flow for japanese wrapper of project build cycle.") @@ -291,7 +269,7 @@ MB_DOC_FIRE_HELP += $(call mb_make_call,mb_doc_target_help,@test-video,"Runs @te @package-qa-video: @clean $$(call mb_make_call,_mb_proj_flow_step_before) - MB_OPENMSX_HEADLESS=off MB_FLIGHT_VIDEO=on $$(MAKE) @@package-qa-video + MB_OPENMSX_HEADLESS=off MB_FLIGHT_VIDEO=on $$(MAKE) -s @@package-qa-video $$(call mb_make_call,_mb_proj_flow_step_done) MB_DOC_FIRE_HELP += $(call mb_make_call,mb_doc_target_help,@package-qa-video,"Runs @package-qa with video recorder and merges flight videos to one.") .PHONY: @test-video diff --git a/lib/make/mb_tool.mk b/lib/make/mb_tool.mk index f767431..1ca0cfb 100644 --- a/lib/make/mb_tool.mk +++ b/lib/make/mb_tool.mk @@ -41,8 +41,7 @@ MB_DOC_FIRE_TARGET += $$(call mb_make_call,mb_doc_target,$(1)/@build,"Builds the $(1)/@run: $(1)/@build $$(call mb_make_call,mb_msxpipe_run_gui,$(1)) -MB_DOC_FIRE_TARGET += $$(call mb_make_call,mb_doc_target,$(1)/@run,"Run $(3).com manually with gui.") -MB_PROJ_PHASE_RUN_DEPS += $(1)/@run +MB_DOC_FIRE_TARGET_RUN += $$(call mb_make_call,mb_doc_target_run,$(1)/@run,"Run $(3).com manually with gui.") .PHONY: $(1)/@run endef MB_DOC_FIRE_FUNCTION_FLOW += $(call mb_make_call,mb_doc_function_flow,mb_tool_m80_flow_bdos_mono,"Prints flow of m80 toolchain bdos mono file module."," ") @@ -80,8 +79,7 @@ MB_DOC_FIRE_TARGET += $$(call mb_make_call,mb_doc_target,$(1)/@build,"Builds the $(1)/@run: $(1)/@build $$(call mb_make_call,mb_msxpipe_run_gui,$(1)) -MB_DOC_FIRE_TARGET += $$(call mb_make_call,mb_doc_target,$(1)/@run,"Run $(3).com manually with gui.") -MB_PROJ_PHASE_RUN_DEPS += $(1)/@run +MB_DOC_FIRE_TARGET_RUN += $$(call mb_make_call,mb_doc_target_run,$(1)/@run,"Run $(3).com manually with gui.") .PHONY: $(1)/@run endef MB_DOC_FIRE_FUNCTION_FLOW += $(call mb_make_call,mb_doc_function_flow,mb_tool_sdcc_flow_bdos_mono,"Prints flow of sdcc toolchain bdos mono file module."," ") diff --git a/src/dist-qa-dos1/0module.mk b/src/dist-qa-dos1/0module.mk index 0ca9a0f..eac1b23 100644 --- a/src/dist-qa-dos1/0module.mk +++ b/src/dist-qa-dos1/0module.mk @@ -16,8 +16,7 @@ $(DIST_QA_DOS1_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_DOS1_BIN) $(DIST_DEPS) $(DIST_QA_DOS1_BIN)/@run: | $(DIST_QA_DOS1_DEPS) $(call mb_msxpipe_run_gui,$(DIST_QA_DOS1_BIN)) -MB_DOC_FIRE_TARGET += $(call mb_doc_target,$(DIST_QA_DOS1_BIN)/@run,"Run binaries on msxdos1 machine.") -MB_PROJ_PHASE_RUN_DEPS += $(DIST_QA_DOS1_BIN)/@run +MB_DOC_FIRE_TARGET_RUN += $(call mb_make_call,mb_doc_target_run,$(DIST_QA_DOS1_BIN)/@run,"Run binaries on msxdos1 machine.") .PHONY: $(DIST_QA_DOS1_BIN)/@run @@ -28,7 +27,7 @@ $(DIST_QA_DOS1_BIN)/@assert: | $(DIST_QA_DOS1_DEPS) $(call mb_autoexec_append_exit,$(DIST_QA_DOS1_BIN)) $(call mb_openmsx_dosctl,$(DIST_QA_DOS1_BIN)) $(call mb_make_call,mb_make_echo_assert,Assert succes $(DIST_QA_DOS1_BIN)/@assert) -MB_DOC_FIRE_TARGET += $(call mb_doc_target,$(DIST_QA_DOS1_BIN)/@assert,"Assert binaries on msxdos1.") +MB_DOC_FIRE_TARGET += $(call mb_make_call,mb_doc_target,$(DIST_QA_DOS1_BIN)/@assert,"Assert binaries on msxdos1.") MB_PROJ_PHASE_PACKAGE_QA_DEPS += $(DIST_QA_DOS1_BIN)/@assert .PHONY: $(DIST_QA_DOS1_BIN)/@assert diff --git a/src/dist-qa-dos2/0module.mk b/src/dist-qa-dos2/0module.mk index ce80645..ec8d3e2 100644 --- a/src/dist-qa-dos2/0module.mk +++ b/src/dist-qa-dos2/0module.mk @@ -16,8 +16,7 @@ $(DIST_QA_DOS2_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_DOS2_BIN) $(DIST_DEPS) $(DIST_QA_DOS2_BIN)/@run: | $(DIST_QA_DOS2_DEPS) $(call mb_msxpipe_run_gui,$(DIST_QA_DOS2_BIN)) -MB_DOC_FIRE_TARGET += $(call mb_doc_target,$(DIST_QA_DOS2_BIN)/@run,"Run binaries on msxdos2 machine.") -MB_PROJ_PHASE_RUN_DEPS += $(DIST_QA_DOS2_BIN)/@run +MB_DOC_FIRE_TARGET_RUN += $(call mb_make_call,mb_doc_target_run,$(DIST_QA_DOS2_BIN)/@run,"Run binaries on msxdos2 machine.") .PHONY: $(DIST_QA_DOS2_BIN)/@run @@ -32,7 +31,7 @@ $(DIST_QA_DOS2_BIN)/@assert: | $(DIST_QA_DOS2_DEPS) grep -q "M80: Hello world..." $(DIST_QA_DOS2_BIN)/ahello1.out grep -q "SDCC: Hello world..." $(DIST_QA_DOS2_BIN)/ahello2.out $(call mb_make_call,mb_make_echo_assert,Assert succes $(DIST_QA_DOS2_BIN)/@assert) -MB_DOC_FIRE_TARGET += $(call mb_doc_target,$(DIST_QA_DOS2_BIN)/@assert,"Assert binaries on msxdos2.") +MB_DOC_FIRE_TARGET += $(call mb_make_call,mb_doc_target,$(DIST_QA_DOS2_BIN)/@assert,"Assert binaries on msxdos2.") MB_PROJ_PHASE_PACKAGE_QA_DEPS += $(DIST_QA_DOS2_BIN)/@assert .PHONY: $(DIST_QA_DOS2_BIN)/@assert diff --git a/src/dist-qa-msx1/0module.mk b/src/dist-qa-msx1/0module.mk index a5ca411..f166e3f 100644 --- a/src/dist-qa-msx1/0module.mk +++ b/src/dist-qa-msx1/0module.mk @@ -17,8 +17,7 @@ $(DIST_QA_MSX1_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_MSX1_BIN) $(DIST_DEPS) $(DIST_QA_MSX1_BIN)/@run: | $(DIST_QA_MSX1_DEPS) $(call mb_make_call,mb_msxpipe_run_gui,$(DIST_QA_MSX1_BIN),,$(DIST_QA_MSX1_MACHINE)) -MB_DOC_FIRE_TARGET += $(call mb_make_call,mb_doc_target,$(DIST_QA_MSX1_BIN)/@run,"Run binaries on MSX1 machine.") -MB_PROJ_PHASE_RUN_DEPS += $(DIST_QA_MSX1_BIN)/@run +MB_DOC_FIRE_TARGET_RUN += $(call mb_make_call,mb_doc_target_run,$(DIST_QA_MSX1_BIN)/@run,"Run binaries on MSX1 machine.") .PHONY: $(DIST_QA_MSX1_BIN)/@run diff --git a/src/dist-qa-msxhub/0module.mk b/src/dist-qa-msxhub/0module.mk index 28816ae..bbd92d8 100644 --- a/src/dist-qa-msxhub/0module.mk +++ b/src/dist-qa-msxhub/0module.mk @@ -39,8 +39,7 @@ $(DIST_QA_MSXHUB_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_MSXHUB_BIN) $(DIST_DEPS) $(DIST_QA_MSXHUB_BIN)/@run: | $(DIST_QA_MSXHUB_DEPS) $(call mb_make_call,mb_msxpipe_run_gui,$(DIST_QA_MSXHUB_BIN),,$(DIST_QA_MSXHUB_MACHINE)) -MB_DOC_FIRE_TARGET += $(call mb_make_call,mb_doc_target,$(DIST_QA_MSXHUB_BIN)/@run,"Run the dist with all msxhub packages.") -MB_PROJ_PHASE_RUN_DEPS += $(DIST_QA_MSXHUB_BIN)/@run +MB_DOC_FIRE_TARGET_RUN += $(call mb_make_call,mb_doc_target_run,$(DIST_QA_MSXHUB_BIN)/@run,"Run the dist with all msxhub packages.") .PHONY: $(DIST_QA_MSXHUB_BIN)/@run diff --git a/src/make-on-msx/0module.mk b/src/make-on-msx/0module.mk index dc40c68..1cabfd0 100644 --- a/src/make-on-msx/0module.mk +++ b/src/make-on-msx/0module.mk @@ -44,8 +44,7 @@ MB_PROJ_PHASE_BUILD_DEPS +=$(MAKE_ON_MSX_BIN)/@build $(MAKE_ON_MSX_BIN)/@run: $(MAKE_ON_MSX_BIN)/@build $(call mb_make_call,mb_msxpipe_run_gui,$(MAKE_ON_MSX_BIN)) -MB_DOC_FIRE_TARGET += $(call mb_make_call,mb_doc_target,$(MAKE_ON_MSX_BIN)/@run,"Run the make build manually.") -MB_PROJ_PHASE_RUN_DEPS += $(MAKE_ON_MSX_BIN)/@run +MB_DOC_FIRE_TARGET_RUN += $(call mb_make_call,mb_doc_target_run,$(MAKE_ON_MSX_BIN)/@run,"Run the make build manually.") .PHONY: $(MAKE_ON_MSX_BIN)/@run