diff --git a/lib/make/mb_openmsx.mk b/lib/make/mb_openmsx.mk index 4cb3a75..da131df 100644 --- a/lib/make/mb_openmsx.mk +++ b/lib/make/mb_openmsx.mk @@ -12,8 +12,12 @@ MB_OPENMSX_SCALE_FACTOR ?= 3 MB_OPENMSX_THROTTLE ?= off MB_OPENMSX_HEADLESS ?= on MB_OPENMSX_RENDERER ?= SDLGL-PP +MB_OPENMSX_CTLCACHE ?= $(MB_CACHE)/msxbuild/omsxctl define mb_openmsx_setup + $(if $(wildcard $(MB_OPENMSX_CTLCACHE)),,$(call mb_mkdir,$(MB_OPENMSX_CTLCACHE))) + $(call mb_msxhub_file,$(MB_OPENMSX_CTLCACHE),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.tcl) + $(call mb_msxhub_file,$(MB_OPENMSX_CTLCACHE),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.com) $(if $(wildcard $(1)-omsx),,$(call mb_mkdir,$(1)-omsx)) $(if $(wildcard $(1)-omsx/stdio.xml),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/stdio.xml,$(1)-omsx)) $(if $(wildcard $(1)-omsx/share),,$(call mb_mkdir,$(1)-omsx/share)) @@ -24,7 +28,7 @@ define mb_openmsx_setup $(if $(wildcard $(1)-omsx/share/scripts/boot_mode.tcl),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/share/scripts/boot_mode.tcl,$(1)-omsx/share/scripts)) $(if $(wildcard $(1)-omsx/share/scripts/fail_after.tcl),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/share/scripts/fail_after.tcl,$(1)-omsx/share/scripts)) $(if $(wildcard $(1)-omsx/share/scripts/save_flight.tcl),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/share/scripts/save_flight.tcl,$(1)-omsx/share/scripts)) - $(if $(wildcard $(1)-omsx/share/scripts/omsxctl.tcl),,$(call mb_msxhub_file,$(1)-omsx/share/scripts,OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.tcl)) + $(if $(wildcard $(1)-omsx/share/scripts/omsxctl.tcl),,$(call mb_copy,$(MB_OPENMSX_CTLCACHE)/omsxctl.tcl,$(1)-omsx/share/scripts)) $(if $(wildcard $(1)-omsx/share/extensions),,$(call mb_mkdir,$(1)-omsx/share/extensions)) $(if $(wildcard $(1)-omsx/share/extensions/ide-nextor.xml),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/share/extensions/ide-nextor.xml,$(1)-omsx/share/extensions)) $(call mb_msxrom_setup,$(1)) @@ -66,7 +70,7 @@ endef define mb_openmsx_dosctl $(call mb_openmsx_setup,$(1),$(if $(2),$(2),$(MB_OPENMSX_MACHINE))) $(if $(wildcard $(1)/utils),$(call _mb_openmsx_dosctl_bat,$(1)/utils),$(call _mb_openmsx_dosctl_bat,$(1))) - $(if $(wildcard $(1)/omsxctl.com),,$(call mb_msxhub_file,$(1),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.com)) + $(if $(wildcard $(1)/omsxctl.com),,$(call mb_copy,$(MB_OPENMSX_CTLCACHE)/omsxctl.com,$(1))) $(if $(wildcard $(1)/command.com),,$(if $(wildcard $(1)/command2.com),,$(call mb_msxhub_get_$(MB_OPENMSX_BOOT_OS)_boot,$(1)))) $(call _mb_openmsx_run,$(1),$(if $(2),$(2),$(MB_OPENMSX_MACHINE))) endef diff --git a/src/ahello-m80-test/0module.mk b/src/ahello-m80-test/0module.mk deleted file mode 100644 index 635f3e5..0000000 --- a/src/ahello-m80-test/0module.mk +++ /dev/null @@ -1,23 +0,0 @@ - -AHELLO_M80_TEST_MOD := ahello-m80-test -AHELLO_M80_TEST_SRC := $(PATH_SRC)/$(AHELLO_M80_TEST_MOD) -AHELLO_M80_TEST_BIN := $(PATH_BIN)/$(AHELLO_M80_TEST_MOD) -BUILD_HELP += \\n\\t* $(AHELLO_M80_TEST_BIN)/@run\\n\\t* $(AHELLO_M80_TEST_BIN)/@assert - -$(AHELLO_M80_TEST_BIN): - $(call mb_mkdir,$(AHELLO_M80_TEST_BIN)) - -$(AHELLO_M80_TEST_BIN)/ahello.com: $(AHELLO_M80_BIN)/ahello.com | $(AHELLO_M80_TEST_BIN) - $(call mb_copy,$<,$@) - -.PHONY: $(AHELLO_M80_TEST_BIN)/@run -$(AHELLO_M80_TEST_BIN)/@run: | $(AHELLO_M80_TEST_BIN)/ahello.com - $(call mb_autoexec_show_gui80,$(AHELLO_M80_TEST_BIN)) - $(call mb_openmsx_dosctl,$(AHELLO_M80_TEST_BIN)) - -.PHONY: $(AHELLO_M80_TEST_BIN)/@assert -$(AHELLO_M80_TEST_BIN)/@assert: | $(AHELLO_M80_TEST_BIN)/ahello.com - $(call mb_delete,$(AHELLO_M80_TEST_BIN)/ahello.out) - $(call mb_autoexec_safe_test,$(AHELLO_M80_TEST_BIN),ahello > ahello.out) - $(call mb_openmsx_dosctl,$(AHELLO_M80_TEST_BIN)) - grep "M80: Hello world..." $(AHELLO_M80_TEST_BIN)/ahello.out diff --git a/src/ahello-m80/0module.mk b/src/ahello-m80/0module.mk index 838b83f..5eee4a4 100644 --- a/src/ahello-m80/0module.mk +++ b/src/ahello-m80/0module.mk @@ -2,7 +2,7 @@ AHELLO_M80_MOD := ahello-m80 AHELLO_M80_SRC := $(PATH_SRC)/$(AHELLO_M80_MOD) AHELLO_M80_BIN := $(PATH_BIN)/$(AHELLO_M80_MOD) -BUILD_HELP += \\n\\t* $(AHELLO_M80_BIN)/ahello.com\\n\\t* $(AHELLO_M80_BIN)/@run +BUILD_HELP += \\n\\t* $(AHELLO_M80_BIN)/ahello.com\\n\\t* ahello-m80-run\\n\\t* ahello-m80-assert $(AHELLO_M80_BIN): $(call mb_mkdir,$(AHELLO_M80_BIN)) @@ -25,7 +25,14 @@ $(AHELLO_M80_BIN)/ahello.com: $(AHELLO_M80_BIN)/ahello.hex $(call mb_autoexec_safe_cmd,$(AHELLO_M80_BIN),hextocom ahello) $(call mb_openmsx_dosctl,$(AHELLO_M80_BIN)) -.PHONY: $(AHELLO_M80_BIN)/@run -$(AHELLO_M80_BIN)/@run: | $(AHELLO_M80_BIN)/ahello.com +.PHONY: ahello-m80-run +ahello-m80-run: $(AHELLO_M80_BIN)/ahello.com $(call mb_autoexec_show_gui80,$(AHELLO_M80_BIN)) $(call mb_openmsx_dosctl,$(AHELLO_M80_BIN)) + +.PHONY: ahello-m80-assert +ahello-m80-assert: $(AHELLO_M80_BIN)/ahello.com + $(call mb_delete,$(AHELLO_M80_BIN)/ahello.out) + $(call mb_autoexec_safe_test,$(AHELLO_M80_BIN),ahello > ahello.out) + $(call mb_openmsx_dosctl,$(AHELLO_M80_BIN)) + grep "M80: Hello world..." $(AHELLO_M80_BIN)/ahello.out diff --git a/src/ahello-sdcc-test/0module.mk b/src/ahello-sdcc-test/0module.mk deleted file mode 100644 index 4d41a95..0000000 --- a/src/ahello-sdcc-test/0module.mk +++ /dev/null @@ -1,23 +0,0 @@ - -AHELLO_SDCC_TEST_MOD := ahello-sdcc-test -AHELLO_SDCC_TEST_SRC := $(PATH_SRC)/$(AHELLO_SDCC_TEST_MOD) -AHELLO_SDCC_TEST_BIN := $(PATH_BIN)/$(AHELLO_SDCC_TEST_MOD) -BUILD_HELP += \\n\\t* $(AHELLO_SDCC_TEST_BIN)/@run\\n\\t* $(AHELLO_SDCC_TEST_BIN)/@assert - -$(AHELLO_SDCC_TEST_BIN): - $(call mb_mkdir,$(AHELLO_SDCC_TEST_BIN)) - -$(AHELLO_SDCC_TEST_BIN)/ahello.com: $(AHELLO_SDCC_BIN)/ahello.com | $(AHELLO_SDCC_TEST_BIN) - $(call mb_copy,$<,$@) - -.PHONY: $(AHELLO_SDCC_TEST_BIN)/@run -$(AHELLO_SDCC_TEST_BIN)/@run: | $(AHELLO_SDCC_TEST_BIN)/ahello.com - $(call mb_autoexec_show_gui80,$(AHELLO_SDCC_TEST_BIN)) - $(call mb_openmsx_dosctl,$(AHELLO_SDCC_TEST_BIN)) - -.PHONY: $(AHELLO_M80_TEST_BIN)/@assert -$(AHELLO_SDCC_TEST_BIN)/@assert: | $(AHELLO_SDCC_TEST_BIN)/ahello.com - $(call mb_delete,$(AHELLO_SDCC_TEST_BIN)/ahello.out) - $(call mb_autoexec_safe_test,$(AHELLO_SDCC_TEST_BIN),ahello > ahello.out) - $(call mb_openmsx_dosctl,$(AHELLO_SDCC_TEST_BIN)) - grep "SDCC: Hello world..." $(AHELLO_SDCC_TEST_BIN)/ahello.out diff --git a/src/ahello-sdcc/0module.mk b/src/ahello-sdcc/0module.mk index 9b9ae2d..a7012c1 100644 --- a/src/ahello-sdcc/0module.mk +++ b/src/ahello-sdcc/0module.mk @@ -2,7 +2,7 @@ AHELLO_SDCC_MOD := ahello-sdcc AHELLO_SDCC_SRC := $(PATH_SRC)/$(AHELLO_SDCC_MOD) AHELLO_SDCC_BIN := $(PATH_BIN)/$(AHELLO_SDCC_MOD) -BUILD_HELP += \\n\\t* $(AHELLO_SDCC_BIN)/ahello.com\\n\\t* $(AHELLO_SDCC_BIN)/@run +BUILD_HELP += \\n\\t* $(AHELLO_SDCC_BIN)/ahello.com\\n\\t* ahello-sdcc-run\\n\\t* ahello-sdcc-assert $(AHELLO_SDCC_BIN): $(call mb_mkdir,$(AHELLO_SDCC_BIN)) @@ -16,7 +16,14 @@ $(AHELLO_SDCC_BIN)/ahello.hex: $(AHELLO_SDCC_BIN)/ahello.rel $(AHELLO_SDCC_BIN)/ahello.com: $(AHELLO_SDCC_BIN)/ahello.hex $(call mb_sdcc_hex2bin,$<,$@) -.PHONY: $(AHELLO_SDCC_BIN)/@run -$(AHELLO_SDCC_BIN)/@run: | $(AHELLO_SDCC_BIN)/ahello.com +.PHONY: ahello-sdcc-run +ahello-sdcc-run: $(AHELLO_SDCC_BIN)/ahello.com $(call mb_autoexec_show_gui80,$(AHELLO_SDCC_BIN)) $(call mb_openmsx_dosctl,$(AHELLO_SDCC_BIN)) + +.PHONY: ahello-sdcc-assert +ahello-sdcc-assert: $(AHELLO_SDCC_BIN)/ahello.com + $(call mb_delete,$(AHELLO_SDCC_BIN)/ahello.out) + $(call mb_autoexec_safe_test,$(AHELLO_SDCC_BIN),ahello > ahello.out) + $(call mb_openmsx_dosctl,$(AHELLO_SDCC_BIN)) + grep "SDCC: Hello world..." $(AHELLO_SDCC_BIN)/ahello.out diff --git a/src/assert-all/0module.mk b/src/assert-all/0module.mk index 330696f..2dcceab 100644 --- a/src/assert-all/0module.mk +++ b/src/assert-all/0module.mk @@ -1,12 +1,12 @@ -BUILD_HELP += \\n\\t* assert-all \(Run all assertion tests\)\\n\\t* assert-all-video \(Merges all videos\) +BUILD_HELP += \\n\\t* assert-all \(Run all asertion tests\)\\n\\t* assert-all-video \(Merges all videos\) ASSERT_ALL_DEPS := \ -bin/ahello-m80-test/@assert \ -bin/ahello-sdcc-test/@assert \ -bin/dist-qa-dos1/@assert \ -bin/dist-qa-dos2/@assert \ -bin/dist-qa-msx1/@assert \ -bin/dist-qa-msxhub/@assert +ahello-m80-assert \ +ahello-sdcc-assert \ +dist-qa-dos1-assert \ +dist-qa-dos2-assert \ +dist-qa-msx1-assert \ +dist-qa-msxhub-assert .PHONY: assert-all assert-all: | $(ASSERT_ALL_DEPS) diff --git a/src/dist-qa-dos1/0module.mk b/src/dist-qa-dos1/0module.mk index 54b8c91..413e8f2 100644 --- a/src/dist-qa-dos1/0module.mk +++ b/src/dist-qa-dos1/0module.mk @@ -1,27 +1,25 @@ -DIST_QA_DOS1_MOD := dist-qa-dos1 -DIST_QA_DOS1_SRC := $(PATH_SRC)/$(DIST_QA_DOS1_MOD) -DIST_QA_DOS1_BIN := $(PATH_BIN)/$(DIST_QA_DOS1_MOD) -DIST_QA_DOS1_DEPS := $(subst dist,$(DIST_QA_DOS1_MOD),$(DIST_DEPS)) -BUILD_HELP += \\n\\t* $(DIST_QA_DOS1_BIN)/@run\\n\\t* $(DIST_QA_DOS1_BIN)/@assert +DIST_QA_DOS1 := $(PATH_BIN)/dist-qa-dos1 +DIST_QA_DOS1_DEPS := $(subst dist,dist-qa-dos1,$(DIST_DEPS)) +BUILD_HELP += \\n\\t* dist-qa-dos1-run\\n\\t* dist-qa-dos1-assert -$(DIST_QA_DOS1_BIN): - $(call mb_mkdir,$(DIST_QA_DOS1_BIN)) - $(call mb_msxhub_get_dos1_boot,$(DIST_QA_DOS1_BIN)) +$(DIST_QA_DOS1): + $(call mb_mkdir,$(DIST_QA_DOS1)) + $(call mb_msxhub_get_dos1_boot,$(DIST_QA_DOS1)) -$(DIST_QA_DOS1_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_DOS1_BIN) $(DIST_DEPS) +$(DIST_QA_DOS1)/%: bin/dist/% | $(DIST_QA_DOS1) $(DIST_DEPS) $(call mb_copy,$<,$@) -.PHONY: $(DIST_QA_DOS1_BIN)/@run -$(DIST_QA_DOS1_BIN)/@run: | $(DIST_QA_DOS1_DEPS) - $(call mb_autoexec_show_gui80,$(DIST_QA_DOS1_BIN)) - $(call mb_openmsx_dosctl,$(DIST_QA_DOS1_BIN)) +.PHONY: dist-qa-dos1-run +dist-qa-dos1-run: | $(DIST_QA_DOS1_DEPS) + $(call mb_autoexec_show_gui80,$(DIST_QA_DOS1)) + $(call mb_openmsx_dosctl,$(DIST_QA_DOS1)) -.PHONY: $(DIST_QA_DOS1_BIN)/@assert -$(DIST_QA_DOS1_BIN)/@assert: | $(DIST_QA_DOS1_DEPS) - $(call mb_autoexec_write_default,$(DIST_QA_DOS1_BIN)) - $(call mb_autoexec_append_safe_test,$(DIST_QA_DOS1_BIN),ahello1) - $(call mb_autoexec_append_safe_test,$(DIST_QA_DOS1_BIN),ahello2) - $(call mb_autoexec_append_exit,$(DIST_QA_DOS1_BIN)) - $(call mb_openmsx_dosctl,$(DIST_QA_DOS1_BIN)) +.PHONY: dist-qa-dos1-assert +dist-qa-dos1-assert: | $(DIST_QA_DOS1_DEPS) + $(call mb_autoexec_write_default,$(DIST_QA_DOS1)) + $(call mb_autoexec_append_safe_test,$(DIST_QA_DOS1),ahello1) + $(call mb_autoexec_append_safe_test,$(DIST_QA_DOS1),ahello2) + $(call mb_autoexec_append_exit,$(DIST_QA_DOS1)) + $(call mb_openmsx_dosctl,$(DIST_QA_DOS1)) diff --git a/src/dist-qa-dos2/0module.mk b/src/dist-qa-dos2/0module.mk index 5622cf6..225ba21 100644 --- a/src/dist-qa-dos2/0module.mk +++ b/src/dist-qa-dos2/0module.mk @@ -1,30 +1,28 @@ -DIST_QA_DOS2_MOD := dist-qa-dos2 -DIST_QA_DOS2_SRC := $(PATH_SRC)/$(DIST_QA_DOS2_MOD) -DIST_QA_DOS2_BIN := $(PATH_BIN)/$(DIST_QA_DOS2_MOD) -DIST_QA_DOS2_DEPS := $(subst dist,$(DIST_QA_DOS2_MOD),$(DIST_DEPS)) -BUILD_HELP += \\n\\t* $(DIST_QA_DOS2_BIN)/@run\\n\\t* $(DIST_QA_DOS2_BIN)/@assert +DIST_QA_DOS2 := $(PATH_BIN)/dist-qa-dos2 +DIST_QA_DOS2_DEPS := $(subst dist,dist-qa-dos2,$(DIST_DEPS)) +BUILD_HELP += \\n\\t* dist-qa-dos2-run\\n\\t* dist-qa-dos2-assert -$(DIST_QA_DOS2_BIN): - $(call mb_mkdir,$(DIST_QA_DOS2_BIN)) - $(call mb_msxhub_get_dos2_boot,$(DIST_QA_DOS2_BIN)) +$(DIST_QA_DOS2): + $(call mb_mkdir,$(DIST_QA_DOS2)) + $(call mb_msxhub_get_dos2_boot,$(DIST_QA_DOS2)) -$(DIST_QA_DOS2_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_DOS2_BIN) $(DIST_DEPS) +$(DIST_QA_DOS2)/%: bin/dist/% | $(DIST_QA_DOS2) $(DIST_DEPS) $(call mb_copy,$<,$@) -.PHONY: $(DIST_QA_DOS2_BIN)/@run -$(DIST_QA_DOS2_BIN)/@run: | $(DIST_QA_DOS2_DEPS) - $(call mb_autoexec_show_gui80,$(DIST_QA_DOS2_BIN)) - $(call mb_openmsx_dosctl,$(DIST_QA_DOS2_BIN)) +.PHONY: dist-qa-dos2-run +dist-qa-dos2-run: | $(DIST_QA_DOS2_DEPS) + $(call mb_autoexec_show_gui80,$(DIST_QA_DOS2)) + $(call mb_openmsx_dosctl,$(DIST_QA_DOS2)) -.PHONY: $(DIST_QA_DOS2_BIN)/@assert -$(DIST_QA_DOS2_BIN)/@assert: | $(DIST_QA_DOS2_DEPS) - $(call mb_delete,$(DIST_QA_DOS2_BIN)/ahello1.out) - $(call mb_delete,$(DIST_QA_DOS2_BIN)/ahello2.out) - $(call mb_autoexec_write_default,$(DIST_QA_DOS2_BIN)) - $(call mb_autoexec_append_safe_test,$(DIST_QA_DOS2_BIN),ahello1 > ahello1.out) - $(call mb_autoexec_append_safe_test,$(DIST_QA_DOS2_BIN),ahello2 > ahello2.out) - $(call mb_autoexec_append_exit,$(DIST_QA_DOS2_BIN)) - $(call mb_openmsx_dosctl,$(DIST_QA_DOS2_BIN)) - grep "M80: Hello world..." $(DIST_QA_DOS2_BIN)/ahello1.out - grep "SDCC: Hello world..." $(DIST_QA_DOS2_BIN)/ahello2.out +.PHONY: dist-qa-dos2-assert +dist-qa-dos2-assert: | $(DIST_QA_DOS2_DEPS) + $(call mb_delete,$(DIST_QA_DOS2)/ahello1.out) + $(call mb_delete,$(DIST_QA_DOS2)/ahello2.out) + $(call mb_autoexec_write_default,$(DIST_QA_DOS2)) + $(call mb_autoexec_append_safe_test,$(DIST_QA_DOS2),ahello1 > ahello1.out) + $(call mb_autoexec_append_safe_test,$(DIST_QA_DOS2),ahello2 > ahello2.out) + $(call mb_autoexec_append_exit,$(DIST_QA_DOS2)) + $(call mb_openmsx_dosctl,$(DIST_QA_DOS2)) + grep "M80: Hello world..." $(DIST_QA_DOS2)/ahello1.out + grep "SDCC: Hello world..." $(DIST_QA_DOS2)/ahello2.out diff --git a/src/dist-qa-msx1/0module.mk b/src/dist-qa-msx1/0module.mk index e1677e9..990255b 100644 --- a/src/dist-qa-msx1/0module.mk +++ b/src/dist-qa-msx1/0module.mk @@ -1,30 +1,28 @@ DIST_QA_MSX1_MACHINE ?= Canon_V-20 -DIST_QA_MSX1_MOD := dist-qa-msx1 -DIST_QA_MSX1_SRC := $(PATH_SRC)/$(DIST_QA_MSX1_MOD) -DIST_QA_MSX1_BIN := $(PATH_BIN)/$(DIST_QA_MSX1_MOD) -DIST_QA_MSX1_DEPS := $(subst dist,$(DIST_QA_MSX1_MOD),$(DIST_DEPS)) -BUILD_HELP += \\n\\t* $(DIST_QA_MSX1_BIN)/@run\\n\\t* $(DIST_QA_MSX1_BIN)/@assert +DIST_QA_MSX1 := $(PATH_BIN)/dist-qa-msx1 +DIST_QA_MSX1_DEPS := $(subst dist,dist-qa-msx1,$(DIST_DEPS)) +BUILD_HELP += \\n\\t* dist-qa-msx1-run\\n\\t* dist-qa-msx1-assert -$(DIST_QA_MSX1_BIN): - $(call mb_mkdir,$(DIST_QA_MSX1_BIN)) +$(DIST_QA_MSX1): + $(call mb_mkdir,$(DIST_QA_MSX1)) -$(DIST_QA_MSX1_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_MSX1_BIN) $(DIST_DEPS) +$(DIST_QA_MSX1)/%: bin/dist/% | $(DIST_QA_MSX1) $(DIST_DEPS) $(call mb_copy,$<,$@) -.PHONY: $(DIST_QA_MSX1_BIN)/@run -$(DIST_QA_MSX1_BIN)/@run: | $(DIST_QA_MSX1_DEPS) - $(call mb_autoexec_show_gui40,$(DIST_QA_MSX1_BIN)) - $(call mb_openmsx_dosctl,$(DIST_QA_MSX1_BIN),$(DIST_QA_MSX1_MACHINE)) +.PHONY: dist-qa-msx1-run +dist-qa-msx1-run: | $(DIST_QA_MSX1_DEPS) + $(call mb_autoexec_show_gui40,$(DIST_QA_MSX1)) + $(call mb_openmsx_dosctl,$(DIST_QA_MSX1),$(DIST_QA_MSX1_MACHINE)) -.PHONY: $(DIST_QA_MSX1_BIN)/@assert -$(DIST_QA_MSX1_BIN)/@assert: | $(DIST_QA_MSX1_DEPS) - $(call mb_delete,$(DIST_QA_MSX1_BIN)/ahello1.out) - $(call mb_delete,$(DIST_QA_MSX1_BIN)/ahello2.out) - $(call mb_autoexec_write_default,$(DIST_QA_MSX1_BIN),40) - $(call mb_autoexec_append_safe_test,$(DIST_QA_MSX1_BIN),ahello1 > ahello1.out,33) - $(call mb_autoexec_append_safe_test,$(DIST_QA_MSX1_BIN),ahello2 > ahello2.out,66,99) - $(call mb_autoexec_append_exit,$(DIST_QA_MSX1_BIN)) - $(call mb_openmsx_dosctl,$(DIST_QA_MSX1_BIN),$(DIST_QA_MSX1_MACHINE)) - grep "M80: Hello world..." $(DIST_QA_MSX1_BIN)/ahello1.out - grep "SDCC: Hello world..." $(DIST_QA_MSX1_BIN)/ahello2.out +.PHONY: dist-qa-msx1-assert +dist-qa-msx1-assert: | $(DIST_QA_MSX1_DEPS) + $(call mb_delete,$(DIST_QA_MSX1)/ahello1.out) + $(call mb_delete,$(DIST_QA_MSX1)/ahello2.out) + $(call mb_autoexec_write_default,$(DIST_QA_MSX1),40) + $(call mb_autoexec_append_safe_test,$(DIST_QA_MSX1),ahello1 > ahello1.out,33) + $(call mb_autoexec_append_safe_test,$(DIST_QA_MSX1),ahello2 > ahello2.out,66,99) + $(call mb_autoexec_append_exit,$(DIST_QA_MSX1)) + $(call mb_openmsx_dosctl,$(DIST_QA_MSX1),$(DIST_QA_MSX1_MACHINE)) + grep "M80: Hello world..." $(DIST_QA_MSX1)/ahello1.out + grep "SDCC: Hello world..." $(DIST_QA_MSX1)/ahello2.out diff --git a/src/dist-qa-msxhub/0module.mk b/src/dist-qa-msxhub/0module.mk index 5610dfb..086316e 100644 --- a/src/dist-qa-msxhub/0module.mk +++ b/src/dist-qa-msxhub/0module.mk @@ -1,57 +1,55 @@ DIST_QA_MSXHUB_MACHINE ?= Boosted_MSX2+_JP -DIST_QA_MSXHUB_MOD := dist-qa-msxhub -DIST_QA_MSXHUB_SRC := $(PATH_SRC)/$(DIST_QA_MSXHUB_MOD) -DIST_QA_MSXHUB_BIN := $(PATH_BIN)/$(DIST_QA_MSXHUB_MOD) -DIST_QA_MSXHUB_DEPS := $(subst dist,$(DIST_QA_MSXHUB_MOD),$(DIST_DEPS)) -BUILD_HELP += \\n\\t* $(DIST_QA_MSXHUB_BIN)/@run\\n\\t* $(DIST_QA_MSXHUB_BIN)/@assert +DIST_QA_MSXHUB := $(PATH_BIN)/dist-qa-msxhub +DIST_QA_MSXHUB_DEPS := $(subst dist,dist-qa-msxhub,$(DIST_DEPS)) +BUILD_HELP += \\n\\t* dist-qa-msxhub-run\\n\\t* dist-qa-msxhub-assert -$(DIST_QA_MSXHUB_BIN): - $(call mb_mkdir,$(DIST_QA_MSXHUB_BIN)) - $(call mb_mkdir,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_msxhub_get_dos2_utils,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_msxhub_get_nextor_utils,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_msxhub_get_macro80,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_msxhub_get_z80asmuk,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_msxhub_get_wbass2,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_msxhub_get_konpass,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_msxhub_get_pmarc,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_msxhub_get_lhpack,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_msxhub_get_lhext,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_msxhub_get_gunzip,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_msxhub_get_tunzip,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_msxhub_get_popcom,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_msxhub_get_make,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_msxhub_get_adir,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_msxhub_get_turbo,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_msxhub_get_baskom,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_msxhub_get_binldr,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_msxhub_get_dmphex,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_msxhub_get_zd,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_msxhub_get_msxdos2t,$(DIST_QA_MSXHUB_BIN)/utils) - $(call mb_msxhub_get_gfxage,$(DIST_QA_MSXHUB_BIN)/utils) +$(DIST_QA_MSXHUB): + $(call mb_mkdir,$(DIST_QA_MSXHUB)) + $(call mb_mkdir,$(DIST_QA_MSXHUB)/utils) + $(call mb_msxhub_get_dos2_utils,$(DIST_QA_MSXHUB)/utils) + $(call mb_msxhub_get_nextor_utils,$(DIST_QA_MSXHUB)/utils) + $(call mb_msxhub_get_macro80,$(DIST_QA_MSXHUB)/utils) + $(call mb_msxhub_get_z80asmuk,$(DIST_QA_MSXHUB)/utils) + $(call mb_msxhub_get_wbass2,$(DIST_QA_MSXHUB)/utils) + $(call mb_msxhub_get_konpass,$(DIST_QA_MSXHUB)/utils) + $(call mb_msxhub_get_pmarc,$(DIST_QA_MSXHUB)/utils) + $(call mb_msxhub_get_lhpack,$(DIST_QA_MSXHUB)/utils) + $(call mb_msxhub_get_lhext,$(DIST_QA_MSXHUB)/utils) + $(call mb_msxhub_get_gunzip,$(DIST_QA_MSXHUB)/utils) + $(call mb_msxhub_get_tunzip,$(DIST_QA_MSXHUB)/utils) + $(call mb_msxhub_get_popcom,$(DIST_QA_MSXHUB)/utils) + $(call mb_msxhub_get_make,$(DIST_QA_MSXHUB)/utils) + $(call mb_msxhub_get_adir,$(DIST_QA_MSXHUB)/utils) + $(call mb_msxhub_get_turbo,$(DIST_QA_MSXHUB)/utils) + $(call mb_msxhub_get_baskom,$(DIST_QA_MSXHUB)/utils) + $(call mb_msxhub_get_binldr,$(DIST_QA_MSXHUB)/utils) + $(call mb_msxhub_get_dmphex,$(DIST_QA_MSXHUB)/utils) + $(call mb_msxhub_get_zd,$(DIST_QA_MSXHUB)/utils) + $(call mb_msxhub_get_msxdos2t,$(DIST_QA_MSXHUB)/utils) + $(call mb_msxhub_get_gfxage,$(DIST_QA_MSXHUB)/utils) -$(DIST_QA_MSXHUB_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_MSXHUB_BIN) $(DIST_DEPS) +$(DIST_QA_MSXHUB)/%: bin/dist/% | $(DIST_QA_MSXHUB) $(DIST_DEPS) $(call mb_copy,$<,$@) -.PHONY: $(DIST_QA_MSXHUB_BIN)/@run -$(DIST_QA_MSXHUB_BIN)/@run: | $(DIST_QA_MSXHUB_DEPS) - $(call mb_autoexec_show_gui80,$(DIST_QA_MSXHUB_BIN),dir/w) - $(call mb_openmsx_dosctl,$(DIST_QA_MSXHUB_BIN),$(DIST_QA_MSXHUB_BIN_MACHINE)) +.PHONY: dist-qa-msxhub-run +dist-qa-msxhub-run: | $(DIST_QA_MSXHUB_DEPS) + $(call mb_autoexec_show_gui80,$(DIST_QA_MSXHUB),dir/w) + $(call mb_openmsx_dosctl,$(DIST_QA_MSXHUB),$(DIST_QA_MSXHUB_MACHINE)) -.PHONY: $(DIST_QA_MSXHUB_BIN)/@assert -$(DIST_QA_MSXHUB_BIN)/@assert: | $(DIST_QA_MSXHUB_DEPS) - $(call mb_delete,$(DIST_QA_MSXHUB_BIN)/ahello1.out) - $(call mb_delete,$(DIST_QA_MSXHUB_BIN)/ahello2.out) - $(call mb_delete,$(DIST_QA_MSXHUB_BIN)/utils.out) - $(call mb_autoexec_write_default,$(DIST_QA_MSXHUB_BIN),80) - $(call mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB_BIN),ahello1 > ahello1.out) - $(call mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB_BIN),ahello2 > ahello2.out) - $(call mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB_BIN),dir utils > utils.out) - $(call mb_autoexec_append_cmd,$(DIST_QA_MSXHUB_BIN),dir/w) - $(call mb_autoexec_append_exit,$(DIST_QA_MSXHUB_BIN)) - $(call mb_openmsx_dosctl,$(DIST_QA_MSXHUB_BIN),$(DIST_QA_MSXHUB_BIN_MACHINE)) - grep "M80: Hello world..." $(DIST_QA_MSXHUB_BIN)/ahello1.out - grep "SDCC: Hello world..." $(DIST_QA_MSXHUB_BIN)/ahello2.out - grep "KONPASS COM" $(DIST_QA_MSXHUB_BIN)/utils.out - grep "MAKE COM" $(DIST_QA_MSXHUB_BIN)/utils.out +.PHONY: dist-qa-msxhub-assert +dist-qa-msxhub-assert: | $(DIST_QA_MSXHUB_DEPS) + $(call mb_delete,$(DIST_QA_MSXHUB)/ahello1.out) + $(call mb_delete,$(DIST_QA_MSXHUB)/ahello2.out) + $(call mb_delete,$(DIST_QA_MSXHUB)/utils.out) + $(call mb_autoexec_write_default,$(DIST_QA_MSXHUB),80) + $(call mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB),ahello1 > ahello1.out) + $(call mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB),ahello2 > ahello2.out) + $(call mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB),dir utils > utils.out) + $(call mb_autoexec_append_cmd,$(DIST_QA_MSXHUB),dir/w) + $(call mb_autoexec_append_exit,$(DIST_QA_MSXHUB)) + $(call mb_openmsx_dosctl,$(DIST_QA_MSXHUB),$(DIST_QA_MSXHUB_MACHINE)) + grep "M80: Hello world..." $(DIST_QA_MSXHUB)/ahello1.out + grep "SDCC: Hello world..." $(DIST_QA_MSXHUB)/ahello2.out + grep "KONPASS COM" $(DIST_QA_MSXHUB)/utils.out + grep "MAKE COM" $(DIST_QA_MSXHUB)/utils.out diff --git a/src/dist/0module.mk b/src/dist/0module.mk index 7e532a0..e32232f 100644 --- a/src/dist/0module.mk +++ b/src/dist/0module.mk @@ -1,10 +1,10 @@ DIST_MOD := dist -DIST_SRC := $(PATH_SRC)/$(DIST_MOD) +DIST_SRC := 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 -BUILD_HELP += \\n\\t* $(DIST_BIN)/@prepare\\n\\t* $(DIST_OUT) +BUILD_HELP += \\n\\t* $(DIST_OUT)\\n\\t* dist-prepare $(DIST_BIN): $(call mb_mkdir,$(DIST_BIN)) @@ -18,8 +18,8 @@ $(DIST_BIN)/ahello1.com: bin/ahello-m80/ahello.com | $(DIST_BIN) $(DIST_BIN)/ahello2.com: bin/ahello-sdcc/ahello.com | $(DIST_BIN) $(call mb_copy,$<,$@) -.PHONY: $(DIST_BIN)/@prepare -$(DIST_BIN)/@prepare: | $(DIST_DEPS) +.PHONY: dist-prepare +dist-prepare: | $(DIST_DEPS) -$(DIST_OUT): | $(DIST_BIN)/@prepare +$(DIST_OUT): | dist-prepare $(call mb_create_dist,$(DIST_OUT),$(DIST_BIN))