diff --git a/lib/make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_nestor80.mk b/lib/make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_nestor80.mk new file mode 100644 index 0000000..3a94a29 --- /dev/null +++ b/lib/make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_nestor80.mk @@ -0,0 +1,74 @@ + +MB_NESTOR80_PATH ?= +$(call mb_make_call,mb_doc_variable,MB_NESTOR80_PATH,"Optional path where Nestor80 binaries are located.") + +MB_NESTOR80_FLAG_VERBOSE ?=--no-show-banner --no-color-output --verbosity 0 +$(call mb_make_call,mb_doc_variable_deep,MB_NESTOR80_FLAG_VERBOSE,"The Nestor80 shared verbose flags.") + +MB_NESTOR80_N80_FLAGS ?= +$(call mb_make_call,mb_doc_variable_deep,MB_NESTOR80_N80_FLAGS,"The N80 compile flags.") + +MB_NESTOR80_LK80_FLAGS ?= +$(call mb_make_call,mb_doc_variable_deep,MB_NESTOR80_LK80_FLAGS,"The LK80 linker flags.") + + +define _mb_nestor80_path +$(MB_ᕽᕽᕽ   )$(if $(MB_NESTOR80_PATH),$(MB_NESTOR80_PATH)/$(1),$(1)) +endef + + +define mb_nestor80_compile +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_os_echo_command,$(MB_I18N_NESTOR80_COMPILE) $(2)) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,_mb_nestor80_path,N80) $(1) $(2) $(MB_NESTOR80_N80_FLAGS) $(MB_NESTOR80_FLAG_VERBOSE) +endef +$(call mb_make_call,mb_doc_function,mb_nestor80_compile,"Compiles source code."," ") + + +define mb_nestor80_link +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_os_echo_command,$(MB_I18N_NESTOR80_LINK) $(2) @ $(3)) +$(MB_ᕽᕽᕽ   )$(call mb_make_call,_mb_nestor80_path,LK80) $(MB_NESTOR80_LK80_FLAGS) $(MB_NESTOR80_FLAG_VERBOSE) --code $(3) --output-format bin -o $(2) $(1) +endef +$(call mb_make_call,mb_doc_function,mb_nestor80_link,"Links to custom code location."," ") + + +define mb_nestor80_link_0000 +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_nestor80_link,$(1),$(2),0000h) +endef +$(call mb_make_call,mb_doc_function,mb_nestor80_link_0000,"Links to 0x0000."," ") + + +define mb_nestor80_link_0100 +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_nestor80_link,$(1),$(2),0100h) +endef +$(call mb_make_call,mb_doc_function,mb_nestor80_link_0100,"Links to 0x0100."," ") + + +define mb_nestor80_link_1000 +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_nestor80_link,$(1),$(2),1000h) +endef +$(call mb_make_call,mb_doc_function,mb_nestor80_link_1000,"Links to 0x1000."," ") + + +define mb_nestor80_link_4000 +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_nestor80_link,$(1),$(2),4000h) +endef +$(call mb_make_call,mb_doc_function,mb_nestor80_link_4000,"Links to 0x4000."," ") + + +define mb_nestor80_link_8000 +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_nestor80_link,$(1),$(2),8000h) +endef +$(call mb_make_call,mb_doc_function,mb_nestor80_link_8000,"Links to 0x8000."," ") + + +define mb_nestor80_link_C000 +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_nestor80_link,$(1),$(2),C000h) +endef +$(call mb_make_call,mb_doc_function,mb_nestor80_link_C000,"Links to 0xC000."," ") + + +define mb_nestor80_link_bdos +$(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_nestor80_link_0100,$(1),$(2)) +endef +$(call mb_make_call,mb_doc_function,mb_nestor80_link_bdos,"Links to BDOS."," ") + diff --git a/lib/make/ i18n/mb_i18n.mk b/lib/make/ i18n/mb_i18n.mk index 5d8cdfb..fa44a11 100644 --- a/lib/make/ i18n/mb_i18n.mk +++ b/lib/make/ i18n/mb_i18n.mk @@ -68,6 +68,12 @@ $(call mb_make_call,mb_doc_variable_i18n,MB_I18N_PROJ_ASSERT_COUNT,"Message for MB_I18N_FLOW_CLONE_REPORT ?= Clone troopers $(call mb_make_call,mb_doc_variable_i18n,MB_I18N_FLOW_CLONE_REPORT,"Message for total amount of cloned files.") +MB_I18N_NESTOR80_COMPILE ?= Nestor80 compile +$(call mb_make_call,mb_doc_variable_i18n,MB_I18N_NESTOR80_COMPILE,"Message for Nestor80 compiler run.") + +MB_I18N_NESTOR80_LINK ?= Nestor80 linking +$(call mb_make_call,mb_doc_variable_i18n,MB_I18N_NESTOR80_LINK,"Message for Nestor80 linker run.") + MB_I18N_SDCC_COMPILE ?= SDCC Compile super $(call mb_make_call,mb_doc_variable_i18n,MB_I18N_SDCC_COMPILE,"Message for SDCC compiler run.") diff --git a/lib/make/ i18n/mb_i18n_BASIC.mk b/lib/make/ i18n/mb_i18n_BASIC.mk index f6fb1dd..fc16c34 100644 --- a/lib/make/ i18n/mb_i18n_BASIC.mk +++ b/lib/make/ i18n/mb_i18n_BASIC.mk @@ -21,6 +21,8 @@ MB_I18N_PROJ_DIR_CREATE = FOLDER CREATE: MB_I18N_PROJ_DIR_DELETE = FOLDER DELETE: MB_I18N_PROJ_ASSERT_COUNT = TOTAL ASSERT OK: MB_I18N_FLOW_CLONE_REPORT = GEM⁴ TROOPERS: +MB_I18N_NESTOR80_COMPILE = N80 CHURCH: +MB_I18N_NESTOR80_LINK = LK80 PRAYER: MB_I18N_SDCC_COMPILE = ATARI COMPILE: MB_I18N_SDCC_ARLIB = ATARI ARLIB: MB_I18N_SDCC_LINK = ATARI LINK []: diff --git a/lib/make/ i18n/mb_i18n_iu.mk b/lib/make/ i18n/mb_i18n_iu.mk index 3f32cc7..46884cb 100644 --- a/lib/make/ i18n/mb_i18n_iu.mk +++ b/lib/make/ i18n/mb_i18n_iu.mk @@ -21,6 +21,8 @@ MB_I18N_PROJ_DIR_CREATE = ᑐᖅᑯᐃᕝᕕᓕᐅᕐᓂᖅ MB_I18N_PROJ_DIR_DELETE = ᑐᖅᑯᖅᓯᓯᒪᕝᕕᖓ ᐲᔭᖅᑕᐅᓗᓂ MB_I18N_PROJ_ASSERT_COUNT = ᑲᑎᖦᖢᒋᑦ ᑕᐃᒪᐃᓐᓂᕋᖅᑕᐅᔪᑦ MB_I18N_FLOW_CLONE_REPORT = ᐃᓐᓈᕈᐃᑦ +MB_I18N_NESTOR80_COMPILE = ᓂᖀᑦ ᓄᑕᐅᙱᑦᑐᑦ ᑲᑎᖅᓱᒐᑦ +MB_I18N_NESTOR80_LINK = ᓱᓪᓗᑯᑖᒃᑯᑦ ᐊᒃᑐᐊᖃᑦᑕᐅᑎᓂᖅ MB_I18N_SDCC_COMPILE = ᖃᕆᑕᐅᔭᕋᓛᖅᓄᐊᑦᓯᓂᖅ MB_I18N_SDCC_ARLIB = ᖃᕆᑕᐅᔭᕋᓛᖅᑐᖅᑯᖅᑕᐅᓯᒪᔪᑦ MB_I18N_SDCC_LINK = ᖃᕆᑕᐅᔭᕋᓛᖅᐊᑦᑕᑕᕐᕕᒃᓴ diff --git a/lib/make/ i18n/mb_i18n_ja.mk b/lib/make/ i18n/mb_i18n_ja.mk index 34bde50..6f7a048 100644 --- a/lib/make/ i18n/mb_i18n_ja.mk +++ b/lib/make/ i18n/mb_i18n_ja.mk @@ -21,6 +21,8 @@ MB_I18N_PROJ_DIR_CREATE = フォルダーの作成 MB_I18N_PROJ_DIR_DELETE = フォルダーの削除 MB_I18N_PROJ_ASSERT_COUNT = 完了したアサーションの合計 MB_I18N_FLOW_CLONE_REPORT = クローン・トルーパー +MB_I18N_NESTOR80_COMPILE = ネスターの古いコンパイル +MB_I18N_NESTOR80_LINK = ネストルの古いリンク MB_I18N_SDCC_COMPILE = 標準マイクロコンパイラ MB_I18N_SDCC_ARLIB = 標準マイクロビルドライブラリ MB_I18N_SDCC_LINK = 標準マイクロリンクメッカ図書館 diff --git a/lib/make/天房系統擴展/mb_msxpipe.mk b/lib/make/天房系統擴展/mb_msxpipe.mk index 9fdc839..cf02236 100644 --- a/lib/make/天房系統擴展/mb_msxpipe.mk +++ b/lib/make/天房系統擴展/mb_msxpipe.mk @@ -19,7 +19,7 @@ $(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),$(if $(4),$(4),$(MB_MSXPIPE_COLOR_FG_SAFE_CMD)),$(if $(),$(5),$(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),$(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)) diff --git a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_nestor80.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_nestor80.mk new file mode 100644 index 0000000..5e5c9c0 --- /dev/null +++ b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_nestor80.mk @@ -0,0 +1,32 @@ + +define __mb_flow_nestor80_bdos_mono +.RECIPEPREFIX := $(MB_@RECIPE) + +$(1)/@@prepare-deps:: $(1)/$(3).mac +$(1)/$(3).mac: $(2)/$(3).mac | $(1)/@init +$(MB_@RECIPE)$$(call mb_make_call,mb_os_file_copy,$$<,$$@) +$(MB_ᕽᕽᕽ   )$$(call mb_make_call,mb_doc_target_deep,$(1)/$(3).mac) +$(MB_ᕽᕽᕽ   )$$(call mb_make_call,mb_proj_grow_deps_phase,@prepare,$(1)/$(3).mac) + +$(1)/@@compile-deps:: $(1)/$(3).rel +$(1)/$(3).rel: $(1)/$(3).mac +$(MB_@RECIPE)$$(call mb_make_call,mb_nestor80_compile,$$<,$$@) +$(MB_ᕽᕽᕽ   )$$(call mb_make_call,mb_doc_target_deep,$(1)/$(3).rel) +$(MB_ᕽᕽᕽ   )$$(call mb_make_call,mb_proj_grow_deps_phase,@compile,$(1)/$(3).rel) + +$(1)/@@link-deps:: $(1)/$(3).com +$(1)/$(3).com: $(1)/$(3).rel +$(MB_@RECIPE)$$(call mb_make_call,mb_nestor80_link_bdos,$$<,$$@) +$(MB_ᕽᕽᕽ   )$$(call mb_make_call,mb_doc_target_deep,$(1)/$(3).com) +$(MB_ᕽᕽᕽ   )$$(call mb_make_call,mb_proj_grow_deps_phase,@link,$(1)/$(3).com) + +.RECIPEPREFIX := $(MB_@RECIPEPREFIX) +endef +define mb_flow_nestor80_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_ᕽᕽᕽ   )$(eval $(call mb_make_call,__$(0),$(1),$(2),$(3))) +endef +$(call mb_make_call,mb_doc_function_flow,mb_flow_nestor80_bdos_mono,"Inject flow of Nestor80 toolchain bdos mono file module."," ") + diff --git a/lib/msxbuild.mk b/lib/msxbuild.mk index 34821c1..8009f17 100644 --- a/lib/msxbuild.mk +++ b/lib/msxbuild.mk @@ -45,6 +45,7 @@ $(eval $(call __mb_include,make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_os.mk)) $(eval $(call __mb_include,make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_conv.mk)) $(eval $(call __mb_include,make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_sdcc.mk)) $(eval $(call __mb_include,make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_package.mk)) +$(eval $(call __mb_include,make/ᐅᖓᕙᕆᐊᖅᓯᓂᖅ/mb_nestor80.mk)) @@include-libs:: $(MB_@INCLUDE_CHAIN) MB_@INCLUDE_CHAIN := @@include-parent $(eval $(call __mb_include,make/天房系統擴展/mb_msxrom.mk)) @@ -59,6 +60,7 @@ $(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_macro80.mk)) +$(eval $(call __mb_include,make/𓃬𓍄𓋹𓀭/mb_flow_nestor80.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/example/dist-hello-qa-dos1/0module.mk b/src/example/dist-hello-qa-dos1/0module.mk index ba8cdbf..738c0f3 100644 --- a/src/example/dist-hello-qa-dos1/0module.mk +++ b/src/example/dist-hello-qa-dos1/0module.mk @@ -11,6 +11,7 @@ _$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_write_default,$(EXAMPLE_DI _$(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_safe_assert,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN),hello4) _$(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) diff --git a/src/example/dist-hello-qa-dos2/0module.mk b/src/example/dist-hello-qa-dos2/0module.mk index 5c03687..f2ad6a7 100644 --- a/src/example/dist-hello-qa-dos2/0module.mk +++ b/src/example/dist-hello-qa-dos2/0module.mk @@ -13,15 +13,18 @@ _$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_write_default,$(EXAMPLE_DI _$(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_safe_assert,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN),hello4 > hello4.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_ᕽᕽᕽ  )grep -q "N80: Hello MSX" $(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/hello4.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_proj_grow_assert_success,@package-qa) _$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_proj_grow_assert_success,@package-qa) _$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_proj_grow_assert_success,@package-qa) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_proj_grow_assert_success,@package-qa) $(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target_assert,$(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 index 5348abd..10e9e37 100644 --- a/src/example/dist-hello-qa-msx1/0module.mk +++ b/src/example/dist-hello-qa-msx1/0module.mk @@ -13,18 +13,21 @@ $(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert: $(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@bu _$(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),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) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),hello1 > hello1.out) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),hello2 > hello2.out) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),hello3 > hello3.out) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),hello4 > hello4.out) _$(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_ᕽᕽᕽ  )grep -q "N80: Hello MSX" $(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/hello4.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_proj_grow_assert_success,@package-qa) _$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_proj_grow_assert_success,@package-qa) _$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_proj_grow_assert_success,@package-qa) +_$(MB_ᕽᕽᕽ  )$(call mb_make_call,mb_proj_grow_assert_success,@package-qa) $(MB_ᕽᕽᕽ   )$(call mb_make_call,mb_doc_target_assert,$(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 index 065dbed..b9ddd1c 100644 --- a/src/example/dist-hello/0module.mk +++ b/src/example/dist-hello/0module.mk @@ -6,6 +6,7 @@ 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)/hello4.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))) @@ -23,6 +24,9 @@ _$(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)/hello4.com: bin/example/hello-nestor80/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) diff --git a/src/example/hello-nestor80/0module.mk b/src/example/hello-nestor80/0module.mk new file mode 100644 index 0000000..c5894f8 --- /dev/null +++ b/src/example/hello-nestor80/0module.mk @@ -0,0 +1,9 @@ + +EXAMPLE_HELLO_NESTOR80_SRC := $(call mb_make_call,mb_make_module_path_src,$(PATH_SRC)) +EXAMPLE_HELLO_NESTOR80_BIN := $(call mb_make_call,mb_make_module_path_bin,$(PATH_SRC),$(PATH_BIN)) +EXAMPLE_HELLO_NESTOR80_DEPS := $(EXAMPLE_HELLO_NESTOR80_BIN)/hello.com + +$(call mb_make_call,mb_flow_nestor80_bdos_mono,$(EXAMPLE_HELLO_NESTOR80_BIN),$(EXAMPLE_HELLO_NESTOR80_SRC),hello) +$(call mb_make_call,mb_flow_assert_msxpipe_grep_test,$(EXAMPLE_HELLO_NESTOR80_BIN),$(EXAMPLE_HELLO_NESTOR80_DEPS),check-m80,hello,N80) +$(call mb_make_call,mb_flow_assert_msxpipe_grep_test,$(EXAMPLE_HELLO_NESTOR80_BIN),$(EXAMPLE_HELLO_NESTOR80_DEPS),check-txt,hello,"o MSX world...") + diff --git a/src/example/hello-nestor80/hello.mac b/src/example/hello-nestor80/hello.mac new file mode 100644 index 0000000..150a36d --- /dev/null +++ b/src/example/hello-nestor80/hello.mac @@ -0,0 +1,20 @@ + title M80 CP/M Hello world +.Z80 + +WRITESTR EQU 9h +BDOS EQU 5h + +ASEG +ORG 0100H + +MAIN: + LD C,WRITESTR + LD DE,TXT_HELLO + CALL BDOS + RET + +TXT_HELLO: + DB "N80: Hello MSX world...@ASM$" + +END +DSEG