diff --git a/Makefile b/Makefile index ae84dc6..438bdbe 100644 --- a/Makefile +++ b/Makefile @@ -6,14 +6,13 @@ PATH_BIN := bin PATH_SRC := src +PATH_MKLOCAL ?= . PATH_MSXBUILD ?= . include $(PATH_MSXBUILD)/lib/make/setup-prolog.mk -include $(PATH_MSXBUILD)/lib/make/setup-verbose.mk include $(PATH_MSXBUILD)/lib/make/setup-debug.mk --include Makelocal.mk - -# TODO: Temp redo src mk files -.RECIPEPREFIX := +include $(PATH_MSXBUILD)/lib/make/setup-verbose.mk +include $(PATH_MSXBUILD)/lib/make/setup-cnspace.mk +-include $(PATH_MKLOCAL)/Makelocal.mk include $(PATH_MSXBUILD)/lib/make/msxbuild.mk $(call mb_make_call,mb_doc_flow_help,MSXBUILD-Example) $(call mb_make_call,mb_make_flow_0module,$(PATH_SRC)) diff --git a/lib/make/setup-cnspace.mk b/lib/make/setup-cnspace.mk new file mode 100644 index 0000000..a39ec98 --- /dev/null +++ b/lib/make/setup-cnspace.mk @@ -0,0 +1,20 @@ +# +# Latin1 white space and latin1 tab space are not usable in makefiles. +# + +# Setup private chinese white space +_XXX　 := +_XXX　　 := +_XXX　　　 := +_XXX　　　　 := +_XXX　　　　　 := +_XXX　　　　　　 := +_XXX　　　　　　　 := +_XXX　　　　　　　　 := +_XXX　　　　　　　　　 := +_XXX　　　　　　　　　　 := +_XXX　　　　　　　　　　　 := +_XXX　　　　　　　　　　　　 := +_XXX　　　　　　　　　　　　　 := +_XXX　　　　　　　　　　　　　　 := + diff --git a/lib/make/setup-prolog.mk b/lib/make/setup-prolog.mk index 6b2da00..2e341a8 100644 --- a/lib/make/setup-prolog.mk +++ b/lib/make/setup-prolog.mk @@ -5,7 +5,7 @@ MAKEFLAGS += --no-builtin-rules MAKEFLAGS += --no-builtin-variables MAKEFLAGS += --warn-undefined-variables .DELETE_ON_ERROR := -.RECIPEPREFIX := > +.RECIPEPREFIX := _ .SUFFIXES := .PHONY := Makefile .ONESHELL := diff --git a/src/dist-qa-dos1/0module.mk b/src/dist-qa-dos1/0module.mk index d557d80..546da34 100644 --- a/src/dist-qa-dos1/0module.mk +++ b/src/dist-qa-dos1/0module.mk @@ -3,30 +3,29 @@ DIST_QA_DOS1_SRC := $(call mb_make_call,mb_proj_module_path_src,$(PATH_SRC)) DIST_QA_DOS1_BIN := $(call mb_make_call,mb_proj_module_path_bin,$(PATH_SRC),$(PATH_BIN)) DIST_QA_DOS1_DEPS := $(call mb_make_call,mb_proj_module_local_deps,$(DIST_QA_DOS1_BIN),$(DIST_DEPS)) - $(DIST_QA_DOS1_BIN): | @init - $(if $(wildcard $(DIST_QA_DOS1_BIN)),,$(call mb_make_call,mb_os_dir_create,$(DIST_QA_DOS1_BIN))) - $(call mb_make_call,mb_msxhub_get_msxdos1_boot,$(DIST_QA_DOS1_BIN)) +_$(_XXX　　　　)$(if $(wildcard $(DIST_QA_DOS1_BIN)),,$(call mb_make_call,mb_os_dir_create,$(DIST_QA_DOS1_BIN))) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_msxdos1_boot,$(DIST_QA_DOS1_BIN)) $(DIST_QA_DOS1_BIN)/%: $(DIST_BIN)/% $(DIST_DEPS) | $(DIST_QA_DOS1_BIN) - $(call mb_make_call,mb_os_file_copy,$<,$@) +_$(_XXX　　　　)$(call mb_make_call,mb_os_file_copy,$<,$@) $(DIST_QA_DOS1_BIN)/@run: $(DIST_QA_DOS1_DEPS) - $(call mb_make_call,mb_msxpipe_run_gui,$(DIST_QA_DOS1_BIN)) -$(call mb_make_call,mb_doc_target_run,$(DIST_QA_DOS1_BIN)/@run,"Run binaries on msxdos1 machine.") -$(call mb_make_call,mb_make_flag_phony,$(DIST_QA_DOS1_BIN)/@run) +_$(_XXX　　　　)$(call mb_make_call,mb_msxpipe_run_gui,$(DIST_QA_DOS1_BIN)) +$(_XXX　　　　)$(call mb_make_call,mb_doc_target_run,$(DIST_QA_DOS1_BIN)/@run,"Run binaries on msxdos1 machine.") +$(_XXX　　　　)$(call mb_make_call,mb_make_flag_phony,$(DIST_QA_DOS1_BIN)/@run) $(DIST_QA_DOS1_BIN)/@assert: $(DIST_QA_DOS1_DEPS) - $(call mb_make_call,mb_autoexec_write_default,$(DIST_QA_DOS1_BIN)) - $(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_DOS1_BIN),ahello1) - $(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_DOS1_BIN),ahello2) - $(call mb_make_call,mb_autoexec_append_exit,$(DIST_QA_DOS1_BIN)) - $(call mb_make_call,mb_openmsx_dosctl,$(DIST_QA_DOS1_BIN)) - $(call mb_make_call,mb_os_echo_assert,$(MB_I18N_ASSERT_SUCCESS) $(DIST_QA_DOS1_BIN)/@assert) -$(call mb_make_call,mb_doc_target,$(DIST_QA_DOS1_BIN)/@assert,"Assert binaries on msxdos1.") -$(call mb_make_call,mb_proj_grow_deps_phase_package_qa,$(DIST_QA_DOS1_BIN)/@assert) -$(call mb_make_call,mb_make_flag_phony,$(DIST_QA_DOS1_BIN)/@assert) +_$(_XXX　　　　)$(call mb_make_call,mb_autoexec_write_default,$(DIST_QA_DOS1_BIN)) +_$(_XXX　　　　)$(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_DOS1_BIN),ahello1) +_$(_XXX　　　　)$(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_DOS1_BIN),ahello2) +_$(_XXX　　　　)$(call mb_make_call,mb_autoexec_append_exit,$(DIST_QA_DOS1_BIN)) +_$(_XXX　　　　)$(call mb_make_call,mb_openmsx_dosctl,$(DIST_QA_DOS1_BIN)) +_$(_XXX　　　　)$(call mb_make_call,mb_os_echo_assert,$(MB_I18N_ASSERT_SUCCESS) $(DIST_QA_DOS1_BIN)/@assert) +$(_XXX　　　　)$(call mb_make_call,mb_doc_target,$(DIST_QA_DOS1_BIN)/@assert,"Assert binaries on msxdos1.") +$(_XXX　　　　)$(call mb_make_call,mb_proj_grow_deps_phase_package_qa,$(DIST_QA_DOS1_BIN)/@assert) +$(_XXX　　　　)$(call mb_make_call,mb_make_flag_phony,$(DIST_QA_DOS1_BIN)/@assert) diff --git a/src/dist-qa-dos2/0module.mk b/src/dist-qa-dos2/0module.mk index 60eb643..b144e09 100644 --- a/src/dist-qa-dos2/0module.mk +++ b/src/dist-qa-dos2/0module.mk @@ -5,32 +5,32 @@ DIST_QA_DOS2_DEPS := $(call mb_make_call,mb_proj_module_local_deps,$(DIST_QA_ $(DIST_QA_DOS2_BIN): | @init - $(if $(wildcard $(DIST_QA_DOS2_BIN)),,$(call mb_make_call,mb_os_dir_create,$(DIST_QA_DOS2_BIN))) - $(call mb_make_call,mb_msxhub_get_msxdos2_boot,$(DIST_QA_DOS2_BIN)) +_$(_XXX　　　　)$(if $(wildcard $(DIST_QA_DOS2_BIN)),,$(call mb_make_call,mb_os_dir_create,$(DIST_QA_DOS2_BIN))) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_msxdos2_boot,$(DIST_QA_DOS2_BIN)) $(DIST_QA_DOS2_BIN)/%: $(DIST_BIN)/% $(DIST_DEPS) | $(DIST_QA_DOS2_BIN) - $(call mb_make_call,mb_os_file_copy,$<,$@) +_$(_XXX　　　　)$(call mb_make_call,mb_os_file_copy,$<,$@) $(DIST_QA_DOS2_BIN)/@run: | $(DIST_QA_DOS2_DEPS) - $(call mb_make_call,mb_msxpipe_run_gui,$(DIST_QA_DOS2_BIN)) -$(call mb_make_call,mb_doc_target_run,$(DIST_QA_DOS2_BIN)/@run,"Run binaries on msxdos2 machine.") -$(call mb_make_call,mb_make_flag_phony,$(DIST_QA_DOS2_BIN)/@run) +_$(_XXX　　　　)$(call mb_make_call,mb_msxpipe_run_gui,$(DIST_QA_DOS2_BIN)) +$(_XXX　　　　)$(call mb_make_call,mb_doc_target_run,$(DIST_QA_DOS2_BIN)/@run,"Run binaries on msxdos2 machine.") +$(_XXX　　　　)$(call mb_make_call,mb_make_flag_phony,$(DIST_QA_DOS2_BIN)/@run) $(DIST_QA_DOS2_BIN)/@assert: | $(DIST_QA_DOS2_DEPS) - $(call mb_make_call,mb_os_file_delete,$(DIST_QA_DOS2_BIN)/ahello1.out) - $(call mb_make_call,mb_os_file_delete,$(DIST_QA_DOS2_BIN)/ahello2.out) - $(call mb_make_call,mb_autoexec_write_default,$(DIST_QA_DOS2_BIN)) - $(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_DOS2_BIN),ahello1 > ahello1.out) - $(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_DOS2_BIN),ahello2 > ahello2.out) - $(call mb_make_call,mb_autoexec_append_exit,$(DIST_QA_DOS2_BIN)) - $(call mb_make_call,mb_openmsx_dosctl,$(DIST_QA_DOS2_BIN)) - 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_os_echo_assert,$(MB_I18N_ASSERT_SUCCESS) $(DIST_QA_DOS2_BIN)/@assert) -$(call mb_make_call,mb_doc_target,$(DIST_QA_DOS2_BIN)/@assert,"Assert binaries on msxdos2.") -$(call mb_make_call,mb_proj_grow_deps_phase_package_qa,$(DIST_QA_DOS2_BIN)/@assert) -$(call mb_make_call,mb_make_flag_phony,$(DIST_QA_DOS2_BIN)/@assert) +_$(_XXX　　　　)$(call mb_make_call,mb_os_file_delete,$(DIST_QA_DOS2_BIN)/ahello1.out) +_$(_XXX　　　　)$(call mb_make_call,mb_os_file_delete,$(DIST_QA_DOS2_BIN)/ahello2.out) +_$(_XXX　　　　)$(call mb_make_call,mb_autoexec_write_default,$(DIST_QA_DOS2_BIN)) +_$(_XXX　　　　)$(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_DOS2_BIN),ahello1 > ahello1.out) +_$(_XXX　　　　)$(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_DOS2_BIN),ahello2 > ahello2.out) +_$(_XXX　　　　)$(call mb_make_call,mb_autoexec_append_exit,$(DIST_QA_DOS2_BIN)) +_$(_XXX　　　　)$(call mb_make_call,mb_openmsx_dosctl,$(DIST_QA_DOS2_BIN)) +_$(_XXX　　　　)grep -q "M80: Hello world..." $(DIST_QA_DOS2_BIN)/ahello1.out +_$(_XXX　　　　)grep -q "SDCC: Hello world..." $(DIST_QA_DOS2_BIN)/ahello2.out +_$(_XXX　　　　)$(call mb_make_call,mb_os_echo_assert,$(MB_I18N_ASSERT_SUCCESS) $(DIST_QA_DOS2_BIN)/@assert) +$(_XXX　　　　)$(call mb_make_call,mb_doc_target,$(DIST_QA_DOS2_BIN)/@assert,"Assert binaries on msxdos2.") +$(_XXX　　　　)$(call mb_make_call,mb_proj_grow_deps_phase_package_qa,$(DIST_QA_DOS2_BIN)/@assert) +$(_XXX　　　　)$(call mb_make_call,mb_make_flag_phony,$(DIST_QA_DOS2_BIN)/@assert) diff --git a/src/dist-qa-msx1/0module.mk b/src/dist-qa-msx1/0module.mk index d7840db..c753aaa 100644 --- a/src/dist-qa-msx1/0module.mk +++ b/src/dist-qa-msx1/0module.mk @@ -8,31 +8,31 @@ $(call mb_make_call,mb_doc_variable,DIST_QA_MSX1_MACHINE,"The machine to run the $(DIST_QA_MSX1_BIN): | @init - $(if $(wildcard $(DIST_QA_MSX1_BIN)),,$(call mb_make_call,mb_os_dir_create,$(DIST_QA_MSX1_BIN))) +_$(_XXX　　　　)$(if $(wildcard $(DIST_QA_MSX1_BIN)),,$(call mb_make_call,mb_os_dir_create,$(DIST_QA_MSX1_BIN))) $(DIST_QA_MSX1_BIN)/%: $(DIST_BIN)/% $(DIST_DEPS) | $(DIST_QA_MSX1_BIN) - $(call mb_make_call,mb_os_file_copy,$<,$@) +_$(_XXX　　　　)$(call mb_make_call,mb_os_file_copy,$<,$@) $(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)) -$(call mb_make_call,mb_doc_target_run,$(DIST_QA_MSX1_BIN)/@run,"Run binaries on MSX1 machine.") -$(call mb_make_call,mb_make_flag_phony,$(DIST_QA_MSX1_BIN)/@run) +_$(_XXX　　　　)$(call mb_make_call,mb_msxpipe_run_gui,$(DIST_QA_MSX1_BIN),,$(DIST_QA_MSX1_MACHINE)) +$(_XXX　　　　)$(call mb_make_call,mb_doc_target_run,$(DIST_QA_MSX1_BIN)/@run,"Run binaries on MSX1 machine.") +$(_XXX　　　　)$(call mb_make_call,mb_make_flag_phony,$(DIST_QA_MSX1_BIN)/@run) $(DIST_QA_MSX1_BIN)/@assert: | $(DIST_QA_MSX1_DEPS) - $(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSX1_BIN)/ahello1.out) - $(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSX1_BIN)/ahello2.out) - $(call mb_make_call,mb_autoexec_write_default,$(DIST_QA_MSX1_BIN),40) - $(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_MSX1_BIN),ahello1 > ahello1.out,33) - $(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_MSX1_BIN),ahello2 > ahello2.out,66,99) - $(call mb_make_call,mb_autoexec_append_exit,$(DIST_QA_MSX1_BIN)) - $(call mb_make_call,mb_openmsx_dosctl,$(DIST_QA_MSX1_BIN),$(DIST_QA_MSX1_MACHINE)) - grep -q "M80: Hello world..." $(DIST_QA_MSX1_BIN)/ahello1.out - grep -q "SDCC: Hello world..." $(DIST_QA_MSX1_BIN)/ahello2.out - $(call mb_make_call,mb_os_echo_assert,$(MB_I18N_ASSERT_SUCCESS) $(DIST_QA_MSX1_BIN)/@assert) -$(call mb_make_call,mb_doc_target,$(DIST_QA_MSX1_BIN)/@assert,"Assert binaries on MSX1 machine.") -$(call mb_make_call,mb_proj_grow_deps_phase_package_qa,$(DIST_QA_MSX1_BIN)/@assert) -$(call mb_make_call,mb_make_flag_phony,$(DIST_QA_MSX1_BIN)/@assert) +_$(_XXX　　　　)$(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSX1_BIN)/ahello1.out) +_$(_XXX　　　　)$(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSX1_BIN)/ahello2.out) +_$(_XXX　　　　)$(call mb_make_call,mb_autoexec_write_default,$(DIST_QA_MSX1_BIN),40) +_$(_XXX　　　　)$(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_MSX1_BIN),ahello1 > ahello1.out,33) +_$(_XXX　　　　)$(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_MSX1_BIN),ahello2 > ahello2.out,66,99) +_$(_XXX　　　　)$(call mb_make_call,mb_autoexec_append_exit,$(DIST_QA_MSX1_BIN)) +_$(_XXX　　　　)$(call mb_make_call,mb_openmsx_dosctl,$(DIST_QA_MSX1_BIN),$(DIST_QA_MSX1_MACHINE)) +_$(_XXX　　　　)grep -q "M80: Hello world..." $(DIST_QA_MSX1_BIN)/ahello1.out +_$(_XXX　　　　)grep -q "SDCC: Hello world..." $(DIST_QA_MSX1_BIN)/ahello2.out +_$(_XXX　　　　)$(call mb_make_call,mb_os_echo_assert,$(MB_I18N_ASSERT_SUCCESS) $(DIST_QA_MSX1_BIN)/@assert) +$(_XXX　　　　)$(call mb_make_call,mb_doc_target,$(DIST_QA_MSX1_BIN)/@assert,"Assert binaries on MSX1 machine.") +$(_XXX　　　　)$(call mb_make_call,mb_proj_grow_deps_phase_package_qa,$(DIST_QA_MSX1_BIN)/@assert) +$(_XXX　　　　)$(call mb_make_call,mb_make_flag_phony,$(DIST_QA_MSX1_BIN)/@assert) diff --git a/src/dist-qa-msxhub/0module.mk b/src/dist-qa-msxhub/0module.mk index d4628d9..31e00c0 100644 --- a/src/dist-qa-msxhub/0module.mk +++ b/src/dist-qa-msxhub/0module.mk @@ -8,57 +8,57 @@ $(call mb_make_call,mb_doc_variable,DIST_QA_MSXHUB_MACHINE,"The machine to run t $(DIST_QA_MSXHUB_BIN): | @init - $(if $(wildcard $(DIST_QA_MSXHUB_BIN)),,$(call mb_make_call,mb_os_dir_create,$(DIST_QA_MSXHUB_BIN))) - $(if $(wildcard $(DIST_QA_MSXHUB_BIN)/utils),,$(call mb_make_call,mb_os_dir_create,$(DIST_QA_MSXHUB_BIN)/utils)) - $(call mb_make_call,mb_msxhub_get_msxdos2_utils,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_nextor_utils,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_macro80,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_z80asmuk,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_wbass2,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_konpass,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_pmarc,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_lhpack,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_lhext,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_gunzip,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_tunzip,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_popcom,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_make,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_adir,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_turbo,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_baskom,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_binldr,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_dmphex,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_zd,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_msxdos2t,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_gfxage,$(DIST_QA_MSXHUB_BIN)/utils) +_$(_XXX　　　　)$(if $(wildcard $(DIST_QA_MSXHUB_BIN)),,$(call mb_make_call,mb_os_dir_create,$(DIST_QA_MSXHUB_BIN))) +_$(_XXX　　　　)$(if $(wildcard $(DIST_QA_MSXHUB_BIN)/utils),,$(call mb_make_call,mb_os_dir_create,$(DIST_QA_MSXHUB_BIN)/utils)) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_msxdos2_utils,$(DIST_QA_MSXHUB_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_nextor_utils,$(DIST_QA_MSXHUB_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_macro80,$(DIST_QA_MSXHUB_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_z80asmuk,$(DIST_QA_MSXHUB_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_wbass2,$(DIST_QA_MSXHUB_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_konpass,$(DIST_QA_MSXHUB_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_pmarc,$(DIST_QA_MSXHUB_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_lhpack,$(DIST_QA_MSXHUB_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_lhext,$(DIST_QA_MSXHUB_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_gunzip,$(DIST_QA_MSXHUB_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_tunzip,$(DIST_QA_MSXHUB_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_popcom,$(DIST_QA_MSXHUB_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_make,$(DIST_QA_MSXHUB_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_adir,$(DIST_QA_MSXHUB_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_turbo,$(DIST_QA_MSXHUB_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_baskom,$(DIST_QA_MSXHUB_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_binldr,$(DIST_QA_MSXHUB_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_dmphex,$(DIST_QA_MSXHUB_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_zd,$(DIST_QA_MSXHUB_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_msxdos2t,$(DIST_QA_MSXHUB_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_gfxage,$(DIST_QA_MSXHUB_BIN)/utils) $(DIST_QA_MSXHUB_BIN)/%: $(DIST_BIN)/% $(DIST_DEPS) | $(DIST_QA_MSXHUB_BIN) - $(call mb_make_call,mb_os_file_copy,$<,$@) +_$(_XXX　　　　)$(call mb_make_call,mb_os_file_copy,$<,$@) $(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)) -$(call mb_make_call,mb_doc_target_run,$(DIST_QA_MSXHUB_BIN)/@run,"Run the dist with all msxhub packages.") -$(call mb_make_call,mb_make_flag_phony,$(DIST_QA_MSXHUB_BIN)/@run) +_$(_XXX　　　　)$(call mb_make_call,mb_msxpipe_run_gui,$(DIST_QA_MSXHUB_BIN),,$(DIST_QA_MSXHUB_MACHINE)) +$(_XXX　　　　)$(call mb_make_call,mb_doc_target_run,$(DIST_QA_MSXHUB_BIN)/@run,"Run the dist with all msxhub packages.") +$(_XXX　　　　)$(call mb_make_call,mb_make_flag_phony,$(DIST_QA_MSXHUB_BIN)/@run) $(DIST_QA_MSXHUB_BIN)/@assert: | $(DIST_QA_MSXHUB_DEPS) - $(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSXHUB_BIN)/ahello1.out) - $(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSXHUB_BIN)/ahello2.out) - $(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSXHUB_BIN)/utils.out) - $(call mb_make_call,mb_autoexec_write_default,$(DIST_QA_MSXHUB_BIN)) - $(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB_BIN),ahello1 > ahello1.out) - $(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB_BIN),ahello2 > ahello2.out) - $(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB_BIN),dir utils > utils.out) - $(call mb_make_call,mb_autoexec_append_exit,$(DIST_QA_MSXHUB_BIN)) - $(call mb_make_call,mb_openmsx_dosctl,$(DIST_QA_MSXHUB_BIN),$(DIST_QA_MSXHUB_MACHINE)) - grep -q "M80: Hello world..." $(DIST_QA_MSXHUB_BIN)/ahello1.out - grep -q "SDCC: Hello world..." $(DIST_QA_MSXHUB_BIN)/ahello2.out - grep -q "KONPASS COM" $(DIST_QA_MSXHUB_BIN)/utils.out - grep -q "MAKE COM" $(DIST_QA_MSXHUB_BIN)/utils.out - $(call mb_make_call,mb_os_echo_assert,$(MB_I18N_ASSERT_SUCCESS) $(DIST_QA_MSXHUB_BIN)/@assert) -$(call mb_make_call,mb_doc_target,$(DIST_QA_MSXHUB_BIN)/@assert,"Asserts that all dist artifacts execute results.") -$(call mb_make_call,mb_proj_grow_deps_phase_package_qa,$(DIST_QA_MSXHUB_BIN)/@assert) -$(call mb_make_call,mb_make_flag_phony,$(DIST_QA_MSXHUB_BIN)/@assert) +_$(_XXX　　　　)$(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSXHUB_BIN)/ahello1.out) +_$(_XXX　　　　)$(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSXHUB_BIN)/ahello2.out) +_$(_XXX　　　　)$(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSXHUB_BIN)/utils.out) +_$(_XXX　　　　)$(call mb_make_call,mb_autoexec_write_default,$(DIST_QA_MSXHUB_BIN)) +_$(_XXX　　　　)$(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB_BIN),ahello1 > ahello1.out) +_$(_XXX　　　　)$(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB_BIN),ahello2 > ahello2.out) +_$(_XXX　　　　)$(call mb_make_call,mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB_BIN),dir utils > utils.out) +_$(_XXX　　　　)$(call mb_make_call,mb_autoexec_append_exit,$(DIST_QA_MSXHUB_BIN)) +_$(_XXX　　　　)$(call mb_make_call,mb_openmsx_dosctl,$(DIST_QA_MSXHUB_BIN),$(DIST_QA_MSXHUB_MACHINE)) +_$(_XXX　　　　)grep -q "M80: Hello world..." $(DIST_QA_MSXHUB_BIN)/ahello1.out +_$(_XXX　　　　)grep -q "SDCC: Hello world..." $(DIST_QA_MSXHUB_BIN)/ahello2.out +_$(_XXX　　　　)grep -q "KONPASS COM" $(DIST_QA_MSXHUB_BIN)/utils.out +_$(_XXX　　　　)grep -q "MAKE COM" $(DIST_QA_MSXHUB_BIN)/utils.out +_$(_XXX　　　　)$(call mb_make_call,mb_os_echo_assert,$(MB_I18N_ASSERT_SUCCESS) $(DIST_QA_MSXHUB_BIN)/@assert) +$(_XXX　　　　)$(call mb_make_call,mb_doc_target,$(DIST_QA_MSXHUB_BIN)/@assert,"Asserts that all dist artifacts execute results.") +$(_XXX　　　　)$(call mb_make_call,mb_proj_grow_deps_phase_package_qa,$(DIST_QA_MSXHUB_BIN)/@assert) +$(_XXX　　　　)$(call mb_make_call,mb_make_flag_phony,$(DIST_QA_MSXHUB_BIN)/@assert) diff --git a/src/dist/0module.mk b/src/dist/0module.mk index 2503ce7..65e749d 100644 --- a/src/dist/0module.mk +++ b/src/dist/0module.mk @@ -6,24 +6,24 @@ DIST_OUT := $(PATH_BIN)/$(DIST_MOD).tar.gz DIST_DEPS := $(DIST_BIN)/readme.txt $(DIST_BIN)/ahello1.com $(DIST_BIN)/ahello2.com $(DIST_BIN): | @init - $(if $(wildcard $(DIST_BIN)),,$(call mb_make_call,mb_os_dir_create,$(DIST_BIN))) +_$(_XXX　　　　)$(if $(wildcard $(DIST_BIN)),,$(call mb_make_call,mb_os_dir_create,$(DIST_BIN))) $(DIST_BIN)/readme.txt: $(DIST_SRC)/readme.txt | $(DIST_BIN) - $(call mb_make_call,mb_conv_unix2dos,$<,$@) +_$(_XXX　　　　)$(call mb_make_call,mb_conv_unix2dos,$<,$@) $(call mb_make_call,mb_proj_grow_deps_phase_process,$(DIST_BIN)/readme.txt) $(DIST_BIN)/ahello1.com: bin/ahello-m80/ahello.com | $(DIST_BIN) - $(call mb_make_call,mb_os_file_copy,$<,$@) +_$(_XXX　　　　)$(call mb_make_call,mb_os_file_copy,$<,$@) $(DIST_BIN)/ahello2.com: bin/ahello-sdcc/ahello.com | $(DIST_BIN) - $(call mb_make_call,mb_os_file_copy,$<,$@) +_$(_XXX　　　　)$(call mb_make_call,mb_os_file_copy,$<,$@) $(DIST_BIN)/@prepare: | $(DIST_DEPS) -$(call mb_make_call,mb_doc_target,$(DIST_BIN)/@prepare,"Prepare folder with binaries for distribution.") -$(call mb_make_call,mb_make_flag_phony,$(DIST_BIN)/@prepare) +$(_XXX　　　　)$(call mb_make_call,mb_doc_target,$(DIST_BIN)/@prepare,"Prepare folder with binaries for distribution.") +$(_XXX　　　　)$(call mb_make_call,mb_make_flag_phony,$(DIST_BIN)/@prepare) $(DIST_OUT): | $(DIST_BIN)/@prepare - $(call mb_make_call,mb_package_create_archive,$(DIST_BIN),$@) -$(call mb_make_call,mb_doc_target,$(DIST_OUT),"Build archive distribution artifact.") -$(call mb_make_call,mb_proj_grow_deps_phase_package,$(DIST_OUT)) +_$(_XXX　　　　)$(call mb_make_call,mb_package_create_archive,$(DIST_BIN),$@) +$(_XXX　　　　)$(call mb_make_call,mb_doc_target,$(DIST_OUT),"Build archive distribution artifact.") +$(_XXX　　　　)$(call mb_make_call,mb_proj_grow_deps_phase_package,$(DIST_OUT)) diff --git a/src/make-on-msx/0module.mk b/src/make-on-msx/0module.mk index e11c025..86305b6 100644 --- a/src/make-on-msx/0module.mk +++ b/src/make-on-msx/0module.mk @@ -4,48 +4,48 @@ MAKE_ON_MSX_BIN := $(call mb_make_call,mb_proj_module_path_bin,$(PATH_SRC),$(P $(MAKE_ON_MSX_BIN): | @init - $(if $(wildcard $(MAKE_ON_MSX_BIN)),,$(call mb_make_call,mb_os_dir_create,$(MAKE_ON_MSX_BIN))) - $(if $(wildcard $(MAKE_ON_MSX_BIN)/utils),,$(call mb_make_call,mb_os_dir_create,$(MAKE_ON_MSX_BIN)/utils)) - $(call mb_make_call,mb_msxhub_get_make,$(MAKE_ON_MSX_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_macro80,$(MAKE_ON_MSX_BIN)/utils) - $(call mb_make_call,mb_msxhub_get_z80asmuk,$(MAKE_ON_MSX_BIN)/utils) -$(call mb_make_call,mb_doc_target_deep,$(MAKE_ON_MSX_BIN)) -$(call mb_make_call,mb_make_flag_phony,$(MAKE_ON_MSX_BIN)) +_$(_XXX　　　　)$(if $(wildcard $(MAKE_ON_MSX_BIN)),,$(call mb_make_call,mb_os_dir_create,$(MAKE_ON_MSX_BIN))) +_$(_XXX　　　　)$(if $(wildcard $(MAKE_ON_MSX_BIN)/utils),,$(call mb_make_call,mb_os_dir_create,$(MAKE_ON_MSX_BIN)/utils)) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_make,$(MAKE_ON_MSX_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_macro80,$(MAKE_ON_MSX_BIN)/utils) +_$(_XXX　　　　)$(call mb_make_call,mb_msxhub_get_z80asmuk,$(MAKE_ON_MSX_BIN)/utils) +$(_XXX　　　　)$(call mb_make_call,mb_doc_target_deep,$(MAKE_ON_MSX_BIN)) +$(_XXX　　　　)$(call mb_make_call,mb_make_flag_phony,$(MAKE_ON_MSX_BIN)) $(MAKE_ON_MSX_BIN)/nfbsshot.mac: $(MAKE_ON_MSX_SRC)/nfbsshot.mac | $(MAKE_ON_MSX_BIN) - $(call mb_make_call,mb_conv_unix2dos,$<,$@) -$(call mb_make_call,mb_doc_target_deep,$(MAKE_ON_MSX_BIN)/nfbsshot.mac) -$(call mb_make_call,mb_proj_grow_deps_phase_process,$(MAKE_ON_MSX_BIN)/nfbsshot.mac) +_$(_XXX　　　　)$(call mb_make_call,mb_conv_unix2dos,$<,$@) +$(_XXX　　　　)$(call mb_make_call,mb_doc_target_deep,$(MAKE_ON_MSX_BIN)/nfbsshot.mac) +$(_XXX　　　　)$(call mb_make_call,mb_proj_grow_deps_phase_process,$(MAKE_ON_MSX_BIN)/nfbsshot.mac) $(MAKE_ON_MSX_BIN)/nfbsshot.mf: $(MAKE_ON_MSX_SRC)/nfbsshot.mf $(MAKE_ON_MSX_BIN)/nfbsshot.mac - $(call mb_make_call,mb_conv_unix2dos,$<,$@) -$(call mb_make_call,mb_doc_target_deep,$(MAKE_ON_MSX_BIN)/nfbsshot.mf) -$(call mb_make_call,mb_proj_grow_deps_phase_process,$(MAKE_ON_MSX_BIN)/nfbsshot.mf) +_$(_XXX　　　　)$(call mb_make_call,mb_conv_unix2dos,$<,$@) +$(_XXX　　　　)$(call mb_make_call,mb_doc_target_deep,$(MAKE_ON_MSX_BIN)/nfbsshot.mf) +$(_XXX　　　　)$(call mb_make_call,mb_proj_grow_deps_phase_process,$(MAKE_ON_MSX_BIN)/nfbsshot.mf) $(MAKE_ON_MSX_BIN)/build.bat: $(MAKE_ON_MSX_SRC)/build.bat $(MAKE_ON_MSX_BIN)/nfbsshot.mf - $(call mb_make_call,mb_conv_unix2dos,$<,$@) -$(call mb_make_call,mb_doc_target_deep,$(MAKE_ON_MSX_BIN)/build.bat) -$(call mb_make_call,mb_proj_grow_deps_phase_process,$(MAKE_ON_MSX_BIN)/build.bat) +_$(_XXX　　　　)$(call mb_make_call,mb_conv_unix2dos,$<,$@) +$(_XXX　　　　)$(call mb_make_call,mb_doc_target_deep,$(MAKE_ON_MSX_BIN)/build.bat) +$(_XXX　　　　)$(call mb_make_call,mb_proj_grow_deps_phase_process,$(MAKE_ON_MSX_BIN)/build.bat) $(MAKE_ON_MSX_BIN)/nfbsshot.bin: $(MAKE_ON_MSX_BIN)/build.bat - $(call mb_make_call,mb_msxpipe_safe_cmd,$(MAKE_ON_MSX_BIN),build shutdown) -$(call mb_make_call,mb_doc_target_deep,$(MAKE_ON_MSX_BIN)/nfbsshot.bin) +_$(_XXX　　　　)$(call mb_make_call,mb_msxpipe_safe_cmd,$(MAKE_ON_MSX_BIN),build shutdown) +$(_XXX　　　　)$(call mb_make_call,mb_doc_target_deep,$(MAKE_ON_MSX_BIN)/nfbsshot.bin) $(MAKE_ON_MSX_BIN)/@build: $(MAKE_ON_MSX_BIN)/nfbsshot.bin -$(call mb_make_call,mb_doc_target,$(MAKE_ON_MSX_BIN)/@build,"Compiles binary with make on msx.") -$(call mb_make_call,mb_proj_grow_deps_phase_build,$(MAKE_ON_MSX_BIN)/@build) -$(call mb_make_call,mb_make_flag_phony,$(MAKE_ON_MSX_BIN)/@build) +$(_XXX　　　　)$(call mb_make_call,mb_doc_target,$(MAKE_ON_MSX_BIN)/@build,"Compiles binary with make on msx.") +$(_XXX　　　　)$(call mb_make_call,mb_proj_grow_deps_phase_build,$(MAKE_ON_MSX_BIN)/@build) +$(_XXX　　　　)$(call mb_make_call,mb_make_flag_phony,$(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)) -$(call mb_make_call,mb_doc_target_run,$(MAKE_ON_MSX_BIN)/@run,"Run the make build manually.") -$(call mb_make_call,mb_make_flag_phony,$(MAKE_ON_MSX_BIN)/@run) +_$(_XXX　　　　)$(call mb_make_call,mb_msxpipe_run_gui,$(MAKE_ON_MSX_BIN)) +$(_XXX　　　　)$(call mb_make_call,mb_doc_target_run,$(MAKE_ON_MSX_BIN)/@run,"Run the make build manually.") +$(_XXX　　　　)$(call mb_make_call,mb_make_flag_phony,$(MAKE_ON_MSX_BIN)/@run) $(call mb_make_call,mb_assert_flow_grep_binary,$(MAKE_ON_MSX_BIN),check-bin,nfbsshot.bin,screenshot) #$(MAKE_ON_MSX_BIN)/@assert-check-bin: $(MAKE_ON_MSX_BIN)/@build diff --git a/src/mbboot80/0module.mk b/src/mbboot80/0module.mk index c1d29b4..7828cfd 100644 --- a/src/mbboot80/0module.mk +++ b/src/mbboot80/0module.mk @@ -8,7 +8,7 @@ $(call mb_make_call,mb_assert_flow_bdos_grep,$(MBBOOT80_BIN),check-boot80,mbboot $(MBBOOT80_BIN)/@release-local: | $(MBBOOT80_BIN)/@build - $(call mb_make_call,mb_os_file_copy,$(MBBOOT80_BIN)/mbboot80.com,lib/emuctl/mbboot80.com) -$(call mb_make_call,mb_doc_target,$(MBBOOT80_BIN)/@release-local,"Updates binary copy in lib/emuctl folder.") -$(call mb_make_call,mb_make_flag_phony,$(MBBOOT80_BIN)/@release-local) +_$(_XXX　　　　)$(call mb_make_call,mb_os_file_copy,$(MBBOOT80_BIN)/mbboot80.com,lib/emuctl/mbboot80.com) +$(_XXX　　　　)$(call mb_make_call,mb_doc_target,$(MBBOOT80_BIN)/@release-local,"Updates binary copy in lib/emuctl folder.") +$(_XXX　　　　)$(call mb_make_call,mb_make_flag_phony,$(MBBOOT80_BIN)/@release-local)