diff --git a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_m80.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_macro80.mk similarity index 84% rename from lib/make/𓃬𓍄𓋹𓀭/mb_flow_m80.mk rename to lib/make/𓃬𓍄𓋹𓀭/mb_flow_macro80.mk index 88d497b..d17a775 100644 --- a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_m80.mk +++ b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_macro80.mk @@ -1,5 +1,10 @@ -define __mb_flow_m80_bdos_mono +# TODO: to create bin files use; +# l80 /P:C000,hello,hello/N/X/Y/E +# and +# hextobin hello.hex hello.bin + +define __mb_flow_macro80_bdos_mono .RECIPEPREFIX := $(MB_@RECIPE) $(1)/@@process-deps:: $(1)/$(3).mac @@ -28,12 +33,12 @@ $(MB_ᕽᕽᕽ   )$$(call mb_make_call,mb_proj_grow_deps_phase,@build,$(1) .RECIPEPREFIX := $(MB_@RECIPEPREFIX) endef -define mb_flow_m80_bdos_mono +define mb_flow_macro80_bdos_mono $(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_make_check_arg3,$(0),$(1),$(2),$(3)) $(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_flow_proj_setup,$(1),@init,$(1)) $(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_flow_proj_module_run,$(1)) $(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_flow_proj_prepare_packages,$(1),macro80 z80asmuk,utils) $(MB_ᕽᕽᕽ   )$(eval $(call mb_make_call,__$(0),$(1),$(2),$(3))) endef -$(call mb_make_call,mb_doc_function_flow,mb_flow_m80_bdos_mono,"Inject flow of m80 toolchain bdos mono file module."," ") +$(call mb_make_call,mb_doc_function_flow,mb_flow_macro80_bdos_mono,"Inject flow of m80 toolchain bdos mono file module."," ") diff --git a/lib/msxbuild.mk b/lib/msxbuild.mk index 2f3882f..3860717 100644 --- a/lib/msxbuild.mk +++ b/lib/msxbuild.mk @@ -57,7 +57,7 @@ $(eval $(call __mb_include,make/𓃬𓍄𓋹𓀭/mb_flow_0module.mk)) $(eval $(call __mb_include,make/𓃬𓍄𓋹𓀭/mb_flow_help.mk)) $(eval $(call __mb_include,make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk)) $(eval $(call __mb_include,make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk)) -$(eval $(call __mb_include,make/𓃬𓍄𓋹𓀭/mb_flow_m80.mk)) +$(eval $(call __mb_include,make/𓃬𓍄𓋹𓀭/mb_flow_macro80.mk)) $(eval $(call __mb_include,make/𓃬𓍄𓋹𓀭/mb_flow_sdcc.mk)) $(eval $(call __mb_include,make/𓃬𓍄𓋹𓀭/mb_flow_clone.mk)) @@include-libs:: $(MB_@INCLUDE_CHAIN) diff --git a/src/ahello-m80/0module.mk b/src/ahello-m80/0module.mk deleted file mode 100644 index 1698aa0..0000000 --- a/src/ahello-m80/0module.mk +++ /dev/null @@ -1,9 +0,0 @@ - -AHELLO_M80_SRC := $(call mb_make_call,mb_make_module_path_src,$(PATH_SRC)) -AHELLO_M80_BIN := $(call mb_make_call,mb_make_module_path_bin,$(PATH_SRC),$(PATH_BIN)) -AHELLO_M80_DEPS := $(AHELLO_M80_BIN)/ahello.com - -$(call mb_make_call,mb_flow_m80_bdos_mono,$(AHELLO_M80_BIN),$(AHELLO_M80_SRC),ahello) -$(call mb_make_call,mb_flow_assert_msxpipe_grep_test,$(AHELLO_M80_BIN),$(AHELLO_M80_DEPS),check-m80,ahello,M80) -$(call mb_make_call,mb_flow_assert_msxpipe_grep_test,$(AHELLO_M80_BIN),$(AHELLO_M80_DEPS),check-txt,ahello,"o world...") - diff --git a/src/ahello-sdcc/0module.mk b/src/ahello-sdcc/0module.mk deleted file mode 100644 index 287a0ec..0000000 --- a/src/ahello-sdcc/0module.mk +++ /dev/null @@ -1,9 +0,0 @@ - -AHELLO_SDCC_SRC := $(call mb_make_call,mb_make_module_path_src,$(PATH_SRC)) -AHELLO_SDCC_BIN := $(call mb_make_call,mb_make_module_path_bin,$(PATH_SRC),$(PATH_BIN)) -AHELLO_SDCC_DEPS := $(AHELLO_SDCC_BIN)/ahello.com - -$(call mb_make_call,mb_flow_sdcc_bdos_mono,$(AHELLO_SDCC_BIN),$(AHELLO_SDCC_SRC),ahello) -$(call mb_make_call,mb_flow_assert_msxpipe_grep_test,$(AHELLO_SDCC_BIN),$(AHELLO_SDCC_DEPS),check-sdcc,ahello,SDCC) -$(call mb_make_call,mb_flow_assert_msxpipe_grep_test,$(AHELLO_SDCC_BIN),$(AHELLO_SDCC_DEPS),check-hell,ahello,Hell) - diff --git a/src/assert/msxhub/0module.mk b/src/assert/msxhub/0module.mk new file mode 100644 index 0000000..300d236 --- /dev/null +++ b/src/assert/msxhub/0module.mk @@ -0,0 +1,55 @@ + +ASSERT_MSXHUB_SRC := $(call mb_make_call,mb_make_module_path_src,$(PATH_SRC)) +ASSERT_MSXHUB_BIN := $(call mb_make_call,mb_make_module_path_bin,$(PATH_SRC),$(PATH_BIN)) + +ASSERT_MSXHUB_MACHINE ?= Boosted_MSX2+_JP +$(call mb_make_call,mb_doc_variable,ASSERT_MSXHUB_MACHINE,"The machine to run the msxhub module on.") + + +$(ASSERT_MSXHUB_BIN): | @init +_$(MB_ᕽᕽᕽ  )$(if $(wildcard $(ASSERT_MSXHUB_BIN)),,$(call mb_make_call,mb_os_dir_create,$(ASSERT_MSXHUB_BIN))) +_$(MB_ᕽᕽᕽ  )$(if $(wildcard $(ASSERT_MSXHUB_BIN)/utils),,$(call mb_make_call,mb_os_dir_create,$(ASSERT_MSXHUB_BIN)/utils)) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_msxdos2_utils,$(ASSERT_MSXHUB_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_nextor_utils,$(ASSERT_MSXHUB_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_macro80,$(ASSERT_MSXHUB_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_z80asmuk,$(ASSERT_MSXHUB_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_wbass2,$(ASSERT_MSXHUB_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_konpass,$(ASSERT_MSXHUB_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_pmarc,$(ASSERT_MSXHUB_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_lhpack,$(ASSERT_MSXHUB_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_lhext,$(ASSERT_MSXHUB_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_gunzip,$(ASSERT_MSXHUB_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_tunzip,$(ASSERT_MSXHUB_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_popcom,$(ASSERT_MSXHUB_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_make,$(ASSERT_MSXHUB_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_adir,$(ASSERT_MSXHUB_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_turbo,$(ASSERT_MSXHUB_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_baskom,$(ASSERT_MSXHUB_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_binldr,$(ASSERT_MSXHUB_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_dmphex,$(ASSERT_MSXHUB_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_zd,$(ASSERT_MSXHUB_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_msxdos2t,$(ASSERT_MSXHUB_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_gfxage,$(ASSERT_MSXHUB_BIN)/utils) + + +$(ASSERT_MSXHUB_BIN)/@run: | $(ASSERT_MSXHUB_BIN) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxpipe_run_gui,$(ASSERT_MSXHUB_BIN),,$(ASSERT_MSXHUB_MACHINE)) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target_run,$(ASSERT_MSXHUB_BIN)/@run,"Run the dist with all msxhub packages.") +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_make_target_phony,$(ASSERT_MSXHUB_BIN)/@run) + + +$(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_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)) +_$(MB_ᕽᕽᕽ  )grep -q "KONPASS COM" $(ASSERT_MSXHUB_BIN)/utils.out +_$(MB_ᕽᕽᕽ  )grep -q "MAKE COM" $(ASSERT_MSXHUB_BIN)/utils.out +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_echo_assert,$(MB_I18N_ASSERT_SUCCESS) $(ASSERT_MSXHUB_BIN)/@assert) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target,$(ASSERT_MSXHUB_BIN)/@assert,"Asserts that all dist artifacts execute results.") +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_proj_grow_deps_phase,@test,$(ASSERT_MSXHUB_BIN)/@assert) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_make_target_phony,$(ASSERT_MSXHUB_BIN)/@assert) + diff --git a/src/dist-qa-dos1/0module.mk b/src/dist-qa-dos1/0module.mk deleted file mode 100644 index b82dc1f..0000000 --- a/src/dist-qa-dos1/0module.mk +++ /dev/null @@ -1,19 +0,0 @@ - -DIST_QA_DOS1_SRC := $(call mb_make_call,mb_make_module_path_src,$(PATH_SRC)) -DIST_QA_DOS1_BIN := $(call mb_make_call,mb_make_module_path_bin,$(PATH_SRC),$(PATH_BIN)) - - -$(call mb_make_call,mb_flow_clone_deps,$(DIST_QA_DOS1_BIN),$(DIST_BIN),$(DIST_DEPS),msxdos1_boot) - - -$(DIST_QA_DOS1_BIN)/@assert: $(DIST_QA_DOS1_BIN)/@build -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_write_default,$(DIST_QA_DOS1_BIN)) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(DIST_QA_DOS1_BIN),ahello1) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(DIST_QA_DOS1_BIN),ahello2) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_append_exit,$(DIST_QA_DOS1_BIN)) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_openmsx_dosctl,$(DIST_QA_DOS1_BIN)) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_echo_assert,$(MB_I18N_ASSERT_SUCCESS) $(DIST_QA_DOS1_BIN)/@assert) -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target,$(DIST_QA_DOS1_BIN)/@assert,"Assert binaries on msxdos1.") -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_proj_grow_deps_phase,@package-qa,$(DIST_QA_DOS1_BIN)/@assert) -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_make_target_phony,$(DIST_QA_DOS1_BIN)/@assert) - diff --git a/src/dist-qa-dos2/0module.mk b/src/dist-qa-dos2/0module.mk deleted file mode 100644 index c19acae..0000000 --- a/src/dist-qa-dos2/0module.mk +++ /dev/null @@ -1,23 +0,0 @@ - -DIST_QA_DOS2_SRC := $(call mb_make_call,mb_make_module_path_src,$(PATH_SRC)) -DIST_QA_DOS2_BIN := $(call mb_make_call,mb_make_module_path_bin,$(PATH_SRC),$(PATH_BIN)) - - -$(call mb_make_call,mb_flow_clone_deps,$(DIST_QA_DOS2_BIN),$(DIST_BIN),$(DIST_DEPS),msxdos2_boot) - - -$(DIST_QA_DOS2_BIN)/@assert: $(DIST_QA_DOS2_BIN)/@build -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_file_delete,$(DIST_QA_DOS2_BIN)/ahello1.out) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_file_delete,$(DIST_QA_DOS2_BIN)/ahello2.out) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_write_default,$(DIST_QA_DOS2_BIN)) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(DIST_QA_DOS2_BIN),ahello1 > ahello1.out) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(DIST_QA_DOS2_BIN),ahello2 > ahello2.out) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_append_exit,$(DIST_QA_DOS2_BIN)) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_openmsx_dosctl,$(DIST_QA_DOS2_BIN)) -_$(MB_ᕽᕽᕽ  )grep -q "M80: Hello world..." $(DIST_QA_DOS2_BIN)/ahello1.out -_$(MB_ᕽᕽᕽ  )grep -q "SDCC: Hello world..." $(DIST_QA_DOS2_BIN)/ahello2.out -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_echo_assert,$(MB_I18N_ASSERT_SUCCESS) $(DIST_QA_DOS2_BIN)/@assert) -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target,$(DIST_QA_DOS2_BIN)/@assert,"Assert binaries on msxdos2.") -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_proj_grow_deps_phase,@package-qa,$(DIST_QA_DOS2_BIN)/@assert) -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_make_target_phony,$(DIST_QA_DOS2_BIN)/@assert) - diff --git a/src/dist-qa-msx1/0module.mk b/src/dist-qa-msx1/0module.mk deleted file mode 100644 index 09ebcde..0000000 --- a/src/dist-qa-msx1/0module.mk +++ /dev/null @@ -1,26 +0,0 @@ - -DIST_QA_MSX1_SRC := $(call mb_make_call,mb_make_module_path_src,$(PATH_SRC)) -DIST_QA_MSX1_BIN := $(call mb_make_call,mb_make_module_path_bin,$(PATH_SRC),$(PATH_BIN)) -#DIST_QA_MSX1_DEPS := $(call mb_make_call,mb_make_module_local_deps,$(DIST_QA_MSX1_BIN),$(DIST_DEPS)) - -DIST_QA_MSX1_MACHINE ?= Canon_V-20 -$(call mb_make_call,mb_doc_variable,DIST_QA_MSX1_MACHINE,"The machine to run the msx1 qa module on.") - - -$(call mb_make_call,mb_flow_clone_deps,$(DIST_QA_MSX1_BIN),$(DIST_BIN),$(DIST_DEPS),,$(DIST_QA_MSX1_MACHINE)) - -$(DIST_QA_MSX1_BIN)/@assert: $(DIST_QA_MSX1_BIN)/@build -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSX1_BIN)/ahello1.out) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSX1_BIN)/ahello2.out) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_write_default,$(DIST_QA_MSX1_BIN),40) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(DIST_QA_MSX1_BIN),ahello1 > ahello1.out,33) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(DIST_QA_MSX1_BIN),ahello2 > ahello2.out,66,99) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_append_exit,$(DIST_QA_MSX1_BIN)) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_openmsx_dosctl,$(DIST_QA_MSX1_BIN),$(DIST_QA_MSX1_MACHINE)) -_$(MB_ᕽᕽᕽ  )grep -q "M80: Hello world..." $(DIST_QA_MSX1_BIN)/ahello1.out -_$(MB_ᕽᕽᕽ  )grep -q "SDCC: Hello world..." $(DIST_QA_MSX1_BIN)/ahello2.out -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_echo_assert,$(MB_I18N_ASSERT_SUCCESS) $(DIST_QA_MSX1_BIN)/@assert) -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target,$(DIST_QA_MSX1_BIN)/@assert,"Assert binaries on MSX1 machine.") -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_proj_grow_deps_phase,@package-qa,$(DIST_QA_MSX1_BIN)/@assert) -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_make_target_phony,$(DIST_QA_MSX1_BIN)/@assert) - diff --git a/src/dist-qa-msxhub/0module.mk b/src/dist-qa-msxhub/0module.mk deleted file mode 100644 index f43959c..0000000 --- a/src/dist-qa-msxhub/0module.mk +++ /dev/null @@ -1,64 +0,0 @@ - -DIST_QA_MSXHUB_SRC := $(call mb_make_call,mb_make_module_path_src,$(PATH_SRC)) -DIST_QA_MSXHUB_BIN := $(call mb_make_call,mb_make_module_path_bin,$(PATH_SRC),$(PATH_BIN)) -DIST_QA_MSXHUB_DEPS := $(call mb_make_call,mb_make_module_local_deps,$(DIST_QA_MSXHUB_BIN),$(DIST_DEPS)) - -DIST_QA_MSXHUB_MACHINE ?= Boosted_MSX2+_JP -$(call mb_make_call,mb_doc_variable,DIST_QA_MSXHUB_MACHINE,"The machine to run the msxhub module on.") - - -$(DIST_QA_MSXHUB_BIN): | @init -_$(MB_ᕽᕽᕽ  )$(if $(wildcard $(DIST_QA_MSXHUB_BIN)),,$(call mb_make_call,mb_os_dir_create,$(DIST_QA_MSXHUB_BIN))) -_$(MB_ᕽᕽᕽ  )$(if $(wildcard $(DIST_QA_MSXHUB_BIN)/utils),,$(call mb_make_call,mb_os_dir_create,$(DIST_QA_MSXHUB_BIN)/utils)) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_msxdos2_utils,$(DIST_QA_MSXHUB_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_nextor_utils,$(DIST_QA_MSXHUB_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_macro80,$(DIST_QA_MSXHUB_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_z80asmuk,$(DIST_QA_MSXHUB_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_wbass2,$(DIST_QA_MSXHUB_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_konpass,$(DIST_QA_MSXHUB_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_pmarc,$(DIST_QA_MSXHUB_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_lhpack,$(DIST_QA_MSXHUB_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_lhext,$(DIST_QA_MSXHUB_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_gunzip,$(DIST_QA_MSXHUB_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_tunzip,$(DIST_QA_MSXHUB_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_popcom,$(DIST_QA_MSXHUB_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_make,$(DIST_QA_MSXHUB_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_adir,$(DIST_QA_MSXHUB_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_turbo,$(DIST_QA_MSXHUB_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_baskom,$(DIST_QA_MSXHUB_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_binldr,$(DIST_QA_MSXHUB_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_dmphex,$(DIST_QA_MSXHUB_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_zd,$(DIST_QA_MSXHUB_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_msxdos2t,$(DIST_QA_MSXHUB_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(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) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_file_copy,$<,$@) - - -$(DIST_QA_MSXHUB_BIN)/@run: | $(DIST_QA_MSXHUB_DEPS) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxpipe_run_gui,$(DIST_QA_MSXHUB_BIN),,$(DIST_QA_MSXHUB_MACHINE)) -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target_run,$(DIST_QA_MSXHUB_BIN)/@run,"Run the dist with all msxhub packages.") -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_make_target_phony,$(DIST_QA_MSXHUB_BIN)/@run) - - -$(DIST_QA_MSXHUB_BIN)/@assert: | $(DIST_QA_MSXHUB_DEPS) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSXHUB_BIN)/ahello1.out) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSXHUB_BIN)/ahello2.out) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSXHUB_BIN)/utils.out) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_write_default,$(DIST_QA_MSXHUB_BIN)) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(DIST_QA_MSXHUB_BIN),ahello1 > ahello1.out) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(DIST_QA_MSXHUB_BIN),ahello2 > ahello2.out) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(DIST_QA_MSXHUB_BIN),dir utils > utils.out) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_append_exit,$(DIST_QA_MSXHUB_BIN)) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_openmsx_dosctl,$(DIST_QA_MSXHUB_BIN),$(DIST_QA_MSXHUB_MACHINE)) -_$(MB_ᕽᕽᕽ  )grep -q "M80: Hello world..." $(DIST_QA_MSXHUB_BIN)/ahello1.out -_$(MB_ᕽᕽᕽ  )grep -q "SDCC: Hello world..." $(DIST_QA_MSXHUB_BIN)/ahello2.out -_$(MB_ᕽᕽᕽ  )grep -q "KONPASS COM" $(DIST_QA_MSXHUB_BIN)/utils.out -_$(MB_ᕽᕽᕽ  )grep -q "MAKE COM" $(DIST_QA_MSXHUB_BIN)/utils.out -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_echo_assert,$(MB_I18N_ASSERT_SUCCESS) $(DIST_QA_MSXHUB_BIN)/@assert) -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target,$(DIST_QA_MSXHUB_BIN)/@assert,"Asserts that all dist artifacts execute results.") -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_proj_grow_deps_phase,@package-qa,$(DIST_QA_MSXHUB_BIN)/@assert) -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_make_target_phony,$(DIST_QA_MSXHUB_BIN)/@assert) - diff --git a/src/dist/0module.mk b/src/dist/0module.mk deleted file mode 100644 index 120227f..0000000 --- a/src/dist/0module.mk +++ /dev/null @@ -1,29 +0,0 @@ - -DIST_MOD := dist -DIST_SRC := $(PATH_SRC)/$(DIST_MOD) -DIST_BIN := $(PATH_BIN)/$(DIST_MOD) -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 -_$(MB_ᕽᕽᕽ  )$(if $(wildcard $(DIST_BIN)),,$(call mb_make_call,mb_os_dir_create,$(DIST_BIN))) - -$(DIST_BIN)/readme.txt: $(DIST_SRC)/readme.txt | $(DIST_BIN) -_$(MB_ᕽᕽᕽ  )$(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) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_file_copy,$<,$@) - -$(DIST_BIN)/ahello2.com: bin/ahello-sdcc/ahello.com | $(DIST_BIN) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_file_copy,$<,$@) - -$(DIST_BIN)/@prepare: | $(DIST_DEPS) -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target,$(DIST_BIN)/@prepare,"Prepare folder with binaries for distribution.") -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_make_target_phony,$(DIST_BIN)/@prepare) - -$(DIST_OUT): | $(DIST_BIN)/@prepare -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_package_create_archive,$(DIST_BIN),$@) -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target,$(DIST_OUT),"Build archive distribution artifact.") -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_proj_grow_deps_phase,@package,$(DIST_OUT)) - diff --git a/src/example/dist-hello-qa-dos1/0module.mk b/src/example/dist-hello-qa-dos1/0module.mk new file mode 100644 index 0000000..eff178b --- /dev/null +++ b/src/example/dist-hello-qa-dos1/0module.mk @@ -0,0 +1,20 @@ + +EXAMPLE_DIST_HELLO_QA_DOS1_SRC := $(call mb_make_call,mb_make_module_path_src,$(PATH_SRC)) +EXAMPLE_DIST_HELLO_QA_DOS1_BIN := $(call mb_make_call,mb_make_module_path_bin,$(PATH_SRC),$(PATH_BIN)) + + +$(call mb_make_call,mb_flow_clone_deps,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN),$(EXAMPLE_DIST_HELLO_BIN),$(EXAMPLE_DIST_HELLO_DEPS),msxdos1_boot) + + +$(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_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) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_append_exit,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_openmsx_dosctl,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_echo_assert,$(MB_I18N_ASSERT_SUCCESS) $(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert,"Assert binaries on msxdos1.") +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_proj_grow_deps_phase,@package-qa,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_make_target_phony,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert) + diff --git a/src/example/dist-hello-qa-dos2/0module.mk b/src/example/dist-hello-qa-dos2/0module.mk new file mode 100644 index 0000000..687ed17 --- /dev/null +++ b/src/example/dist-hello-qa-dos2/0module.mk @@ -0,0 +1,25 @@ + +EXAMPLE_DIST_HELLO_QA_DOS2_SRC := $(call mb_make_call,mb_make_module_path_src,$(PATH_SRC)) +EXAMPLE_DIST_HELLO_QA_DOS2_BIN := $(call mb_make_call,mb_make_module_path_bin,$(PATH_SRC),$(PATH_BIN)) + + +$(call mb_make_call,mb_flow_clone_deps,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN),$(EXAMPLE_DIST_HELLO_BIN),$(EXAMPLE_DIST_HELLO_DEPS),msxdos2_boot) + + +$(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_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) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_append_exit,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_openmsx_dosctl,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)) +_$(MB_ᕽᕽᕽ  )grep -q "M80: Hello MSX" $(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/hello1.out +_$(MB_ᕽᕽᕽ  )grep -q "SDCC: Hello MSX" $(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/hello2.out +_$(MB_ᕽᕽᕽ  )grep -q "MAKE: Hello MSX" $(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/hello3.out +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_echo_assert,$(MB_I18N_ASSERT_SUCCESS) $(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert,"Assert binaries on msxdos2.") +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_proj_grow_deps_phase,@package-qa,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_make_target_phony,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert) + diff --git a/src/example/dist-hello-qa-msx1/0module.mk b/src/example/dist-hello-qa-msx1/0module.mk new file mode 100644 index 0000000..e7614c6 --- /dev/null +++ b/src/example/dist-hello-qa-msx1/0module.mk @@ -0,0 +1,28 @@ + +EXAMPLE_DIST_HELLO_QA_MSX1_SRC := $(call mb_make_call,mb_make_module_path_src,$(PATH_SRC)) +EXAMPLE_DIST_HELLO_QA_MSX1_BIN := $(call mb_make_call,mb_make_module_path_bin,$(PATH_SRC),$(PATH_BIN)) + +EXAMPLE_DIST_HELLO_QA_MSX1_MACHINE ?= Canon_V-20 +$(call mb_make_call,mb_doc_variable,EXAMPLE_DIST_HELLO_QA_MSX1_MACHINE,"The machine to run the msx1 qa module on.") + + +$(call mb_make_call,mb_flow_clone_deps,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),$(EXAMPLE_DIST_HELLO_BIN),$(EXAMPLE_DIST_HELLO_DEPS),,$(EXAMPLE_DIST_HELLO_QA_MSX1_MACHINE)) + + +$(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_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) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_append_exit,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_openmsx_dosctl,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),$(EXAMPLE_DIST_HELLO_QA_MSX1_MACHINE)) +_$(MB_ᕽᕽᕽ  )grep -q "M80: Hello MSX" $(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/hello1.out +_$(MB_ᕽᕽᕽ  )grep -q "SDCC: Hello MSX" $(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/hello2.out +_$(MB_ᕽᕽᕽ  )grep -q "MAKE: Hello MSX" $(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/hello3.out +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_echo_assert,$(MB_I18N_ASSERT_SUCCESS) $(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert,"Assert binaries on MSX1 machine.") +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_proj_grow_deps_phase,@package-qa,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_make_target_phony,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert) + diff --git a/src/example/dist-hello/0module.mk b/src/example/dist-hello/0module.mk new file mode 100644 index 0000000..2bb31d0 --- /dev/null +++ b/src/example/dist-hello/0module.mk @@ -0,0 +1,34 @@ + +EXAMPLE_DIST_HELLO_SRC := $(call mb_make_call,mb_make_module_path_src,$(PATH_SRC)) +EXAMPLE_DIST_HELLO_BIN := $(call mb_make_call,mb_make_module_path_bin,$(PATH_SRC),$(PATH_BIN)) +EXAMPLE_DIST_HELLO_OUT := $(PATH_BIN)/dist-hello.tar.gz +EXAMPLE_DIST_HELLO_DEPS := $(EXAMPLE_DIST_HELLO_BIN)/readme.txt \ + $(EXAMPLE_DIST_HELLO_BIN)/hello1.com \ + $(EXAMPLE_DIST_HELLO_BIN)/hello2.com \ + $(EXAMPLE_DIST_HELLO_BIN)/hello3.com \ + +$(EXAMPLE_DIST_HELLO_BIN): | @init +_$(MB_ᕽᕽᕽ  )$(if $(wildcard $(EXAMPLE_DIST_HELLO_BIN)),,$(call mb_make_call,mb_os_dir_create,$(EXAMPLE_DIST_HELLO_BIN))) + +$(EXAMPLE_DIST_HELLO_BIN)/readme.txt: $(EXAMPLE_DIST_HELLO_SRC)/readme.txt | $(EXAMPLE_DIST_HELLO_BIN) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_conv_unix2dos,$<,$@) +$(call mb_make_call,mb_proj_grow_deps_phase,@process,$(EXAMPLE_DIST_HELLO_BIN)/readme.txt) + +$(EXAMPLE_DIST_HELLO_BIN)/hello1.com: bin/example/hello-macro80/hello.com | $(EXAMPLE_DIST_HELLO_BIN) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_file_copy,$<,$@) + +$(EXAMPLE_DIST_HELLO_BIN)/hello2.com: bin/example/hello-sdcc-asm/hello.com | $(EXAMPLE_DIST_HELLO_BIN) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_file_copy,$<,$@) + +$(EXAMPLE_DIST_HELLO_BIN)/hello3.com: bin/example/hello-make4msx/hello.com | $(EXAMPLE_DIST_HELLO_BIN) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_os_file_copy,$<,$@) + +$(EXAMPLE_DIST_HELLO_BIN)/@prepare: | $(EXAMPLE_DIST_HELLO_DEPS) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target,$(EXAMPLE_DIST_HELLO_BIN)/@prepare,"Prepare folder with binaries for distribution.") +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_make_target_phony,$(EXAMPLE_DIST_HELLO_BIN)/@prepare) + +$(EXAMPLE_DIST_HELLO_OUT): | $(EXAMPLE_DIST_HELLO_BIN)/@prepare +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_package_create_archive,$(EXAMPLE_DIST_HELLO_BIN),$@) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target,$(EXAMPLE_DIST_HELLO_OUT),"Build archive distribution artifact.") +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_proj_grow_deps_phase,@package,$(EXAMPLE_DIST_HELLO_OUT)) + diff --git a/src/dist/readme.txt b/src/example/dist-hello/readme.txt similarity index 100% rename from src/dist/readme.txt rename to src/example/dist-hello/readme.txt diff --git a/src/example/hello-macro80/0module.mk b/src/example/hello-macro80/0module.mk new file mode 100644 index 0000000..a6ffb6d --- /dev/null +++ b/src/example/hello-macro80/0module.mk @@ -0,0 +1,9 @@ + +EXAMPLE_HELLO_MACRO80_SRC := $(call mb_make_call,mb_make_module_path_src,$(PATH_SRC)) +EXAMPLE_HELLO_MACRO80_BIN := $(call mb_make_call,mb_make_module_path_bin,$(PATH_SRC),$(PATH_BIN)) +EXAMPLE_HELLO_MACRO80_DEPS := $(EXAMPLE_HELLO_MACRO80_BIN)/hello.com + +$(call mb_make_call,mb_flow_macro80_bdos_mono,$(EXAMPLE_HELLO_MACRO80_BIN),$(EXAMPLE_HELLO_MACRO80_SRC),hello) +$(call mb_make_call,mb_flow_assert_msxpipe_grep_test,$(EXAMPLE_HELLO_MACRO80_BIN),$(EXAMPLE_HELLO_MACRO80_DEPS),check-m80,hello,M80) +$(call mb_make_call,mb_flow_assert_msxpipe_grep_test,$(EXAMPLE_HELLO_MACRO80_BIN),$(EXAMPLE_HELLO_MACRO80_DEPS),check-txt,hello,"o MSX world...") + diff --git a/src/ahello-m80/ahello.mac b/src/example/hello-macro80/hello.mac similarity index 82% rename from src/ahello-m80/ahello.mac rename to src/example/hello-macro80/hello.mac index 4e477c7..6106b33 100644 --- a/src/ahello-m80/ahello.mac +++ b/src/example/hello-macro80/hello.mac @@ -14,7 +14,7 @@ MAIN: RET TXT_HELLO: - DB "M80: Hello world...$" + DB "M80: Hello MSX world...@ASM$" END DSEG diff --git a/src/example/hello-make4msx/0module.mk b/src/example/hello-make4msx/0module.mk new file mode 100644 index 0000000..70262e1 --- /dev/null +++ b/src/example/hello-make4msx/0module.mk @@ -0,0 +1,51 @@ + +EXAMPLE_HELLO_MAKE4MSX_SRC := $(call mb_make_call,mb_make_module_path_src,$(PATH_SRC)) +EXAMPLE_HELLO_MAKE4MSX_BIN := $(call mb_make_call,mb_make_module_path_bin,$(PATH_SRC),$(PATH_BIN)) + + +$(EXAMPLE_HELLO_MAKE4MSX_BIN): | @init +_$(MB_ᕽᕽᕽ  )$(if $(wildcard $(EXAMPLE_HELLO_MAKE4MSX_BIN)),,$(call mb_make_call,mb_os_dir_create,$(EXAMPLE_HELLO_MAKE4MSX_BIN))) +_$(MB_ᕽᕽᕽ  )$(if $(wildcard $(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils),,$(call mb_make_call,mb_os_dir_create,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils)) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_make,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_macro80,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_z80asmuk,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target_deep,$(EXAMPLE_HELLO_MAKE4MSX_BIN)) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_make_target_phony,$(EXAMPLE_HELLO_MAKE4MSX_BIN)) + + +$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.mac: $(EXAMPLE_HELLO_MAKE4MSX_SRC)/hello.mac | $(EXAMPLE_HELLO_MAKE4MSX_BIN) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_conv_unix2dos,$<,$@) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target_deep,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.mac) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_proj_grow_deps_phase,@process,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.mac) + + +$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.mf: $(EXAMPLE_HELLO_MAKE4MSX_SRC)/hello.mf $(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.mac +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_conv_unix2dos,$<,$@) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target_deep,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.mf) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_proj_grow_deps_phase,@process,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.mf) + + +$(EXAMPLE_HELLO_MAKE4MSX_BIN)/build.bat: $(EXAMPLE_HELLO_MAKE4MSX_SRC)/build.bat $(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.mf +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_conv_unix2dos,$<,$@) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target_deep,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/build.bat) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_proj_grow_deps_phase,@process,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/build.bat) + + +$(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_doc_target_deep,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.com) + + +$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build: $(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.com +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build,"Compiles binary with make on msx.") +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_proj_grow_deps_phase,@build,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_make_target_phony,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build) + + +$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@run: $(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxpipe_run_gui,$(EXAMPLE_HELLO_MAKE4MSX_BIN)) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target_run,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@run,"Run the make build manually.") +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_make_target_phony,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@run) + +$(call mb_make_call,mb_flow_assert_grep_binary_test,$(EXAMPLE_HELLO_MAKE4MSX_BIN),check-bin,hello.com,MAKE) + diff --git a/src/make-on-msx/build.bat b/src/example/hello-make4msx/build.bat similarity index 69% rename from src/make-on-msx/build.bat rename to src/example/hello-make4msx/build.bat index c9eb234..2bc6bca 100644 --- a/src/make-on-msx/build.bat +++ b/src/example/hello-make4msx/build.bat @@ -2,21 +2,21 @@ echo === Trigger workaround rem Fixme make will not build without targets files rem Fixme make will not build without updated time stamps dir -copy /T build.bat NFBSSHOT.BIN +copy /T build.bat HELLO.COM dir/w utils -copy /T build.bat NFBSSHOT.HEX +copy /T build.bat HELLO.HEX dir/w utils -copy /T build.bat NFBSSHOT.REL +copy /T build.bat HELLO.REL dir/w utils -copy /T NFBSSHOT.MAC NFBSSHOT.BAK +copy /T HELLO.MAC HELLO.BAK dir/w utils -copy /T NFBSSHOT.BAK NFBSSHOT.MAC +copy /T HELLO.BAK HELLO.MAC echo === Running make omsxctl fail_after 300 seconds err_make 1 -echo "dir" > build1.bat -make NFBSSHOT.MF /x > build2.bat +echo "echo --- build init" > build1.bat +make HELLO.MF /x > build2.bat echo === Concat shutdown -echo "dir" > build3.bat +echo "echo --- build shutdown" > build3.bat IFF "shutdown" == %1 SET lastcmd=shutdown ELSE diff --git a/src/example/hello-make4msx/hello.mac b/src/example/hello-make4msx/hello.mac new file mode 100644 index 0000000..e22c432 --- /dev/null +++ b/src/example/hello-make4msx/hello.mac @@ -0,0 +1,20 @@ + title M80 MAKE Hello world +.Z80 + +WRITESTR EQU 9h +BDOS EQU 5h + +ASEG +ORG 0100H + +MAIN: + LD C,WRITESTR + LD DE,TXT_HELLO + CALL BDOS + RET + w +TXT_HELLO: + DB "MAKE: Hello MSX world...@ASM$" + +END +DSEG diff --git a/src/example/hello-make4msx/hello.mf b/src/example/hello-make4msx/hello.mf new file mode 100644 index 0000000..e4327e3 --- /dev/null +++ b/src/example/hello-make4msx/hello.mf @@ -0,0 +1,14 @@ +# Makefile to run on MSX + +hello.rel: hello.mac + echo Making hello.rel + m80 =hello/Z + +hello.hex: hello.rel + echo Making hello.hex + l80 hello,hello/N/X/Y/E + +hello.com: hello.hex + echo Making hello.com + hextocom hello + diff --git a/src/example/hello-sdcc-asm/0module.mk b/src/example/hello-sdcc-asm/0module.mk new file mode 100644 index 0000000..93f8d72 --- /dev/null +++ b/src/example/hello-sdcc-asm/0module.mk @@ -0,0 +1,9 @@ + +EXAMPLE_HELLO_SDCC_ASM_SRC := $(call mb_make_call,mb_make_module_path_src,$(PATH_SRC)) +EXAMPLE_HELLO_SDCC_ASM_BIN := $(call mb_make_call,mb_make_module_path_bin,$(PATH_SRC),$(PATH_BIN)) +EXAMPLE_HELLO_SDCC_ASM_DEPS := $(EXAMPLE_HELLO_SDCC_ASM_BIN)/hello.com + +$(call mb_make_call,mb_flow_sdcc_bdos_mono,$(EXAMPLE_HELLO_SDCC_ASM_BIN),$(EXAMPLE_HELLO_SDCC_ASM_SRC),hello) +$(call mb_make_call,mb_flow_assert_msxpipe_grep_test,$(EXAMPLE_HELLO_SDCC_ASM_BIN),$(EXAMPLE_HELLO_SDCC_ASM_DEPS),check-sdcc,hello,SDCC) +$(call mb_make_call,mb_flow_assert_msxpipe_grep_test,$(EXAMPLE_HELLO_SDCC_ASM_BIN),$(EXAMPLE_HELLO_SDCC_ASM_DEPS),check-hell,hello,Hell) + diff --git a/src/ahello-sdcc/ahello.asm b/src/example/hello-sdcc-asm/hello.asm similarity index 90% rename from src/ahello-sdcc/ahello.asm rename to src/example/hello-sdcc-asm/hello.asm index 5a36e8b..d224f0f 100644 --- a/src/ahello-sdcc/ahello.asm +++ b/src/example/hello-sdcc-asm/hello.asm @@ -31,11 +31,11 @@ PUT_TXT: JR PUT_TXT TXT_HELLO: - .str "SDCC: Hello world..." + .str "SDCC: Hello MSX world..." .db 0x1D TXT_HELLO_SRC: - .str "from asm." + .str "@ASM." .db 0x0D,0x0A .db 0x1D diff --git a/src/make-on-msx/0module.mk b/src/make-on-msx/0module.mk deleted file mode 100644 index 586bf60..0000000 --- a/src/make-on-msx/0module.mk +++ /dev/null @@ -1,51 +0,0 @@ - -MAKE_ON_MSX_SRC := $(call mb_make_call,mb_make_module_path_src,$(PATH_SRC)) -MAKE_ON_MSX_BIN := $(call mb_make_call,mb_make_module_path_bin,$(PATH_SRC),$(PATH_BIN)) - - -$(MAKE_ON_MSX_BIN): | @init -_$(MB_ᕽᕽᕽ  )$(if $(wildcard $(MAKE_ON_MSX_BIN)),,$(call mb_make_call,mb_os_dir_create,$(MAKE_ON_MSX_BIN))) -_$(MB_ᕽᕽᕽ  )$(if $(wildcard $(MAKE_ON_MSX_BIN)/utils),,$(call mb_make_call,mb_os_dir_create,$(MAKE_ON_MSX_BIN)/utils)) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_make,$(MAKE_ON_MSX_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_macro80,$(MAKE_ON_MSX_BIN)/utils) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxhub_get_z80asmuk,$(MAKE_ON_MSX_BIN)/utils) -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target_deep,$(MAKE_ON_MSX_BIN)) -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_make_target_phony,$(MAKE_ON_MSX_BIN)) - - -$(MAKE_ON_MSX_BIN)/nfbsshot.mac: $(MAKE_ON_MSX_SRC)/nfbsshot.mac | $(MAKE_ON_MSX_BIN) -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_conv_unix2dos,$<,$@) -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target_deep,$(MAKE_ON_MSX_BIN)/nfbsshot.mac) -$(MB_ᕽᕽᕽ   )$(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 -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_conv_unix2dos,$<,$@) -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target_deep,$(MAKE_ON_MSX_BIN)/nfbsshot.mf) -$(MB_ᕽᕽᕽ   )$(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 -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_conv_unix2dos,$<,$@) -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target_deep,$(MAKE_ON_MSX_BIN)/build.bat) -$(MB_ᕽᕽᕽ   )$(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 -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxpipe_safe_cmd,$(MAKE_ON_MSX_BIN),build shutdown) -$(MB_ᕽᕽᕽ   )$(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 -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target,$(MAKE_ON_MSX_BIN)/@build,"Compiles binary with make on msx.") -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_proj_grow_deps_phase,@build,$(MAKE_ON_MSX_BIN)/@build) -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_make_target_phony,$(MAKE_ON_MSX_BIN)/@build) - - -$(MAKE_ON_MSX_BIN)/@run: $(MAKE_ON_MSX_BIN)/@build -_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_msxpipe_run_gui,$(MAKE_ON_MSX_BIN)) -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target_run,$(MAKE_ON_MSX_BIN)/@run,"Run the make build manually.") -$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_make_target_phony,$(MAKE_ON_MSX_BIN)/@run) - -$(call mb_make_call,mb_flow_assert_grep_binary_test,$(MAKE_ON_MSX_BIN),check-bin,nfbsshot.bin,screenshot) - diff --git a/src/make-on-msx/nfbsshot.mac b/src/make-on-msx/nfbsshot.mac deleted file mode 100644 index d0f7af3..0000000 --- a/src/make-on-msx/nfbsshot.mac +++ /dev/null @@ -1,23 +0,0 @@ - title Night Flight Basic Screen SHOT -.Z80 - -DEBUG_PORT EQU 2Dh - -ASEG -ORG X'C000' - -MAIN: - LD HL,COMMAND_TXT - LD DE,COMMAND_BUFF - LD BC,0 - OUT (DEBUG_PORT),A - RET - -COMMAND_TXT: - DB "night_flight_save_screenshot$" - -COMMAND_BUFF: - DS 100 - -END -DSEG diff --git a/src/make-on-msx/nfbsshot.mf b/src/make-on-msx/nfbsshot.mf deleted file mode 100644 index c574aea..0000000 --- a/src/make-on-msx/nfbsshot.mf +++ /dev/null @@ -1,14 +0,0 @@ -# Makefile to run on MSX - -nfbsshot.rel: nfbsshot.mac - echo Making nfbsshot.rel - m80 =nfbsshot/Z - -nfbsshot.hex: nfbsshot.rel - echo Making nfbsshot.hex - l80 /P:C000,nfbsshot,nfbsshot/N/X/Y/E - -nfbsshot.bin: nfbsshot.hex - echo Making nfbsshot.bin - hextobin nfbsshot.hex nfbsshot.bin -