From d6999aaaccf263d4cdf8a8dde56b7f531f4247a5 Mon Sep 17 00:00:00 2001 From: Willem Date: Mon, 24 Jun 2024 01:39:59 +0200 Subject: [PATCH 1/7] Moved to shutdown only in boot message. --- lib/make/mb_autoexec.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/make/mb_autoexec.mk b/lib/make/mb_autoexec.mk index 29bf0c2..efaa000 100644 --- a/lib/make/mb_autoexec.mk +++ b/lib/make/mb_autoexec.mk @@ -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)) From 5a17559067edf94a6583e3c1c5d292a6ba345835 Mon Sep 17 00:00:00 2001 From: Willem Date: Mon, 24 Jun 2024 01:44:27 +0200 Subject: [PATCH 2/7] Cleaned boot process step logging. --- lib/make/mb_autoexec.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/make/mb_autoexec.mk b/lib/make/mb_autoexec.mk index efaa000..304582d 100644 --- a/lib/make/mb_autoexec.mk +++ b/lib/make/mb_autoexec.mk @@ -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.) From dc124d6ede9f9b9b1a3351fcf2ecf4a018d4d297 Mon Sep 17 00:00:00 2001 From: Willem Date: Mon, 24 Jun 2024 12:46:44 +0200 Subject: [PATCH 3/7] flow without cd --- .forgejo/workflows/run-test-asserts.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/run-test-asserts.yaml b/.forgejo/workflows/run-test-asserts.yaml index a3d4fcd..072c361 100644 --- a/.forgejo/workflows/run-test-asserts.yaml +++ b/.forgejo/workflows/run-test-asserts.yaml @@ -12,4 +12,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: PATH_HEX2BIN=/opt/Hex2bin-2.5 make assert-all; From 9dd8b1e4ce20da4d78b603cc17f1cda7846b4283 Mon Sep 17 00:00:00 2001 From: Willem Date: Mon, 24 Jun 2024 13:07:37 +0200 Subject: [PATCH 4/7] Removed run name flow parameter. --- .forgejo/workflows/run-test-asserts.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.forgejo/workflows/run-test-asserts.yaml b/.forgejo/workflows/run-test-asserts.yaml index 072c361..49b70e5 100644 --- a/.forgejo/workflows/run-test-asserts.yaml +++ b/.forgejo/workflows/run-test-asserts.yaml @@ -1,5 +1,4 @@ name: Run test asserts -run-name: Test assert-all by ${{github.actor}} on: push: branches: From 41e310b5cda2b0bab4bfc56dacd58561e770aabd Mon Sep 17 00:00:00 2001 From: Willem Date: Mon, 24 Jun 2024 13:36:26 +0200 Subject: [PATCH 5/7] Removed hex2bin dep --- .forgejo/workflows/run-test-asserts.yaml | 2 +- README.md | 7 ++---- lib/make/mb_build.mk | 29 ++++++++++-------------- lib/make/msxbuild.mk | 1 - test/ahello-sdcc/0module.mk | 2 +- 5 files changed, 16 insertions(+), 25 deletions(-) diff --git a/.forgejo/workflows/run-test-asserts.yaml b/.forgejo/workflows/run-test-asserts.yaml index 49b70e5..3c4073d 100644 --- a/.forgejo/workflows/run-test-asserts.yaml +++ b/.forgejo/workflows/run-test-asserts.yaml @@ -11,4 +11,4 @@ jobs: - name: Check out uses: actions/checkout@v3 - name: Run asserts - run: PATH_HEX2BIN=/opt/Hex2bin-2.5 make assert-all; + run: make assert-all; diff --git a/README.md b/README.md index 5605ac1..7c1f077 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/lib/make/mb_build.mk b/lib/make/mb_build.mk index 988eaaf..0c0a5f5 100644 --- a/lib/make/mb_build.mk +++ b/lib/make/mb_build.mk @@ -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 diff --git a/lib/make/msxbuild.mk b/lib/make/msxbuild.mk index b8fb5e3..6022f7b 100644 --- a/lib/make/msxbuild.mk +++ b/lib/make/msxbuild.mk @@ -3,7 +3,6 @@ # # Setup required tools paths -PATH_HEX2BIN ?= /usr/bin PATH_SDCC ?= /usr/bin PATH_UNIX2DOS ?= /usr/bin PATH_OPENMSX ?= /usr/bin diff --git a/test/ahello-sdcc/0module.mk b/test/ahello-sdcc/0module.mk index 2c8953a..6223a69 100644 --- a/test/ahello-sdcc/0module.mk +++ b/test/ahello-sdcc/0module.mk @@ -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 From dbf8c05d8937ab6aed87e5b3a52539f8951b1e10 Mon Sep 17 00:00:00 2001 From: Willem Date: Mon, 24 Jun 2024 13:37:30 +0200 Subject: [PATCH 6/7] Removed command seperator line ending char in flow build. --- .forgejo/workflows/run-test-asserts.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/run-test-asserts.yaml b/.forgejo/workflows/run-test-asserts.yaml index 3c4073d..a0b1819 100644 --- a/.forgejo/workflows/run-test-asserts.yaml +++ b/.forgejo/workflows/run-test-asserts.yaml @@ -11,4 +11,4 @@ jobs: - name: Check out uses: actions/checkout@v3 - name: Run asserts - run: make assert-all; + run: make assert-all From 7f76e673465f8a955924efdafab9503d1757d8f9 Mon Sep 17 00:00:00 2001 From: Willem Date: Mon, 24 Jun 2024 13:54:45 +0200 Subject: [PATCH 7/7] Cleaned left over of hex2bin. --- Makelocal.mk.tpl | 1 - 1 file changed, 1 deletion(-) diff --git a/Makelocal.mk.tpl b/Makelocal.mk.tpl index eac209f..8a97ff5 100644 --- a/Makelocal.mk.tpl +++ b/Makelocal.mk.tpl @@ -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/