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

Enabled auto path to A:\UTILS + added test for msxhub packages.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in 11s
Details

Browse source
This commit is contained in:
Willem Cazander 2024-06-29 02:49:16 +02:00
parent 92b8aa9a06
commit 598d673d91
9 changed files with 82 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
README.md
View file

@ -52,7 +52,7 @@ When you want to see whats happening do a debug run;
normal run;
time make assert-all
real 0m2.400s
real 0m3.223s
debug run at 11 Mhz;
time MB_OPENMSX_RENDERER=on MB_OPENMSX_THROTTLE=on make assert-all
@ -68,7 +68,7 @@ When you want to see whats happening do a debug run;
build parallel;
time make -s -j4 assert-all
real 0m1.162s
real 0m1.817s
## Functions
@ -90,11 +90,11 @@ Current set is WIP.
* mb_autoexec_safe_cmd
* mb_autoexec_safe_test
* mb_msxhub_file
* mb_msxhub_getboot_dos1
* mb_msxhub_getboot_dos2
* mb_msxhub_getboot_nextor
* mb_msxhub_get_dos2
* mb_msxhub_get_nextor
* mb_msxhub_get_dos1_boot
* mb_msxhub_get_dos2_boot
* mb_msxhub_get_dos2_utils
* mb_msxhub_get_nextor_boot
* mb_msxhub_get_nextor_utils
* mb_msxhub_get_macro80
* mb_msxhub_get_z80asmuk
* mb_msxhub_get_pmarc
@ -157,8 +157,8 @@ Current set is WIP.
## Errata
* Imported folders in openMSX; `cd utils;cd ..;dir` breaks, use `cd utils:cd a:\;dir` as workaround
* Doesn't work on windows
* Missing C and mixed support
* If no SDL than screenshot in fail_after doesn't work
* Video recorder does not append if used in multiple build steps

3
lib/make/mb_autoexec.mk
View file

@ -48,6 +48,9 @@ define mb_autoexec_write_default
$(if $(filter on,$(MB_AUTOEXEC_VERSION)),$(call mb_autoexec_append_cmd,$(1),ver))
$(if $(filter on,$(MB_AUTOEXEC_VERSION)),$(call mb_autoexec_append_cmd,$(1),omsxctl machine_info config_name))
$(if $(filter on,$(MB_AUTOEXEC_VERSION)),$(call mb_autoexec_append_cmd,$(1),omsxctl openmsx_info version))
$(if $(wildcard $(1)/utils),$(call mb_autoexec_append_cmd,$(1),PATH + A:\))
$(if $(wildcard $(1)/utils),$(call mb_autoexec_append_cmd,$(1),PATH + A:\UTILS))
$(if $(wildcard $(1)/utils),$(call mb_autoexec_append_cmd,$(1),PATH))
$(call mb_autoexec_append_echo,$(1),Run msxbuild: $(notdir $(1)))
endef

30
lib/make/mb_msxhub.mk
View file

@ -15,28 +15,26 @@ define mb_msxhub_file
$(if $(filter true,$(3)),$(call mb_copy,$(MB_MSXHUB_CACHE)/$(2),$(1)/$(call _mb_lowercase,$(notdir $(2)))))
endef
#
# Boot Operating System (minimal)
# Operating System (minimal)
#
define mb_msxhub_getboot_dos1
define mb_msxhub_get_dos1_boot
$(call mb_msxhub_file,$(1),MSXDOS1/1.03-2/get/MSXDOS1/MSXDOS.SYS)
$(call mb_msxhub_file,$(1),MSXDOS1/1.03-2/get/MSXDOS1/COMMAND.COM)
endef
define mb_msxhub_getboot_dos2
define mb_msxhub_get_dos2_boot
$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/MSXDOS2.SYS)
$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/COMMAND2.COM)
endef
define mb_msxhub_getboot_nextor
define mb_msxhub_get_nextor_boot
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NEXTOR.SYS)
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/COMMAND2.COM)
endef
#
# Full Operating Systems
# Native OS utils
#
define mb_msxhub_get_dos2
$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/MSXDOS2.SYS)
$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/COMMAND2.COM)
define mb_msxhub_get_dos2_utils
$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/CHKDSK.COM)
$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/DISKCOPY.COM)
$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/FIXDISK.COM)
@ -45,26 +43,20 @@ define mb_msxhub_get_dos2
$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/XDIR.COM)
$(call mb_msxhub_file,$(1),MSXDOS2/2.20-1/get/MSXDOS2/UTILS/KMODE.COM)
endef
define mb_msxhub_get_nextor
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/COMMAND.COM)
define mb_msxhub_get_nextor_utils
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/DELALL.COM)
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/DEVINFO.COM)
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/COMMAND2.COM)
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/DRIVERS.COM)
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/DRVINFO.COM)
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/FASTOUT.COM)
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/LOCK.COM)
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/MAPDRV.COM)
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/MSXDOS.SYS)
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/EMUFILE.COM)
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/RALLOC.COM)
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/Z80MODE.COM)
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NSYSVER.COM)
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NEXTORJP.SYS)
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NEXBOOT.COM)
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/CONCLUS.COM)
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NEXTOR.SYS)
$(call mb_msxhub_file,$(1),NEXTOR/2.1.0-1/get/NEXTOR/NEXTORK.SYS)
endef
#
@ -75,8 +67,6 @@ define mb_msxhub_get_macro80
$(call mb_msxhub_file,$(1),MACRO80/2.0-1/get/MACRO80/L80.COM)
$(call mb_msxhub_file,$(1),MACRO80/2.0-1/get/MACRO80/LIB80.COM)
$(call mb_msxhub_file,$(1),MACRO80/2.0-1/get/MACRO80/M80.COM)
$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/HEXTOCOM.COM)
$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/HEXTOBIN.COM)
endef
define mb_msxhub_get_z80asmuk
$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/BINTOASM.COM)
@ -90,7 +80,6 @@ define mb_msxhub_get_z80asmuk
$(call mb_msxhub_file,$(1),Z80ASMUK/3.4-1/get/Z80ASMUK/HEXTOBIN.COM)
endef
#
# Compressors
#
@ -136,7 +125,7 @@ endef
define mb_msxhub_get_dmphex
$(call mb_msxhub_file,$(1),DMPHEX/1.00-1/get/DMPHEX/dmphex.com)
endef
define mb_msxhub_get_dos2tools
define mb_msxhub_get_msxdos2t
$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/ADDAUX.COM)
$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/BEEP.COM)
$(call mb_msxhub_file,$(1),MSXDOS2T/1.0-1/get/MSXDOS2T/BIO.COM)
@ -168,4 +157,3 @@ endef
define mb_msxhub_get_gfxage
$(call mb_msxhub_file,$(1),GFXAGE/0.99-1/get/GFXAGE/gfxage.com)
endef

14
lib/make/mb_openmsx.mk
View file

@ -64,12 +64,16 @@ define _mb_openmsx_run
@echo === openMSX Done for $(notdir $(1))
endef
define mb_openmsx_dosctl
$(call mb_openmsx_setup,$(1),$(if $(2),$(2),$(MB_OPENMSX_MACHINE)))
$(if $(wildcard $(1)/omsxctl.com),,$(call mb_copy,$(MB_OPENMSX_CTLCACHE)/omsxctl.com,$(1)))
define _mb_openmsx_dosctl_bat
$(if $(wildcard $(1)/z80.bat),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/z80.bat,$(1)))
$(if $(wildcard $(1)/reboot.bat),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/reboot.bat,$(1)))
$(if $(wildcard $(1)/shutdown.bat),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/shutdown.bat,$(1)))
$(if $(wildcard $(1)/z80.bat),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/emuctl/z80.bat,$(1)))
$(if $(wildcard $(1)/command.com),,$(if $(wildcard $(1)/command2.com),,$(call mb_msxhub_getboot_$(MB_OPENMSX_BOOT_OS),$(1))))
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_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

3
test/0module.mk
View file

@ -5,7 +5,8 @@ test-ahello-m80-assert \
test-ahello-sdcc-assert \
test-dist-qa-dos1-assert \
test-dist-qa-dos2-assert \
test-dist-qa-msx1-assert
test-dist-qa-msx1-assert \
test-dist-qa-msxhub-assert
.PHONY: assert-all
assert-all: | $(BUILD_TEST)

4
test/ahello-m80/0module.mk
View file

@ -4,7 +4,9 @@ BUILD_HELP += \\n\\t* $(TEST_AHELLO_M80)/ahello.com\\n\\t* test-ahello-m8
$(TEST_AHELLO_M80):
$(call mb_mkdir,$(TEST_AHELLO_M80))
$(call mb_msxhub_get_macro80,$(TEST_AHELLO_M80))
$(call mb_mkdir,$(TEST_AHELLO_M80)/utils)
$(call mb_msxhub_get_macro80,$(TEST_AHELLO_M80)/utils)
$(call mb_msxhub_get_z80asmuk,$(TEST_AHELLO_M80)/utils)
$(TEST_AHELLO_M80)/%.mac: test/ahello-m80/%.mac | $(TEST_AHELLO_M80)
$(call mb_unix2dos,$<,$@)

2
test/dist-qa-dos1/0module.mk
View file

@ -5,7 +5,7 @@ BUILD_HELP += \\n\\t* test-dist-qa-dos1-run\\n\\t* test-dist-qa-dos
$(TEST_DIST_QA_DOS1):
$(call mb_mkdir,$(TEST_DIST_QA_DOS1))
$(call mb_msxhub_getboot_dos1,$(TEST_DIST_QA_DOS1))
$(call mb_msxhub_get_dos1_boot,$(TEST_DIST_QA_DOS1))
$(TEST_DIST_QA_DOS1)/%: bin/test/dist/% | $(TEST_DIST_QA_DOS1) $(TEST_DIST_DEPS)
$(call mb_copy,$<,$@)

2
test/dist-qa-dos2/0module.mk
View file

@ -5,7 +5,7 @@ BUILD_HELP += \\n\\t* test-dist-qa-dos2-run\\n\\t* test-dist-qa-dos
$(TEST_DIST_QA_DOS2):
$(call mb_mkdir,$(TEST_DIST_QA_DOS2))
$(call mb_msxhub_getboot_dos2,$(TEST_DIST_QA_DOS2))
$(call mb_msxhub_get_dos2_boot,$(TEST_DIST_QA_DOS2))
$(TEST_DIST_QA_DOS2)/%: bin/test/dist/% | $(TEST_DIST_QA_DOS2) $(TEST_DIST_DEPS)
$(call mb_copy,$<,$@)

46
test/dist-qa-msxhub/0module.mk Normal file
View file

@ -0,0 +1,46 @@
TEST_DIST_QA_MSXHUB_MACHINE ?= Boosted_MSX2+_JP
TEST_DIST_QA_MSXHUB := $(PATH_BIN)/test/dist-qa-msxhub
TEST_DIST_QA_MSXHUB_DEPS := $(subst dist,dist-qa-msxhub,$(TEST_DIST_DEPS))
BUILD_HELP += \\n\\t* test-dist-qa-msxhub-run\\n\\t* test-dist-qa-msxhub-assert
$(TEST_DIST_QA_MSXHUB):
$(call mb_mkdir,$(TEST_DIST_QA_MSXHUB))
$(call mb_mkdir,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_dos2_utils,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_nextor_utils,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_macro80,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_z80asmuk,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_pmarc,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_lhpack,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_lhext,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_gunzip,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_tunzip,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_popcom,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_adir,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_turbo,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_baskom,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_binldr,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_dmphex,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_msxdos2t,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_gfxage,$(TEST_DIST_QA_MSXHUB)/utils)
$(TEST_DIST_QA_MSXHUB)/%: bin/test/dist/% | $(TEST_DIST_QA_MSXHUB) $(TEST_DIST_DEPS)
$(call mb_copy,$<,$@)
.PHONY: test-dist-qa-msxhub-run
test-dist-qa-msxhub-run: | $(TEST_DIST_QA_MSXHUB_DEPS)
$(call mb_autoexec_open_gui80,$(TEST_DIST_QA_MSXHUB))
$(call mb_openmsx_dosctl,$(TEST_DIST_QA_MSXHUB),$(TEST_DIST_QA_MSXHUB_MACHINE))
.PHONY: test-dist-qa-msxhub-assert
test-dist-qa-msxhub-assert: | $(TEST_DIST_QA_MSXHUB_DEPS)
$(call mb_delete,$(TEST_DIST_QA_MSXHUB)/ahello1.out)
$(call mb_delete,$(TEST_DIST_QA_MSXHUB)/ahello2.out)
$(call mb_autoexec_write_default,$(TEST_DIST_QA_MSXHUB),80)
$(call mb_autoexec_append_safe_test,$(TEST_DIST_QA_MSXHUB),ahello1 > ahello1.out,33)
$(call mb_autoexec_append_safe_test,$(TEST_DIST_QA_MSXHUB),ahello2 > ahello2.out,66,99)
$(call mb_autoexec_append_exit,$(TEST_DIST_QA_MSXHUB))
$(call mb_openmsx_dosctl,$(TEST_DIST_QA_MSXHUB),$(TEST_DIST_QA_MSXHUB_MACHINE))
grep "M80: Hello world..." $(TEST_DIST_QA_MSXHUB)/ahello1.out
grep "SDCC: Hello world..." $(TEST_DIST_QA_MSXHUB)/ahello2.out