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

Merge branch 'master' into test_ci_fail_hang
Some checks failed
Run test asserts / Test-Asserts (pull_request) Failing after 2m3s
Details

Browse source
This commit is contained in:
Willem Cazander 2024-06-24 14:08:00 +02:00
parent 8e143d30fd 7f76e67346
commit a883c3ecb7
7 changed files with 21 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.forgejo/workflows/run-test-asserts.yaml
View file

@ -1,5 +1,4 @@
name: Run test asserts
run-name: Test assert-all by ${{github.actor}}
on:
push:
branches:
@ -12,4 +11,4 @@ jobs:
- name: Check out
uses: actions/checkout@v3
- name: Run asserts
run: cd ${{github.workspace}};PATH_HEX2BIN=/opt/Hex2bin-2.5 make assert-all;
run: make assert-all

1
Makelocal.mk.tpl
View file

@ -4,6 +4,5 @@
# Change to local installations if needed;
#PATH_SDCC ?= /usr/bin
#PATH_HEX2BIN ?= /usr/bin
#PATH_UNIX2DOS ?= /usr/bin
#PATH_OPENMSX ?= /opt/openMSX/bin/

7
README.md
View file

@ -32,7 +32,6 @@ The files in this repro try to handle these steps for you.
* make
* openmsx
* sdcc
* hex2bin-2.5 (see [https://hex2bin.sourceforge.net/](https://hex2bin.sourceforge.net/))
* wget
* unix2dos
@ -45,12 +44,11 @@ For debian use;
Include the `lib/make/msxbuild.mk` file from your Makefile.
And override the required paths;
* PATH_SDCC ?= /usr/bin
* PATH_HEX2BIN ?= /usr/bin
* PATH_UNIX2DOS ?= /usr/bin
* PATH_OPENMSX ?= /opt/openMSX/bin/
* PATH_MSXBUILD ?= /opt/msxbuild
Then build result based compile rules see an example in; `test/ahello/0module.mk`
Then build result based compile rules see an example in; `test/ahello-m80/0module.mk`
## Functions
@ -67,8 +65,7 @@ Current set is WIP.
* mb_link_asm_8000
* mb_link_asm_C000
* mb_link_asm_dos = alias for mb_link_asm_0100
* mb_hex2com
* mb_hex2dat
* mb_hex2bin
* mb_openmsx_dosctl
* mb_msxhub_file
* mb_package_dos1

10
lib/make/mb_autoexec.mk
View file

@ -21,10 +21,10 @@ define mb_autoexec_append_rem
$(call mb_autoexec_append_cmd,$(1),rem $(2))
endef
define mb_autoexec_append_gui_mode
$(call mb_autoexec_append_echo,$(1),Enabling renderer.)
$(call mb_autoexec_append_cmd,$(1),omsxctl set renderer SDL)
$(call mb_autoexec_append_echo,$(1),Enabling throttling.)
$(call mb_autoexec_append_cmd,$(1),omsxctl set throttle on)
$(call mb_autoexec_append_echo,$(1),Enabling SDL renderer.)
$(call mb_autoexec_append_cmd,$(1),omsxctl set renderer SDL > NUL)
$(call mb_autoexec_append_echo,$(1),Enabling CPU throttling.)
$(call mb_autoexec_append_cmd,$(1),omsxctl set throttle on > NUL)
endef
define mb_autoexec_append_stop_fail
$(call mb_autoexec_append_echo,$(1),Disabling automatic failure.)
@ -50,7 +50,7 @@ define mb_autoexec_open_gui
$(call mb_autoexec_write_default,$(1))
$(call mb_autoexec_append_stop_fail,$(1))
$(call mb_autoexec_append_gui_mode,$(1))
$(call mb_autoexec_append_echo,$(1),Type 'shutdown' or 'omsxctl exit' to stop emulation.)
$(call mb_autoexec_append_echo,$(1),Type shutdown to stop emulation.)
endef
define mb_autoexec_open_gui_cmd
$(call mb_autoexec_open_gui,$(1))

29
lib/make/mb_build.mk
View file

@ -1,14 +1,14 @@
MB_BUILD_FLAG_CPU ?= -mz80
MB_BUILD_FLAG_LD ?= --nostdinc
MB_BUILD_SDASM_FLAGS ?= -g -l -c -o
MB_BUILD_SDCC_FLAGS ?=
MB_BUILD_SDAR_FLAGS ?= -rc
MB_BUILD_H2B_CMD ?= $(PATH_HEX2BIN)/hex2bin
MB_BUILD_SDCC_CMD ?= $(PATH_SDCC)/sdcc
MB_BUILD_SDASM_CMD ?= $(PATH_SDCC)/sdasz80
MB_BUILD_SDAR_CMD ?= $(PATH_SDCC)/sdar
MB_BUILD_UNIX2DOS_CMD ?= $(PATH_UNIX2DOS)/unix2dos
MB_BUILD_FLAG_CPU ?= -mz80
MB_BUILD_FLAG_LD ?= --nostdinc
MB_BUILD_SDASM_FLAGS ?= -g -l -c -o
MB_BUILD_SDCC_FLAGS ?=
MB_BUILD_SDAR_FLAGS ?= -rc
MB_BUILD_SDCC_CMD ?= $(PATH_SDCC)/sdcc
MB_BUILD_SDASM_CMD ?= $(PATH_SDCC)/sdasz80
MB_BUILD_SDAR_CMD ?= $(PATH_SDCC)/sdar
MB_BUILD_SDOBJCOPY_CMD ?= $(PATH_SDCC)/sdobjcopy
MB_BUILD_UNIX2DOS_CMD ?= $(PATH_UNIX2DOS)/unix2dos
# TODO: Add C + mixed support;
#$(MB_SDASM) -I$(MB_LIBASM_SRC)/include
@ -54,11 +54,6 @@ define mb_link_asm_dos
$(call mb_link_asm_0100,$(1),$(2))
endef
define mb_hex2com
@echo === Extracting hex2com
cd $(dir $(1)) && $(MB_BUILD_H2B_CMD) -e com $(notdir $(1))
endef
define mb_hex2dat
@echo === Extracting hex2dat
cd $(dir $(1)) && $(MB_BUILD_H2B_CMD) -e dat $(notdir $(1))
define mb_hex2bin
$(MB_BUILD_SDOBJCOPY_CMD) -I ihex --output-target=binary $(1) $(2)
endef

1
lib/make/msxbuild.mk
View file

@ -3,7 +3,6 @@
#
# Setup required tools paths
PATH_HEX2BIN ?= /usr/bin
PATH_SDCC ?= /usr/bin
PATH_UNIX2DOS ?= /usr/bin
PATH_OPENMSX ?= /usr/bin

2
test/ahello-sdcc/0module.mk
View file

@ -14,7 +14,7 @@ $(TEST_AHELLO_SDCC)/ahello.hex: $(TEST_AHELLO_SDCC)/ahello.rel
$(call mb_link_asm_dos,$(TEST_AHELLO_SDCC)/ahello.hex,$(TEST_AHELLO_SDCC)/ahello.rel)
$(TEST_AHELLO_SDCC)/ahello.com: $(TEST_AHELLO_SDCC)/ahello.hex
$(call mb_hex2com,$(TEST_AHELLO_SDCC)/ahello.hex,$(TEST_AHELLO_SDCC)/ahello.com)
$(call mb_hex2bin,$(TEST_AHELLO_SDCC)/ahello.hex,$(TEST_AHELLO_SDCC)/ahello.com)
.PHONY: test-ahello-sdcc-run
test-ahello-sdcc-run: $(TEST_AHELLO_SDCC)/ahello.com