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

Added help for orphan modules and renamed manual assert to be equal as
All checks were successful
Run test asserts / Test-Asserts (push) Successful in 4s
Details

Browse source 
others.
This commit is contained in:
Willem Cazander 2024-07-18 15:57:00 +02:00
parent 35577362c2
commit 3560cd7340
10 changed files with 82 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/assert/msxhub/0module100.mk
View file

@ -38,7 +38,7 @@ $(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-run,$(ASSERT_MSXHUB_BI
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(ASSERT_MSXHUB_BIN)/@run)
$(ASSERT_MSXHUB_BIN)/@assert: | $(ASSERT_MSXHUB_BIN)
$(ASSERT_MSXHUB_BIN)/@assert/@test/@check-listing: | $(ASSERT_MSXHUB_BIN)
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-file-delete,$(ASSERT_MSXHUB_BIN)/utils.out)
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-write-default,$(ASSERT_MSXHUB_BIN),336)
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-safe-assert,$(ASSERT_MSXHUB_BIN),dir utils > utils.out)
@ -46,10 +46,10 @@ _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-exit,$(ASSERT_MSXHU
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-openmsx-dosctl,$(ASSERT_MSXHUB_BIN),$(ASSERT_MSXHUB_MACHINE))
_$(MB_ᕽᕽᕽ　　)grep -q "KONPASS COM" $(ASSERT_MSXHUB_BIN)/utils.out
_$(MB_ᕽᕽᕽ　　)grep -q "MAKE COM" $(ASSERT_MSXHUB_BIN)/utils.out
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-echo-assert,$(MB_I18N_ASSERT_SUCCESS) $(ASSERT_MSXHUB_BIN)/@assert)
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-echo-assert,$(MB_I18N_ASSERT_SUCCESS) $(ASSERT_MSXHUB_BIN)/@assert/@test/@check-listing)
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-proj-grow-assert-success,@test)
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-proj-grow-assert-success,@test)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-assert,$(ASSERT_MSXHUB_BIN)/@assert,Asserts that all dist artifacts execute results.)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@test,$(ASSERT_MSXHUB_BIN)/@assert)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(ASSERT_MSXHUB_BIN)/@assert)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-assert,$(ASSERT_MSXHUB_BIN)/@assert/@test/@check-listing,Asserts that all dist artifacts execute results.)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@test,$(ASSERT_MSXHUB_BIN)/@assert/@test/@check-listing)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(ASSERT_MSXHUB_BIN)/@assert/@test/@check-listing)

8
src/example/dist-hello-qa-dos1/0module010.mk
View file

@ -6,7 +6,7 @@ EXAMPLE_DIST_HELLO_QA_DOS1_BIN := $(call mb-make-call,mb-make-module-path-bi
$(call mb-make-call,mb-flow-clone-deps-proj-setup-orphan,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN),$(EXAMPLE_DIST_HELLO_BIN),$(EXAMPLE_DIST_HELLO_DEPS),msxdos1-boot)
$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert: $(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@build
$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert/@package-qa/@check-simple: $(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@build
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-write-default,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN),515)
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-safe-assert,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN),hello1)
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-safe-assert,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN),hello2)
@ -15,7 +15,7 @@ _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-safe-assert,$(EXAMP
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-exit,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN))
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-openmsx-dosctl,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN))
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-echo-assert,$(MB_I18N_ASSERT_SUCCESS) $(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-assert,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert,Assert binaries on msxdos1.)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@package-qa,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-assert,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert/@package-qa/@check-simple,Assert binaries on msxdos1.)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@package-qa,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert/@package-qa/@check-simple)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert/@package-qa/@check-simple)

8
src/example/dist-hello-qa-dos2/0module010.mk
View file

@ -6,7 +6,7 @@ EXAMPLE_DIST_HELLO_QA_DOS2_BIN := $(call mb-make-call,mb-make-module-path-bi
$(call mb-make-call,mb-flow-clone-deps-proj-setup-orphan,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN),$(EXAMPLE_DIST_HELLO_BIN),$(EXAMPLE_DIST_HELLO_DEPS),msxdos2-boot)
$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert: $(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@build
$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert/@package-qa/@check-prefix: $(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@build
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-file-delete,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/ahello1.out)
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-file-delete,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/ahello2.out)
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-write-default,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN),515)
@ -25,7 +25,7 @@ _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-proj-grow-assert-success,@package-q
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-proj-grow-assert-success,@package-qa)
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-proj-grow-assert-success,@package-qa)
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-proj-grow-assert-success,@package-qa)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-assert,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert,Assert binaries on msxdos2.)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@package-qa,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-assert,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert/@package-qa/@check-prefix,Assert binaries on msxdos2.)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@package-qa,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert/@package-qa/@check-prefix)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert/@package-qa/@check-prefix)

8
src/example/dist-hello-qa-msx1/0module010.mk
View file

@ -9,7 +9,7 @@ $(call mb-make-call,mb-doc-variable,EXAMPLE_DIST_HELLO_QA_MSX1_MACHINE,The machi
$(call mb-make-call,mb-flow-clone-deps-proj-setup-orphan,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),$(EXAMPLE_DIST_HELLO_BIN),$(EXAMPLE_DIST_HELLO_DEPS),,$(EXAMPLE_DIST_HELLO_QA_MSX1_MACHINE))
$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert: $(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@build
$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert/@package-qa/@check-prefix: $(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@build
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-file-delete,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/ahello1.out)
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-file-delete,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/ahello2.out)
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-write-default,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),515)
@ -28,7 +28,7 @@ _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-proj-grow-assert-success,@package-q
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-proj-grow-assert-success,@package-qa)
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-proj-grow-assert-success,@package-qa)
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-proj-grow-assert-success,@package-qa)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-assert,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert,Assert binaries on MSX1 machine.)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@package-qa,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-assert,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert/@package-qa/@check-prefix,Assert binaries on MSX1 machine.)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@package-qa,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert/@package-qa/@check-prefix)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert/@package-qa/@check-prefix)

12
src/tools/gluedos1/0module000.mk
View file

@ -13,8 +13,8 @@ $(call mb-make-call,mb-flow-sdcc-bdos-mono,$(GLUEDOS1_BIN),$(GLUEDOS1_SRC),set)
$(call mb-make-call,mb-flow-sdcc-bdos-mono,$(GLUEDOS1_BIN),$(GLUEDOS1_SRC),ver)
# (Manual) Test binaries
$(GLUEDOS1_BIN)/@@test-deps:: $(GLUEDOS1_BIN)/@assert/@test/check-simple
$(GLUEDOS1_BIN)/@assert/@test/check-simple: $(GLUEDOS1_BIN)/@build
$(GLUEDOS1_BIN)/@@test-deps:: $(GLUEDOS1_BIN)/@assert/@test/@check-simple
$(GLUEDOS1_BIN)/@assert/@test/@check-simple: $(GLUEDOS1_BIN)/@build
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-write-default,$(GLUEDOS1_BIN))
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-safe-assert,$(GLUEDOS1_BIN),a:cls.com)
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-safe-assert,$(GLUEDOS1_BIN),a:echo.com)
@ -22,10 +22,10 @@ _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-safe-assert,$(GLUED
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-safe-assert,$(GLUEDOS1_BIN),a:ver.com)
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-autoexec-append-exit,$(GLUEDOS1_BIN))
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-openmsx-dosctl,$(GLUEDOS1_BIN))
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-echo-assert,$(MB_I18N_ASSERT_SUCCESS) $(GLUEDOS1_BIN)/@assert/@test/check-simple)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-assert,$(GLUEDOS1_BIN)/@assert/@test/check-simple,Assert binaries on msxdos1.)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@test,$(GLUEDOS1_BIN)/@assert/@test/check-simple)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(GLUEDOS1_BIN)/@assert/@test/check-simple)
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-echo-assert,$(MB_I18N_ASSERT_SUCCESS) $(GLUEDOS1_BIN)/@assert/@test/@check-simple)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-assert,$(GLUEDOS1_BIN)/@assert/@test/@check-simple,Assert binaries on msxdos1.)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@test,$(GLUEDOS1_BIN)/@assert/@test/@check-simple)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(GLUEDOS1_BIN)/@assert/@test/@check-simple)
# Release local
$(GLUEDOS1_BIN)/@release-local: | $(GLUEDOS1_BIN)/@build