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

Gave module proj auto parent cycle and removed that for assert clones.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in 5s
Details

Browse source
This commit is contained in:
Willem Cazander 2024-07-18 11:18:45 +02:00
parent e9f91f1e96
commit bc70369c37
12 changed files with 82 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/assert/msxrom/0module100.mk
View file

@ -8,7 +8,7 @@ $(call mb-make-call,mb-doc-variable,ASSERT_MSXROM_MATRIX,When on enabled matrix
# Test matrix <all-machines> <dos2,nextor> <hello1,hello2,hello3,hello4> = 13 * 2 * 4 = 104 assertion tests
$(call mb-make-call,mb-flow-clone-deps,$(ASSERT_MSXROM_BIN),$(EXAMPLE_DIST_HELLO_BIN),$(EXAMPLE_DIST_HELLO_DEPS))
$(call mb-make-call,mb-flow-clone-deps-proj-setup-orphan,$(ASSERT_MSXROM_BIN),$(EXAMPLE_DIST_HELLO_BIN),$(EXAMPLE_DIST_HELLO_DEPS))
ifeq ("$(ASSERT_MSXROM_MATRIX)", "on")
$(foreach _rom,$(MB_MSXROM_FIRE_MACHINES),$(call mb-make-call,mb-flow-assert-msxpipe-grep-test,$(ASSERT_MSXROM_BIN),$(ASSERT_MSXROM_DEPS),$(_rom)-msxdos2-chk1,hello1,M80,msxdos2-boot,$(_rom)))
$(foreach _rom,$(MB_MSXROM_FIRE_MACHINES),$(call mb-make-call,mb-flow-assert-msxpipe-grep-test,$(ASSERT_MSXROM_BIN),$(ASSERT_MSXROM_DEPS),$(_rom)-msxdos2-chk2,hello2,SDCC,msxdos2-boot,$(_rom)))

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

@ -3,7 +3,7 @@ EXAMPLE_DIST_HELLO_QA_DOS1_SRC := $(call mb-make-call,mb-make-module-path-sr
EXAMPLE_DIST_HELLO_QA_DOS1_BIN := $(call mb-make-call,mb-make-module-path-bin,$(PATH_SRC),$(PATH_BIN))
$(call mb-make-call,mb-flow-clone-deps,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN),$(EXAMPLE_DIST_HELLO_BIN),$(EXAMPLE_DIST_HELLO_DEPS),msxdos1-boot)
$(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

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

@ -3,7 +3,7 @@ EXAMPLE_DIST_HELLO_QA_DOS2_SRC := $(call mb-make-call,mb-make-module-path-sr
EXAMPLE_DIST_HELLO_QA_DOS2_BIN := $(call mb-make-call,mb-make-module-path-bin,$(PATH_SRC),$(PATH_BIN))
$(call mb-make-call,mb-flow-clone-deps,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN),$(EXAMPLE_DIST_HELLO_BIN),$(EXAMPLE_DIST_HELLO_DEPS),msxdos2-boot)
$(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

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

@ -6,7 +6,7 @@ EXAMPLE_DIST_HELLO_QA_MSX1_MACHINE ?= Canon_V-20
$(call mb-make-call,mb-doc-variable,EXAMPLE_DIST_HELLO_QA_MSX1_MACHINE,The machine to run the msx1 qa module on.)
$(call mb-make-call,mb-flow-clone-deps,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),$(EXAMPLE_DIST_HELLO_BIN),$(EXAMPLE_DIST_HELLO_DEPS),,$(EXAMPLE_DIST_HELLO_QA_MSX1_MACHINE))
$(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

16
src/example/dist-hello/0module001.mk
View file

@ -13,26 +13,30 @@ _$(MB_ᕽᕽᕽ　　)$(if $(wildcard $(EXAMPLE_DIST_HELLO_BIN)),,$(call mb-make
$(EXAMPLE_DIST_HELLO_BIN)/readme.txt: $(EXAMPLE_DIST_HELLO_SRC)/readme.txt | $(EXAMPLE_DIST_HELLO_BIN)
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-conv-unix2dos,$<,$@)
$(call mb-make-call,mb-proj-grow-deps-phase,@process,$(EXAMPLE_DIST_HELLO_BIN)/readme.txt)
$(EXAMPLE_DIST_HELLO_BIN)/hello1.com: bin/example/hello-macro80/hello.com | $(EXAMPLE_DIST_HELLO_BIN)
$(EXAMPLE_DIST_HELLO_BIN)/hello1.com: bin/example/hello-macro80/hello.com | $(EXAMPLE_DIST_HELLO_BIN)/readme.txt
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-file-copy,$<,$@)
$(EXAMPLE_DIST_HELLO_BIN)/hello2.com: bin/example/hello-sdcc-asm/hello.com | $(EXAMPLE_DIST_HELLO_BIN)
$(EXAMPLE_DIST_HELLO_BIN)/hello2.com: bin/example/hello-sdcc-asm/hello.com | $(EXAMPLE_DIST_HELLO_BIN)/hello1.com
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-file-copy,$<,$@)
$(EXAMPLE_DIST_HELLO_BIN)/hello3.com: bin/example/hello-make4msx/hello.com | $(EXAMPLE_DIST_HELLO_BIN)
$(EXAMPLE_DIST_HELLO_BIN)/hello3.com: bin/example/hello-make4msx/hello.com | $(EXAMPLE_DIST_HELLO_BIN)/hello2.com
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-file-copy,$<,$@)
$(EXAMPLE_DIST_HELLO_BIN)/hello4.com: bin/example/hello-nestor80/hello.com | $(EXAMPLE_DIST_HELLO_BIN)
$(EXAMPLE_DIST_HELLO_BIN)/hello4.com: bin/example/hello-nestor80/hello.com | $(EXAMPLE_DIST_HELLO_BIN)/hello3.com
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-os-file-copy,$<,$@)
$(EXAMPLE_DIST_HELLO_BIN)/@prepare: | $(EXAMPLE_DIST_HELLO_DEPS)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target,$(EXAMPLE_DIST_HELLO_BIN)/@prepare,Prepare folder with binaries for distribution.)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_DIST_HELLO_BIN)/@prepare)
$(EXAMPLE_DIST_HELLO_OUT): | $(EXAMPLE_DIST_HELLO_BIN)/@prepare
$(EXAMPLE_DIST_HELLO_OUT): $(EXAMPLE_DIST_HELLO_BIN)/@prepare
_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-package-create-archive,$(EXAMPLE_DIST_HELLO_BIN),$@)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target,$(EXAMPLE_DIST_HELLO_OUT),Build archive distribution artifact.)
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@package,$(EXAMPLE_DIST_HELLO_OUT))
# todo: convert to module
$(EXAMPLE_DIST_HELLO_BIN)/@build: $(EXAMPLE_DIST_HELLO_BIN)/@prepare
$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_DIST_HELLO_BIN)/@build)