diff --git a/Makefile b/Makefile index 6f5a104..fd2f8a0 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ MB_I18N_MAKE_CHECK_ARG5 = 引数 五 がありません MB_I18N_MSXHUB_FILE_FETCH = コンピューターハブファイルを取得する MB_I18N_MSXROM_FILE_FETCH = 読み取り専用メモリファイルを取得する MB_I18N_OPENMSX_STARTUP = オープンメッカシステムを開始 -MB_I18N_OS_ECHO_CRAYON = ©Δ∞ 仙上主天 +MB_I18N_OS_CRAYON_TAG = ©Δ∞ 仙上主天 MB_I18N_PROJ_STEP_BEFORE = フェーズ前 MB_I18N_PROJ_STEP_AFTER = フェーズ後 MB_I18N_PROJ_STEP_DONE = プライムパイターゲットの実行を終了しました diff --git a/lib/make/mb_i18n.mk b/lib/make/mb_i18n.mk index fc283f5..25629b1 100644 --- a/lib/make/mb_i18n.mk +++ b/lib/make/mb_i18n.mk @@ -35,8 +35,8 @@ $(call mb_make_call,mb_doc_variable_i18n,MB_I18N_MSXROM_FILE_FETCH,"Message for MB_I18N_OPENMSX_STARTUP ?= Start openMSX! for $(call mb_make_call,mb_doc_variable_i18n,MB_I18N_OPENMSX_STARTUP,"Message used on startup of openMSX.") -MB_I18N_OS_ECHO_CRAYON ?= === -$(call mb_make_call,mb_doc_variable_i18n,MB_I18N_OS_ECHO_CRAYON,"Crayon marker for result step output echo's.") +MB_I18N_OS_CRAYON_TAG ?= === +$(call mb_make_call,mb_doc_variable_i18n,MB_I18N_OS_CRAYON_TAG,"Crayon tag colored prefix to a message.") MB_I18N_PROJ_STEP_BEFORE ?= Before -- $(call mb_make_call,mb_doc_variable_i18n,MB_I18N_PROJ_STEP_BEFORE,"Prefix for begin phase message.") diff --git a/lib/make/mb_os.mk b/lib/make/mb_os.mk index bc43b87..9366c2e 100644 --- a/lib/make/mb_os.mk +++ b/lib/make/mb_os.mk @@ -24,8 +24,8 @@ $(call mb_make_call,mb_doc_variable_rock,MB_OS_SEP,"Native OS path seperator.") MB_OS_CACHE ?= ~/.cache $(call mb_make_call,mb_doc_variable_rock,MB_OS_CACHE,"Native OS application cache folder.") -MB_OS_COLORS ?= $(shell tput colors 2> /dev/null;test $$? -eq 0 || echo "-1") -$(call mb_make_call,mb_doc_variable_rock,MB_OS_COLORS,"Native OS terminal color count support.") +MB_OS_TERM_COLORS ?= $(shell tput colors 2> /dev/null;test $$? -eq 0 || echo "-1") +$(call mb_make_call,mb_doc_variable_rock,MB_OS_TERM_COLORS,"Native OS terminal color count support.") ifdef OS @@ -67,44 +67,44 @@ endef $(call mb_make_call,mb_doc_function,mb_os_file_copy,"Copy an file."," ") -define mb_os_echo_color -$(MB__    )$(if $(filter -1,$(MB_OS_COLORS)),@echo $(MB_I18N_OS_ECHO_CRAYON) $(2),@echo -e "\x1B[$(1)m$(MB_I18N_OS_ECHO_CRAYON)\x1B[39m $(2)") +define mb_os_crayon_tagged_echo +$(MB__    )$(if $(filter -1,$(MB_OS_TERM_COLORS)),@echo $(MB_I18N_OS_CRAYON_TAG) $(2),@echo -e "\x1B[$(1)m$(MB_I18N_OS_CRAYON_TAG)\x1B[39m $(2)") endef -$(call mb_make_call,mb_doc_function_deep,mb_os_echo_color,"Echo's an message to stdout with ansi color code."," ") +$(call mb_make_call,mb_doc_function_deep,mb_os_crayon_tagged_echo,"Echo's an prefixed message to stdout with ansi color code."," ") define mb_os_echo_fail -$(MB__    )$(call mb_make_call,mb_os_echo_color,31,$(1)) +$(MB__    )$(call mb_make_call,mb_os_crayon_tagged_echo,31,$(1)) endef $(call mb_make_call,mb_doc_function_deep,mb_os_echo_fail,"Echo's an message to stdout with 'red' crayon.","") define mb_os_echo_good -$(MB__    )$(call mb_make_call,mb_os_echo_color,32,$(1)) +$(MB__    )$(call mb_make_call,mb_os_crayon_tagged_echo,32,$(1)) endef $(call mb_make_call,mb_doc_function_deep,mb_os_echo_good,"Echo's an message to stdout with 'green' crayon.","") define mb_os_echo_assert -$(MB__    )$(call mb_make_call,mb_os_echo_color,33,$(1)) +$(MB__    )$(call mb_make_call,mb_os_crayon_tagged_echo,33,$(1)) endef $(call mb_make_call,mb_doc_function_deep,mb_os_echo_assert,"Echo's an message to stdout with 'yellow' crayon.","") define mb_os_echo_command -$(MB__    )$(call mb_make_call,mb_os_echo_color,34,$(1)) +$(MB__    )$(call mb_make_call,mb_os_crayon_tagged_echo,34,$(1)) endef $(call mb_make_call,mb_doc_function_deep,mb_os_echo_command,"Echo's an message to stdout with 'blue' crayon.","") define mb_os_echo_phase -$(MB__    )$(call mb_make_call,mb_os_echo_color,35,$(1)) +$(MB__    )$(call mb_make_call,mb_os_crayon_tagged_echo,35,$(1)) endef $(call mb_make_call,mb_doc_function_deep,mb_os_echo_phase,"Echo's an message to stdout with 'magenta' crayon.","") define mb_os_echo_alert -$(MB__    )$(call mb_make_call,mb_os_echo_color,36,$(1)) +$(MB__    )$(call mb_make_call,mb_os_crayon_tagged_echo,36,$(1)) endef $(call mb_make_call,mb_doc_function_deep,mb_os_echo_alert,"Echo's an message to stdout with 'cyan' crayon.","")