arch-msx/msxbuild
2
0
Fork 0
Code Issues Pull requests 3 Actions Activity

Moved asserts to remove copy of mofified files after assert.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in -9s
Details

Browse source
This commit is contained in:
Willem Cazander 2024-06-30 04:07:10 +02:00
parent b175f499d4
commit 6f677b6c43
10 changed files with 181 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/ahello-m80-test/0module.mk Normal file
View file

@ -0,0 +1,23 @@
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

13
src/ahello-m80/0module.mk
View file

@ -2,7 +2,7 @@
AHELLO_M80_MOD := ahello-m80 AHELLO_M80_MOD := ahello-m80
AHELLO_M80_SRC := $(PATH_SRC)/$(AHELLO_M80_MOD) AHELLO_M80_SRC := $(PATH_SRC)/$(AHELLO_M80_MOD)
AHELLO_M80_BIN := $(PATH_BIN)/$(AHELLO_M80_MOD) AHELLO_M80_BIN := $(PATH_BIN)/$(AHELLO_M80_MOD)
BUILD_HELP += \\n\\t* $(AHELLO_M80_BIN)/ahello.com\\n\\t* ahello-m80-run\\n\\t* ahello-m80-assert BUILD_HELP += \\n\\t* $(AHELLO_M80_BIN)/ahello.com\\n\\t* $(AHELLO_M80_BIN)/@run
$(AHELLO_M80_BIN): $(AHELLO_M80_BIN):
$(call mb_mkdir,$(AHELLO_M80_BIN)) $(call mb_mkdir,$(AHELLO_M80_BIN))
@ -25,14 +25,7 @@ $(AHELLO_M80_BIN)/ahello.com: $(AHELLO_M80_BIN)/ahello.hex
$(call mb_autoexec_safe_cmd,$(AHELLO_M80_BIN),hextocom ahello) $(call mb_autoexec_safe_cmd,$(AHELLO_M80_BIN),hextocom ahello)
$(call mb_openmsx_dosctl,$(AHELLO_M80_BIN)) $(call mb_openmsx_dosctl,$(AHELLO_M80_BIN))
.PHONY: ahello-m80-run .PHONY: $(AHELLO_M80_BIN)/@run
ahello-m80-run: $(AHELLO_M80_BIN)/ahello.com $(AHELLO_M80_BIN)/@run: | $(AHELLO_M80_BIN)/ahello.com
$(call mb_autoexec_show_gui80,$(AHELLO_M80_BIN)) $(call mb_autoexec_show_gui80,$(AHELLO_M80_BIN))
$(call mb_openmsx_dosctl,$(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

23
src/ahello-sdcc-test/0module.mk Normal file
View file

@ -0,0 +1,23 @@
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

13
src/ahello-sdcc/0module.mk
View file

@ -2,7 +2,7 @@
AHELLO_SDCC_MOD := ahello-sdcc AHELLO_SDCC_MOD := ahello-sdcc
AHELLO_SDCC_SRC := $(PATH_SRC)/$(AHELLO_SDCC_MOD) AHELLO_SDCC_SRC := $(PATH_SRC)/$(AHELLO_SDCC_MOD)
AHELLO_SDCC_BIN := $(PATH_BIN)/$(AHELLO_SDCC_MOD) AHELLO_SDCC_BIN := $(PATH_BIN)/$(AHELLO_SDCC_MOD)
BUILD_HELP += \\n\\t* $(AHELLO_SDCC_BIN)/ahello.com\\n\\t* ahello-sdcc-run\\n\\t* ahello-sdcc-assert BUILD_HELP += \\n\\t* $(AHELLO_SDCC_BIN)/ahello.com\\n\\t* $(AHELLO_SDCC_BIN)/@run
$(AHELLO_SDCC_BIN): $(AHELLO_SDCC_BIN):
$(call mb_mkdir,$(AHELLO_SDCC_BIN)) $(call mb_mkdir,$(AHELLO_SDCC_BIN))
@ -16,14 +16,7 @@ $(AHELLO_SDCC_BIN)/ahello.hex: $(AHELLO_SDCC_BIN)/ahello.rel
$(AHELLO_SDCC_BIN)/ahello.com: $(AHELLO_SDCC_BIN)/ahello.hex $(AHELLO_SDCC_BIN)/ahello.com: $(AHELLO_SDCC_BIN)/ahello.hex
$(call mb_sdcc_hex2bin,$<,$@) $(call mb_sdcc_hex2bin,$<,$@)
.PHONY: ahello-sdcc-run .PHONY: $(AHELLO_SDCC_BIN)/@run
ahello-sdcc-run: $(AHELLO_SDCC_BIN)/ahello.com $(AHELLO_SDCC_BIN)/@run: | $(AHELLO_SDCC_BIN)/ahello.com
$(call mb_autoexec_show_gui80,$(AHELLO_SDCC_BIN)) $(call mb_autoexec_show_gui80,$(AHELLO_SDCC_BIN))
$(call mb_openmsx_dosctl,$(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

14
src/assert-all/0module.mk
View file

@ -1,12 +1,12 @@
BUILD_HELP += \\n\\t* assert-all \(Run all asertion tests\)\\n\\t* assert-all-video \(Merges all videos\) BUILD_HELP += \\n\\t* assert-all \(Run all assertion tests\)\\n\\t* assert-all-video \(Merges all videos\)
ASSERT_ALL_DEPS := \ ASSERT_ALL_DEPS := \
ahello-m80-assert \ bin/ahello-m80-test/@assert \
ahello-sdcc-assert \ bin/ahello-sdcc-test/@assert \
dist-qa-dos1-assert \ bin/dist-qa-dos1/@assert \
dist-qa-dos2-assert \ bin/dist-qa-dos2/@assert \
dist-qa-msx1-assert \ bin/dist-qa-msx1/@assert \
dist-qa-msxhub-assert bin/dist-qa-msxhub/@assert
.PHONY: assert-all .PHONY: assert-all
assert-all: | $(ASSERT_ALL_DEPS) assert-all: | $(ASSERT_ALL_DEPS)

38
src/dist-qa-dos1/0module.mk
View file

@ -1,25 +1,27 @@
DIST_QA_DOS1 := $(PATH_BIN)/dist-qa-dos1 DIST_QA_DOS1_MOD := dist-qa-dos1
DIST_QA_DOS1_DEPS := $(subst dist,dist-qa-dos1,$(DIST_DEPS)) DIST_QA_DOS1_SRC := $(PATH_SRC)/$(DIST_QA_DOS1_MOD)
BUILD_HELP += \\n\\t* dist-qa-dos1-run\\n\\t* dist-qa-dos1-assert 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): $(DIST_QA_DOS1_BIN):
$(call mb_mkdir,$(DIST_QA_DOS1)) $(call mb_mkdir,$(DIST_QA_DOS1_BIN))
$(call mb_msxhub_get_dos1_boot,$(DIST_QA_DOS1)) $(call mb_msxhub_get_dos1_boot,$(DIST_QA_DOS1_BIN))
$(DIST_QA_DOS1)/%: bin/dist/% | $(DIST_QA_DOS1) $(DIST_DEPS) $(DIST_QA_DOS1_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_DOS1_BIN) $(DIST_DEPS)
$(call mb_copy,$<,$@) $(call mb_copy,$<,$@)
.PHONY: dist-qa-dos1-run .PHONY: $(DIST_QA_DOS1_BIN)/@run
dist-qa-dos1-run: | $(DIST_QA_DOS1_DEPS) $(DIST_QA_DOS1_BIN)/@run: | $(DIST_QA_DOS1_DEPS)
$(call mb_autoexec_show_gui80,$(DIST_QA_DOS1)) $(call mb_autoexec_show_gui80,$(DIST_QA_DOS1_BIN))
$(call mb_openmsx_dosctl,$(DIST_QA_DOS1)) $(call mb_openmsx_dosctl,$(DIST_QA_DOS1_BIN))
.PHONY: dist-qa-dos1-assert .PHONY: $(DIST_QA_DOS1_BIN)/@assert
dist-qa-dos1-assert: | $(DIST_QA_DOS1_DEPS) $(DIST_QA_DOS1_BIN)/@assert: | $(DIST_QA_DOS1_DEPS)
$(call mb_autoexec_write_default,$(DIST_QA_DOS1)) $(call mb_autoexec_write_default,$(DIST_QA_DOS1_BIN))
$(call mb_autoexec_append_safe_test,$(DIST_QA_DOS1),ahello1) $(call mb_autoexec_append_safe_test,$(DIST_QA_DOS1_BIN),ahello1)
$(call mb_autoexec_append_safe_test,$(DIST_QA_DOS1),ahello2) $(call mb_autoexec_append_safe_test,$(DIST_QA_DOS1_BIN),ahello2)
$(call mb_autoexec_append_exit,$(DIST_QA_DOS1)) $(call mb_autoexec_append_exit,$(DIST_QA_DOS1_BIN))
$(call mb_openmsx_dosctl,$(DIST_QA_DOS1)) $(call mb_openmsx_dosctl,$(DIST_QA_DOS1_BIN))

46
src/dist-qa-dos2/0module.mk
View file

@ -1,28 +1,30 @@
DIST_QA_DOS2 := $(PATH_BIN)/dist-qa-dos2 DIST_QA_DOS2_MOD := dist-qa-dos2
DIST_QA_DOS2_DEPS := $(subst dist,dist-qa-dos2,$(DIST_DEPS)) DIST_QA_DOS2_SRC := $(PATH_SRC)/$(DIST_QA_DOS2_MOD)
BUILD_HELP += \\n\\t* dist-qa-dos2-run\\n\\t* dist-qa-dos2-assert 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): $(DIST_QA_DOS2_BIN):
$(call mb_mkdir,$(DIST_QA_DOS2)) $(call mb_mkdir,$(DIST_QA_DOS2_BIN))
$(call mb_msxhub_get_dos2_boot,$(DIST_QA_DOS2)) $(call mb_msxhub_get_dos2_boot,$(DIST_QA_DOS2_BIN))
$(DIST_QA_DOS2)/%: bin/dist/% | $(DIST_QA_DOS2) $(DIST_DEPS) $(DIST_QA_DOS2_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_DOS2_BIN) $(DIST_DEPS)
$(call mb_copy,$<,$@) $(call mb_copy,$<,$@)
.PHONY: dist-qa-dos2-run .PHONY: $(DIST_QA_DOS2_BIN)/@run
dist-qa-dos2-run: | $(DIST_QA_DOS2_DEPS) $(DIST_QA_DOS2_BIN)/@run: | $(DIST_QA_DOS2_DEPS)
$(call mb_autoexec_show_gui80,$(DIST_QA_DOS2)) $(call mb_autoexec_show_gui80,$(DIST_QA_DOS2_BIN))
$(call mb_openmsx_dosctl,$(DIST_QA_DOS2)) $(call mb_openmsx_dosctl,$(DIST_QA_DOS2_BIN))
.PHONY: dist-qa-dos2-assert .PHONY: $(DIST_QA_DOS2_BIN)/@assert
dist-qa-dos2-assert: | $(DIST_QA_DOS2_DEPS) $(DIST_QA_DOS2_BIN)/@assert: | $(DIST_QA_DOS2_DEPS)
$(call mb_delete,$(DIST_QA_DOS2)/ahello1.out) $(call mb_delete,$(DIST_QA_DOS2_BIN)/ahello1.out)
$(call mb_delete,$(DIST_QA_DOS2)/ahello2.out) $(call mb_delete,$(DIST_QA_DOS2_BIN)/ahello2.out)
$(call mb_autoexec_write_default,$(DIST_QA_DOS2)) $(call mb_autoexec_write_default,$(DIST_QA_DOS2_BIN))
$(call mb_autoexec_append_safe_test,$(DIST_QA_DOS2),ahello1 > ahello1.out) $(call mb_autoexec_append_safe_test,$(DIST_QA_DOS2_BIN),ahello1 > ahello1.out)
$(call mb_autoexec_append_safe_test,$(DIST_QA_DOS2),ahello2 > ahello2.out) $(call mb_autoexec_append_safe_test,$(DIST_QA_DOS2_BIN),ahello2 > ahello2.out)
$(call mb_autoexec_append_exit,$(DIST_QA_DOS2)) $(call mb_autoexec_append_exit,$(DIST_QA_DOS2_BIN))
$(call mb_openmsx_dosctl,$(DIST_QA_DOS2)) $(call mb_openmsx_dosctl,$(DIST_QA_DOS2_BIN))
grep "M80: Hello world..." $(DIST_QA_DOS2)/ahello1.out grep "M80: Hello world..." $(DIST_QA_DOS2_BIN)/ahello1.out
grep "SDCC: Hello world..." $(DIST_QA_DOS2)/ahello2.out grep "SDCC: Hello world..." $(DIST_QA_DOS2_BIN)/ahello2.out

44
src/dist-qa-msx1/0module.mk
View file

@ -1,28 +1,30 @@
DIST_QA_MSX1_MACHINE ?= Canon_V-20 DIST_QA_MSX1_MACHINE ?= Canon_V-20
DIST_QA_MSX1 := $(PATH_BIN)/dist-qa-msx1 DIST_QA_MSX1_MOD := dist-qa-msx1
DIST_QA_MSX1_DEPS := $(subst dist,dist-qa-msx1,$(DIST_DEPS)) DIST_QA_MSX1_SRC := $(PATH_SRC)/$(DIST_QA_MSX1_MOD)
BUILD_HELP += \\n\\t* dist-qa-msx1-run\\n\\t* dist-qa-msx1-assert 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): $(DIST_QA_MSX1_BIN):
$(call mb_mkdir,$(DIST_QA_MSX1)) $(call mb_mkdir,$(DIST_QA_MSX1_BIN))
$(DIST_QA_MSX1)/%: bin/dist/% | $(DIST_QA_MSX1) $(DIST_DEPS) $(DIST_QA_MSX1_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_MSX1_BIN) $(DIST_DEPS)
$(call mb_copy,$<,$@) $(call mb_copy,$<,$@)
.PHONY: dist-qa-msx1-run .PHONY: $(DIST_QA_MSX1_BIN)/@run
dist-qa-msx1-run: | $(DIST_QA_MSX1_DEPS) $(DIST_QA_MSX1_BIN)/@run: | $(DIST_QA_MSX1_DEPS)
$(call mb_autoexec_show_gui40,$(DIST_QA_MSX1)) $(call mb_autoexec_show_gui40,$(DIST_QA_MSX1_BIN))
$(call mb_openmsx_dosctl,$(DIST_QA_MSX1),$(DIST_QA_MSX1_MACHINE)) $(call mb_openmsx_dosctl,$(DIST_QA_MSX1_BIN),$(DIST_QA_MSX1_MACHINE))
.PHONY: dist-qa-msx1-assert .PHONY: $(DIST_QA_MSX1_BIN)/@assert
dist-qa-msx1-assert: | $(DIST_QA_MSX1_DEPS) $(DIST_QA_MSX1_BIN)/@assert: | $(DIST_QA_MSX1_DEPS)
$(call mb_delete,$(DIST_QA_MSX1)/ahello1.out) $(call mb_delete,$(DIST_QA_MSX1_BIN)/ahello1.out)
$(call mb_delete,$(DIST_QA_MSX1)/ahello2.out) $(call mb_delete,$(DIST_QA_MSX1_BIN)/ahello2.out)
$(call mb_autoexec_write_default,$(DIST_QA_MSX1),40) $(call mb_autoexec_write_default,$(DIST_QA_MSX1_BIN),40)
$(call mb_autoexec_append_safe_test,$(DIST_QA_MSX1),ahello1 > ahello1.out,33) $(call mb_autoexec_append_safe_test,$(DIST_QA_MSX1_BIN),ahello1 > ahello1.out,33)
$(call mb_autoexec_append_safe_test,$(DIST_QA_MSX1),ahello2 > ahello2.out,66,99) $(call mb_autoexec_append_safe_test,$(DIST_QA_MSX1_BIN),ahello2 > ahello2.out,66,99)
$(call mb_autoexec_append_exit,$(DIST_QA_MSX1)) $(call mb_autoexec_append_exit,$(DIST_QA_MSX1_BIN))
$(call mb_openmsx_dosctl,$(DIST_QA_MSX1),$(DIST_QA_MSX1_MACHINE)) $(call mb_openmsx_dosctl,$(DIST_QA_MSX1_BIN),$(DIST_QA_MSX1_MACHINE))
grep "M80: Hello world..." $(DIST_QA_MSX1)/ahello1.out grep "M80: Hello world..." $(DIST_QA_MSX1_BIN)/ahello1.out
grep "SDCC: Hello world..." $(DIST_QA_MSX1)/ahello2.out grep "SDCC: Hello world..." $(DIST_QA_MSX1_BIN)/ahello2.out

98
src/dist-qa-msxhub/0module.mk
View file

@ -1,55 +1,57 @@
DIST_QA_MSXHUB_MACHINE ?= Boosted_MSX2+_JP DIST_QA_MSXHUB_MACHINE ?= Boosted_MSX2+_JP
DIST_QA_MSXHUB := $(PATH_BIN)/dist-qa-msxhub DIST_QA_MSXHUB_MOD := dist-qa-msxhub
DIST_QA_MSXHUB_DEPS := $(subst dist,dist-qa-msxhub,$(DIST_DEPS)) DIST_QA_MSXHUB_SRC := $(PATH_SRC)/$(DIST_QA_MSXHUB_MOD)
BUILD_HELP += \\n\\t* dist-qa-msxhub-run\\n\\t* dist-qa-msxhub-assert 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): $(DIST_QA_MSXHUB_BIN):
$(call mb_mkdir,$(DIST_QA_MSXHUB)) $(call mb_mkdir,$(DIST_QA_MSXHUB_BIN))
$(call mb_mkdir,$(DIST_QA_MSXHUB)/utils) $(call mb_mkdir,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_dos2_utils,$(DIST_QA_MSXHUB)/utils) $(call mb_msxhub_get_dos2_utils,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_nextor_utils,$(DIST_QA_MSXHUB)/utils) $(call mb_msxhub_get_nextor_utils,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_macro80,$(DIST_QA_MSXHUB)/utils) $(call mb_msxhub_get_macro80,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_z80asmuk,$(DIST_QA_MSXHUB)/utils) $(call mb_msxhub_get_z80asmuk,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_wbass2,$(DIST_QA_MSXHUB)/utils) $(call mb_msxhub_get_wbass2,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_konpass,$(DIST_QA_MSXHUB)/utils) $(call mb_msxhub_get_konpass,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_pmarc,$(DIST_QA_MSXHUB)/utils) $(call mb_msxhub_get_pmarc,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_lhpack,$(DIST_QA_MSXHUB)/utils) $(call mb_msxhub_get_lhpack,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_lhext,$(DIST_QA_MSXHUB)/utils) $(call mb_msxhub_get_lhext,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_gunzip,$(DIST_QA_MSXHUB)/utils) $(call mb_msxhub_get_gunzip,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_tunzip,$(DIST_QA_MSXHUB)/utils) $(call mb_msxhub_get_tunzip,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_popcom,$(DIST_QA_MSXHUB)/utils) $(call mb_msxhub_get_popcom,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_make,$(DIST_QA_MSXHUB)/utils) $(call mb_msxhub_get_make,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_adir,$(DIST_QA_MSXHUB)/utils) $(call mb_msxhub_get_adir,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_turbo,$(DIST_QA_MSXHUB)/utils) $(call mb_msxhub_get_turbo,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_baskom,$(DIST_QA_MSXHUB)/utils) $(call mb_msxhub_get_baskom,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_binldr,$(DIST_QA_MSXHUB)/utils) $(call mb_msxhub_get_binldr,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_dmphex,$(DIST_QA_MSXHUB)/utils) $(call mb_msxhub_get_dmphex,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_zd,$(DIST_QA_MSXHUB)/utils) $(call mb_msxhub_get_zd,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_msxdos2t,$(DIST_QA_MSXHUB)/utils) $(call mb_msxhub_get_msxdos2t,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_gfxage,$(DIST_QA_MSXHUB)/utils) $(call mb_msxhub_get_gfxage,$(DIST_QA_MSXHUB_BIN)/utils)
$(DIST_QA_MSXHUB)/%: bin/dist/% | $(DIST_QA_MSXHUB) $(DIST_DEPS) $(DIST_QA_MSXHUB_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_MSXHUB_BIN) $(DIST_DEPS)
$(call mb_copy,$<,$@) $(call mb_copy,$<,$@)
.PHONY: dist-qa-msxhub-run .PHONY: $(DIST_QA_MSXHUB_BIN)/@run
dist-qa-msxhub-run: | $(DIST_QA_MSXHUB_DEPS) $(DIST_QA_MSXHUB_BIN)/@run: | $(DIST_QA_MSXHUB_DEPS)
$(call mb_autoexec_show_gui80,$(DIST_QA_MSXHUB),dir/w) $(call mb_autoexec_show_gui80,$(DIST_QA_MSXHUB_BIN),dir/w)
$(call mb_openmsx_dosctl,$(DIST_QA_MSXHUB),$(DIST_QA_MSXHUB_MACHINE)) $(call mb_openmsx_dosctl,$(DIST_QA_MSXHUB_BIN),$(DIST_QA_MSXHUB_BIN_MACHINE))
.PHONY: dist-qa-msxhub-assert .PHONY: $(DIST_QA_MSXHUB_BIN)/@assert
dist-qa-msxhub-assert: | $(DIST_QA_MSXHUB_DEPS) $(DIST_QA_MSXHUB_BIN)/@assert: | $(DIST_QA_MSXHUB_DEPS)
$(call mb_delete,$(DIST_QA_MSXHUB)/ahello1.out) $(call mb_delete,$(DIST_QA_MSXHUB_BIN)/ahello1.out)
$(call mb_delete,$(DIST_QA_MSXHUB)/ahello2.out) $(call mb_delete,$(DIST_QA_MSXHUB_BIN)/ahello2.out)
$(call mb_delete,$(DIST_QA_MSXHUB)/utils.out) $(call mb_delete,$(DIST_QA_MSXHUB_BIN)/utils.out)
$(call mb_autoexec_write_default,$(DIST_QA_MSXHUB),80) $(call mb_autoexec_write_default,$(DIST_QA_MSXHUB_BIN),80)
$(call mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB),ahello1 > ahello1.out) $(call mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB_BIN),ahello1 > ahello1.out)
$(call mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB),ahello2 > ahello2.out) $(call mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB_BIN),ahello2 > ahello2.out)
$(call mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB),dir utils > utils.out) $(call mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB_BIN),dir utils > utils.out)
$(call mb_autoexec_append_cmd,$(DIST_QA_MSXHUB),dir/w) $(call mb_autoexec_append_cmd,$(DIST_QA_MSXHUB_BIN),dir/w)
$(call mb_autoexec_append_exit,$(DIST_QA_MSXHUB)) $(call mb_autoexec_append_exit,$(DIST_QA_MSXHUB_BIN))
$(call mb_openmsx_dosctl,$(DIST_QA_MSXHUB),$(DIST_QA_MSXHUB_MACHINE)) $(call mb_openmsx_dosctl,$(DIST_QA_MSXHUB_BIN),$(DIST_QA_MSXHUB_BIN_MACHINE))
grep "M80: Hello world..." $(DIST_QA_MSXHUB)/ahello1.out grep "M80: Hello world..." $(DIST_QA_MSXHUB_BIN)/ahello1.out
grep "SDCC: Hello world..." $(DIST_QA_MSXHUB)/ahello2.out grep "SDCC: Hello world..." $(DIST_QA_MSXHUB_BIN)/ahello2.out
grep "KONPASS COM" $(DIST_QA_MSXHUB)/utils.out grep "KONPASS COM" $(DIST_QA_MSXHUB_BIN)/utils.out
grep "MAKE COM" $(DIST_QA_MSXHUB)/utils.out grep "MAKE COM" $(DIST_QA_MSXHUB_BIN)/utils.out

10
src/dist/0module.mk vendored
View file

@ -1,10 +1,10 @@
DIST_MOD := dist DIST_MOD := dist
DIST_SRC := src/$(DIST_MOD) DIST_SRC := $(PATH_SRC)/$(DIST_MOD)
DIST_BIN := $(PATH_BIN)/$(DIST_MOD) DIST_BIN := $(PATH_BIN)/$(DIST_MOD)
DIST_OUT := $(PATH_BIN)/$(DIST_MOD).tar.gz DIST_OUT := $(PATH_BIN)/$(DIST_MOD).tar.gz
DIST_DEPS := $(DIST_BIN)/readme.txt $(DIST_BIN)/ahello1.com $(DIST_BIN)/ahello2.com DIST_DEPS := $(DIST_BIN)/readme.txt $(DIST_BIN)/ahello1.com $(DIST_BIN)/ahello2.com
BUILD_HELP += \\n\\t* $(DIST_OUT)\\n\\t* dist-prepare BUILD_HELP += \\n\\t* $(DIST_BIN)/@prepare\\n\\t* $(DIST_OUT)
$(DIST_BIN): $(DIST_BIN):
$(call mb_mkdir,$(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) $(DIST_BIN)/ahello2.com: bin/ahello-sdcc/ahello.com | $(DIST_BIN)
$(call mb_copy,$<,$@) $(call mb_copy,$<,$@)
.PHONY: dist-prepare .PHONY: $(DIST_BIN)/@prepare
dist-prepare: | $(DIST_DEPS) $(DIST_BIN)/@prepare: | $(DIST_DEPS)
$(DIST_OUT): | dist-prepare $(DIST_OUT): | $(DIST_BIN)/@prepare
$(call mb_create_dist,$(DIST_OUT),$(DIST_BIN)) $(call mb_create_dist,$(DIST_OUT),$(DIST_BIN))