From 893c848d1d88239266f4b292566cdd4b9ce98a53 Mon Sep 17 00:00:00 2001 From: Willem Date: Sun, 14 Jul 2024 22:58:47 +0200 Subject: [PATCH] More colors. --- lib/make/天房系統擴展/mb_msxpipe.mk | 8 ++++---- 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/example/hello-make4msx/0module.mk | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/make/天房系統擴展/mb_msxpipe.mk b/lib/make/天房系統擴展/mb_msxpipe.mk index d3ee1a8..9fdc839 100644 --- a/lib/make/天房系統擴展/mb_msxpipe.mk +++ b/lib/make/天房系統擴展/mb_msxpipe.mk @@ -19,21 +19,21 @@ $(call mb_make_call,mb_doc_variable,MB_MSXPIPE_COLOR_BG_RUN_GUI,"Background colo define mb_msxpipe_safe_cmd -$(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_autoexec_write_default,$(1),$(MB_MSXPIPE_COLOR_FG_SAFE_CMD),$(MB_MSXPIPE_COLOR_BG_SAFE_CMD)) +$(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_autoexec_write_default,$(1),$(if $(4),$(4),$(MB_MSXPIPE_COLOR_FG_SAFE_CMD)),$(if $(),$(5),$(MB_MSXPIPE_COLOR_BG_SAFE_CMD))) $(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_autoexec_append_safe_cmd,$(1),$(2)) $(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_autoexec_append_exit,$(1)) $(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_openmsx_dosctl,$(1),$(3)) endef -$(call mb_make_call,mb_doc_function,mb_msxpipe_safe_cmd,"Runs openMSX and safely executes one command."," [machine]") +$(call mb_make_call,mb_doc_function,mb_msxpipe_safe_cmd,"Runs openMSX and safely executes one command."," [machine] [fg-color] [bg-color]") define mb_msxpipe_safe_assert -$(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_autoexec_write_default,$(1),$(MB_MSXPIPE_COLOR_FG_SAFE_ASSERT),$(MB_MSXPIPE_COLOR_BG_SAFE_ASSERT)) +$(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_autoexec_write_default,$(1),$(if $(4),$(4),$(MB_MSXPIPE_COLOR_FG_SAFE_ASSERT)),$(if $(5),$(5),$(MB_MSXPIPE_COLOR_BG_SAFE_ASSERT))) $(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_autoexec_append_safe_assert,$(1),$(2)) $(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_autoexec_append_exit,$(1)) $(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_openmsx_dosctl,$(1),$(3)) endef -$(call mb_make_call,mb_doc_function,mb_msxpipe_safe_assert,"Runs openMSX and safely executes one assert."," [machine]") +$(call mb_make_call,mb_doc_function,mb_msxpipe_safe_assert,"Runs openMSX and safely executes one assert."," [machine] [fg-color] [bg-color]") define _mb_msxpipe_run_gui diff --git a/src/assert/msxhub/0module.mk b/src/assert/msxhub/0module.mk index b533d8e..eec52aa 100644 --- a/src/assert/msxhub/0module.mk +++ b/src/assert/msxhub/0module.mk @@ -42,7 +42,7 @@ $(ASSERT_MSXHUB_BIN)/@assert: | $(ASSERT_MSXHUB_BIN) _$(MB_ᕽᕽᕽ　　)$(call mb_make_call,mb_os_file_delete,$(ASSERT_MSXHUB_BIN)/ahello1.out) _$(MB_ᕽᕽᕽ　　)$(call mb_make_call,mb_os_file_delete,$(ASSERT_MSXHUB_BIN)/ahello2.out) _$(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)) +_$(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) _$(MB_ᕽᕽᕽ　　)$(call mb_make_call,mb_autoexec_append_exit,$(ASSERT_MSXHUB_BIN)) _$(MB_ᕽᕽᕽ　　)$(call mb_make_call,mb_openmsx_dosctl,$(ASSERT_MSXHUB_BIN),$(ASSERT_MSXHUB_MACHINE)) diff --git a/src/example/dist-hello-qa-dos1/0module.mk b/src/example/dist-hello-qa-dos1/0module.mk index 7eed1ab..ba8cdbf 100644 --- a/src/example/dist-hello-qa-dos1/0module.mk +++ b/src/example/dist-hello-qa-dos1/0module.mk @@ -7,7 +7,7 @@ $(call mb_make_call,mb_flow_clone_deps,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN),$(EXAMP $(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert: $(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@build -_$(MB_ᕽᕽᕽ　　)$(call mb_make_call,mb_autoexec_write_default,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)) +_$(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) _$(MB_ᕽᕽᕽ　　)$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN),hello3) diff --git a/src/example/dist-hello-qa-dos2/0module.mk b/src/example/dist-hello-qa-dos2/0module.mk index a12aed2..5c03687 100644 --- a/src/example/dist-hello-qa-dos2/0module.mk +++ b/src/example/dist-hello-qa-dos2/0module.mk @@ -9,7 +9,7 @@ $(call mb_make_call,mb_flow_clone_deps,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN),$(EXAMP $(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert: $(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)) +_$(MB_ᕽᕽᕽ　　)$(call mb_make_call,mb_autoexec_write_default,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN),515) _$(MB_ᕽᕽᕽ　　)$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN),hello1 > hello1.out) _$(MB_ᕽᕽᕽ　　)$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN),hello2 > hello2.out) _$(MB_ᕽᕽᕽ　　)$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN),hello3 > hello3.out) diff --git a/src/example/dist-hello-qa-msx1/0module.mk b/src/example/dist-hello-qa-msx1/0module.mk index 43c04da..5348abd 100644 --- a/src/example/dist-hello-qa-msx1/0module.mk +++ b/src/example/dist-hello-qa-msx1/0module.mk @@ -12,7 +12,7 @@ $(call mb_make_call,mb_flow_clone_deps,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),$(EXAMP $(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert: $(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),40) +_$(MB_ᕽᕽᕽ　　)$(call mb_make_call,mb_autoexec_write_default,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),515) _$(MB_ᕽᕽᕽ　　)$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),hello1 > hello1.out,33) _$(MB_ᕽᕽᕽ　　)$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),hello2 > hello2.out,66,99) _$(MB_ᕽᕽᕽ　　)$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),hello3 > hello3.out,50,100) diff --git a/src/example/hello-make4msx/0module.mk b/src/example/hello-make4msx/0module.mk index 70262e1..5951ef8 100644 --- a/src/example/hello-make4msx/0module.mk +++ b/src/example/hello-make4msx/0module.mk @@ -32,7 +32,7 @@ $(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_proj_grow_deps_phase,@process,$(E $(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.com: $(EXAMPLE_HELLO_MAKE4MSX_BIN)/build.bat -_$(MB_ᕽᕽᕽ　　)$(call mb_make_call,mb_msxpipe_safe_cmd,$(EXAMPLE_HELLO_MAKE4MSX_BIN),build shutdown) +_$(MB_ᕽᕽᕽ　　)$(call mb_make_call,mb_msxpipe_safe_cmd,$(EXAMPLE_HELLO_MAKE4MSX_BIN),build shutdown,,662) $(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_doc_target_deep,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.com)