From aaa62970d046ce818d2ab53b9f8aad9090506d2b Mon Sep 17 00:00:00 2001 From: Willem Date: Tue, 2 Jul 2024 18:20:46 +0200 Subject: [PATCH] Renamed show gui to run gui. --- lib/make/mb_autoexec.mk | 2 +- lib/make/mb_msxpipe.mk | 14 +++++++------- src/ahello-m80-test/0module.mk | 2 +- src/ahello-m80/0module.mk | 2 +- src/ahello-sdcc-test/0module.mk | 2 +- src/ahello-sdcc/0module.mk | 2 +- src/dist-qa-dos1/0module.mk | 2 +- src/dist-qa-dos2/0module.mk | 2 +- src/dist-qa-msx1/0module.mk | 2 +- src/dist-qa-msxhub/0module.mk | 2 +- src/make-on-msx/0module.mk | 2 +- src/mbboot80-test/0module.mk | 2 +- src/mbboot80/0module.mk | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/make/mb_autoexec.mk b/lib/make/mb_autoexec.mk index 00e8994..a5ff089 100644 --- a/lib/make/mb_autoexec.mk +++ b/lib/make/mb_autoexec.mk @@ -61,7 +61,7 @@ MB_DOC_HELP_FUNCTION += $(call mb_doc_function,mb_autoexec_append_show_gui,"Appe define mb_autoexec_append_stop_fail $(call mb_autoexec_append_cmd,$(1),omsxctl fail_after 0) endef -MB_DOC_HELP_FUNCTION += $(call mb_doc_function,mb_autoexec_append_stop_fail,"Appends stop automatic failure comand.","") +MB_DOC_HELP_FUNCTION += $(call mb_doc_function,mb_autoexec_append_stop_fail,"Appends stop automatic failure command.","") define mb_autoexec_append_exit $(if $(filter on,$(MB_FLIGHT_SCREEN)),$(call mb_autoexec_append_save_screenshot,$(1))) diff --git a/lib/make/mb_msxpipe.mk b/lib/make/mb_msxpipe.mk index 3dcd622..643279d 100644 --- a/lib/make/mb_msxpipe.mk +++ b/lib/make/mb_msxpipe.mk @@ -15,7 +15,7 @@ define mb_msxpipe_safe_test endef MB_DOC_HELP_FUNCTION += $(call mb_doc_function,mb_msxpipe_safe_test,"Runs openMSX and safely executes one test."," [machine]") -define _mb_msxpipe_show_gui +define _mb_msxpipe_run_gui $(call mb_autoexec_write_default,$(1)) $(call mb_autoexec_append_stop_fail,$(1)) $(call mb_autoexec_append_show_gui,$(1)) @@ -26,13 +26,13 @@ define _mb_msxpipe_show_gui $(call mb_openmsx_dosctl,$(1),$(3)) endef -define mb_msxpipe_show_gui - $(call _mb_msxpipe_show_gui,$(1),$(2),$(3)) +define mb_msxpipe_run_gui + $(call _mb_msxpipe_run_gui,$(1),$(2),$(3)) endef -MB_DOC_HELP_FUNCTION += $(call mb_doc_function,mb_msxpipe_show_gui,"Runs openMSX with renderer and optionals."," [cmd] [machine]") +MB_DOC_HELP_FUNCTION += $(call mb_doc_function,mb_msxpipe_run_gui,"Runs openMSX with renderer and optionals."," [cmd] [machine]") -define mb_msxpipe_show_gui_mouse - $(call _mb_msxpipe_show_gui,$(1),$(2),$(3),mouse) +define mb_msxpipe_run_gui_mouse + $(call _mb_msxpipe_run_gui,$(1),$(2),$(3),mouse) endef -MB_DOC_HELP_FUNCTION += $(call mb_doc_function,mb_msxpipe_show_gui_mouse,"Runs openMSX with renderer and mouse and optionals."," [cmd] [machine]") +MB_DOC_HELP_FUNCTION += $(call mb_doc_function,mb_msxpipe_run_gui_mouse,"Runs openMSX with renderer and mouse and optionals."," [cmd] [machine]") diff --git a/src/ahello-m80-test/0module.mk b/src/ahello-m80-test/0module.mk index 5a08ae0..03659c3 100644 --- a/src/ahello-m80-test/0module.mk +++ b/src/ahello-m80-test/0module.mk @@ -10,7 +10,7 @@ $(AHELLO_M80_TEST_BIN)/ahello.com: $(AHELLO_M80_BIN)/ahello.com | $(AHELLO_M80_T $(call mb_copy,$<,$@) $(AHELLO_M80_TEST_BIN)/@run: | $(AHELLO_M80_TEST_BIN)/ahello.com - $(call mb_msxpipe_show_gui,$(AHELLO_M80_TEST_BIN)) + $(call mb_msxpipe_run_gui,$(AHELLO_M80_TEST_BIN)) MB_DOC_HELP_TARGET += $(call mb_doc_target,$(AHELLO_M80_TEST_BIN)/@run,"Run binaries from ahello-m80.") .PHONY: $(AHELLO_M80_TEST_BIN)/@run diff --git a/src/ahello-m80/0module.mk b/src/ahello-m80/0module.mk index 3b3d791..c6a2a71 100644 --- a/src/ahello-m80/0module.mk +++ b/src/ahello-m80/0module.mk @@ -23,6 +23,6 @@ $(AHELLO_M80_BIN)/ahello.com: | $(AHELLO_M80_BIN)/ahello.hex MB_DOC_HELP_TARGET += $(call mb_doc_target,$(AHELLO_M80_BIN)/ahello.com,"Compiles hello world with macro80.") $(AHELLO_M80_BIN)/@run: | $(AHELLO_M80_BIN)/ahello.com - $(call mb_msxpipe_show_gui,$(AHELLO_M80_BIN)) + $(call mb_msxpipe_run_gui,$(AHELLO_M80_BIN)) MB_DOC_HELP_TARGET += $(call mb_doc_target,$(AHELLO_M80_BIN)/@run,"Run the compiled hello world from macro80.") .PHONY: $(AHELLO_M80_BIN)/@run diff --git a/src/ahello-sdcc-test/0module.mk b/src/ahello-sdcc-test/0module.mk index dcbdd08..bd4d43d 100644 --- a/src/ahello-sdcc-test/0module.mk +++ b/src/ahello-sdcc-test/0module.mk @@ -10,7 +10,7 @@ $(AHELLO_SDCC_TEST_BIN)/ahello.com: $(AHELLO_SDCC_BIN)/ahello.com | $(AHELLO_SDC $(call mb_copy,$<,$@) $(AHELLO_SDCC_TEST_BIN)/@run: | $(AHELLO_SDCC_TEST_BIN)/ahello.com - $(call mb_msxpipe_show_gui,$(AHELLO_SDCC_TEST_BIN)) + $(call mb_msxpipe_run_gui,$(AHELLO_SDCC_TEST_BIN)) MB_DOC_HELP_TARGET += $(call mb_doc_target,$(AHELLO_SDCC_TEST_BIN)/@run,"Run binaries from ahello-sdcc.") .PHONY: $(AHELLO_SDCC_TEST_BIN)/@run diff --git a/src/ahello-sdcc/0module.mk b/src/ahello-sdcc/0module.mk index 02476dd..c613809 100644 --- a/src/ahello-sdcc/0module.mk +++ b/src/ahello-sdcc/0module.mk @@ -17,6 +17,6 @@ $(AHELLO_SDCC_BIN)/ahello.com: $(AHELLO_SDCC_BIN)/ahello.hex MB_DOC_HELP_TARGET += $(call mb_doc_target,$(AHELLO_SDCC_BIN)/ahello.com,"Compiles hello world with sdcc.") $(AHELLO_SDCC_BIN)/@run: | $(AHELLO_SDCC_BIN)/ahello.com - $(call mb_msxpipe_show_gui,$(AHELLO_SDCC_BIN)) + $(call mb_msxpipe_run_gui,$(AHELLO_SDCC_BIN)) MB_DOC_HELP_TARGET += $(call mb_doc_target,$(AHELLO_SDCC_BIN)/@run,"Run the compiled hello world from sdcc.") .PHONY: $(AHELLO_SDCC_BIN)/@run diff --git a/src/dist-qa-dos1/0module.mk b/src/dist-qa-dos1/0module.mk index 82a6afd..d90f8fd 100644 --- a/src/dist-qa-dos1/0module.mk +++ b/src/dist-qa-dos1/0module.mk @@ -12,7 +12,7 @@ $(DIST_QA_DOS1_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_DOS1_BIN) $(DIST_DEPS) $(call mb_copy,$<,$@) $(DIST_QA_DOS1_BIN)/@run: | $(DIST_QA_DOS1_DEPS) - $(call mb_msxpipe_show_gui,$(DIST_QA_DOS1_BIN)) + $(call mb_msxpipe_run_gui,$(DIST_QA_DOS1_BIN)) MB_DOC_HELP_TARGET += $(call mb_doc_target,$(DIST_QA_DOS1_BIN)/@run,"Run binaries on msxdos1 machine.") .PHONY: $(DIST_QA_DOS1_BIN)/@run diff --git a/src/dist-qa-dos2/0module.mk b/src/dist-qa-dos2/0module.mk index 597f1cb..79f8dfe 100644 --- a/src/dist-qa-dos2/0module.mk +++ b/src/dist-qa-dos2/0module.mk @@ -12,7 +12,7 @@ $(DIST_QA_DOS2_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_DOS2_BIN) $(DIST_DEPS) $(call mb_copy,$<,$@) $(DIST_QA_DOS2_BIN)/@run: | $(DIST_QA_DOS2_DEPS) - $(call mb_msxpipe_show_gui,$(DIST_QA_DOS2_BIN)) + $(call mb_msxpipe_run_gui,$(DIST_QA_DOS2_BIN)) MB_DOC_HELP_TARGET += $(call mb_doc_target,$(DIST_QA_DOS2_BIN)/@run,"Run binaries on msxdos2 machine.") .PHONY: $(DIST_QA_DOS2_BIN)/@run diff --git a/src/dist-qa-msx1/0module.mk b/src/dist-qa-msx1/0module.mk index a6b1b08..c253f94 100644 --- a/src/dist-qa-msx1/0module.mk +++ b/src/dist-qa-msx1/0module.mk @@ -13,7 +13,7 @@ $(DIST_QA_MSX1_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_MSX1_BIN) $(DIST_DEPS) $(call mb_copy,$<,$@) $(DIST_QA_MSX1_BIN)/@run: | $(DIST_QA_MSX1_DEPS) - $(call mb_msxpipe_show_gui,$(DIST_QA_MSX1_BIN),,$(DIST_QA_MSX1_MACHINE)) + $(call mb_msxpipe_run_gui,$(DIST_QA_MSX1_BIN),,$(DIST_QA_MSX1_MACHINE)) MB_DOC_HELP_TARGET += $(call mb_doc_target,$(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 af573eb..223f516 100644 --- a/src/dist-qa-msxhub/0module.mk +++ b/src/dist-qa-msxhub/0module.mk @@ -35,7 +35,7 @@ $(DIST_QA_MSXHUB_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_MSXHUB_BIN) $(DIST_DEPS) $(call mb_copy,$<,$@) $(DIST_QA_MSXHUB_BIN)/@run: | $(DIST_QA_MSXHUB_DEPS) - $(call mb_msxpipe_show_gui,$(DIST_QA_MSXHUB_BIN),,$(DIST_QA_MSXHUB_MACHINE)) + $(call mb_msxpipe_run_gui,$(DIST_QA_MSXHUB_BIN),,$(DIST_QA_MSXHUB_MACHINE)) MB_DOC_HELP_TARGET += $(call mb_doc_target,$(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 56ec458..fa304a7 100644 --- a/src/make-on-msx/0module.mk +++ b/src/make-on-msx/0module.mk @@ -29,7 +29,7 @@ MB_DOC_HELP_TARGET += $(call mb_doc_target,$(MAKE_ON_MSX_BIN)/@assert,"Asserts t .PHONY: $(MAKE_ON_MSX_BIN)/@assert $(MAKE_ON_MSX_BIN)/@run: | $(MAKE_ON_MSX_BIN)/build.bat - $(call mb_msxpipe_show_gui,$(MAKE_ON_MSX_BIN)) + $(call mb_msxpipe_run_gui,$(MAKE_ON_MSX_BIN)) MB_DOC_HELP_TARGET += $(call mb_doc_target,$(MAKE_ON_MSX_BIN)/@run,"Run the make build manually.") .PHONY: $(MAKE_ON_MSX_BIN)/@run diff --git a/src/mbboot80-test/0module.mk b/src/mbboot80-test/0module.mk index df38341..2527507 100644 --- a/src/mbboot80-test/0module.mk +++ b/src/mbboot80-test/0module.mk @@ -10,7 +10,7 @@ $(MBBOOT80_TEST_BIN)/mbboot80.com: $(MBBOOT80_BIN)/mbboot80.com | $(MBBOOT80_TES $(call mb_copy,$<,$@) $(MBBOOT80_TEST_BIN)/@run: | $(MBBOOT80_TEST_BIN)/mbboot80.com - $(call mb_msxpipe_show_gui,$(MBBOOT80_TEST_BIN)) + $(call mb_msxpipe_run_gui,$(MBBOOT80_TEST_BIN)) MB_DOC_HELP_TARGET += $(call mb_doc_target,$(MBBOOT80_TEST_BIN)/@run,"Run binaries from mbboot80.") .PHONY: $(MBBOOT80_TEST_BIN)/@run diff --git a/src/mbboot80/0module.mk b/src/mbboot80/0module.mk index babb627..bacdb77 100644 --- a/src/mbboot80/0module.mk +++ b/src/mbboot80/0module.mk @@ -17,7 +17,7 @@ $(MBBOOT80_BIN)/mbboot80.com: $(MBBOOT80_BIN)/mbboot80.hex MB_DOC_HELP_TARGET += $(call mb_doc_target,$(MBBOOT80_BIN)/mbboot80.com,"Compiles mbboot80.") $(MBBOOT80_BIN)/@run: | $(MBBOOT80_BIN)/mbboot80.com - $(call mb_msxpipe_show_gui,$(MBBOOT80_BIN)) + $(call mb_msxpipe_run_gui,$(MBBOOT80_BIN)) MB_DOC_HELP_TARGET += $(call mb_doc_target,$(MBBOOT80_BIN)/@run,"Run the compiled mbboot80.") .PHONY: $(MBBOOT80_BIN)/@run