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

WIP more flow rename.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in -11s
Details

Browse source
This commit is contained in:
Willem Cazander 2024-07-12 19:30:19 +02:00
parent 920de8a8b1
commit 7c8f4207c6
11 changed files with 34 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk
View file

@ -1,25 +1,28 @@
define __mb_assert_flow_grep_binary define __mb_flow_assert_grep_binary_x
.RECIPEPREFIX := $(MB_@RECIPE) .RECIPEPREFIX := $(MB_@RECIPE)
$(1)/@assert-$(2): $(1)/@build $(1)/$(5)-$(2): $(1)/@build
$(MB_@RECIPE)grep -q -U $(4) $(1)/$(3) $(MB_@RECIPE)grep -q -U $(4) $(1)/$(3)
$(MB_@RECIPE)$$(call mb_make_call,mb_os_echo_assert,$$(MB_I18N_ASSERT_SUCCESS) @assert-$(2)) $(MB_@RECIPE)$$(call mb_make_call,mb_os_echo_assert,$$(MB_I18N_ASSERT_SUCCESS) v-$(2))
$(MB_ᕽᕽᕽ　　　)$$(call mb_make_call,mb_doc_target,$(1)/@assert-$(2),"Asserts that $(3) output matches.") $(MB_ᕽᕽᕽ　　　)$$(call mb_make_call,mb_doc_target,$(1)/$(5)-$(2),"Asserts that $(3) output matches.")
$(MB_ᕽᕽᕽ　　　)$$(call mb_make_call,mb_make_target_phony,$(1)/@assert-$(2)) $(MB_ᕽᕽᕽ　　　)$$(call mb_make_call,mb_make_target_phony,$(1)/$(5)-$(2))
$(MB_ᕽᕽᕽ　　　)$$(call mb_make_call,mb_proj_grow_deps_phase,@test,$(1)/@assert-$(2)) $(MB_ᕽᕽᕽ　　　)$$(call mb_make_call,mb_proj_grow_deps_phase,@test,$(1)/$(5)-$(2))
.RECIPEPREFIX := $(MB_@RECIPEPREFIX) .RECIPEPREFIX := $(MB_@RECIPEPREFIX)
endef endef
define mb_flow_assert_grep_binary_test
define mb_assert_flow_grep_binary $(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_check_arg4,$(0),$(1),$(2),$(3),$(4))
$(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_check_arg4,mb_assert_flow_grep_binary,$(1),$(2),$(3),$(4)) $(MB_ᕽᕽᕽ　　　)$(eval $(call mb_make_call,__mb_flow_assert_grep_binary_x,$(1),$(2),$(3),$(4),@test))
$(MB_ᕽᕽᕽ　　　)$(eval $(call mb_make_call,__mb_assert_flow_grep_binary,$(1),$(2),$(3),$(4)))
endef endef
$(call mb_make_call,mb_doc_function_flow,mb_assert_flow_grep_binary,"Inject flow of single binary grep assert.","<build-dir> <test-id> <file> <grep-match>") $(call mb_make_call,mb_doc_function_flow,mb_flow_assert_grep_binary_test,"Inject flow of single binary grep assert.","<build-dir> <test-id> <file> <grep-match>")
define mb_flow_assert_grep_binary_package_qa
$(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_check_arg4,$(0),$(1),$(2),$(3),$(4))
$(MB_ᕽᕽᕽ　　　)$(eval $(call mb_make_call,__mb_flow_assert_grep_binary_x,$(1),$(2),$(3),$(4),@package-qa))
endef
$(call mb_make_call,mb_doc_function_flow,mb_flow_assert_grep_binary_package_qa,"Inject flow of single binary grep assert.","<build-dir> <test-id> <file> <grep-match>")
#$$(call mb_delete,$(1)/$(3).out) #$$(call mb_delete,$(1)/$(3).out)
define __mb_assert_flow_bdos_grep define __mb_assert_flow_bdos_grep
.RECIPEPREFIX := $(MB_@RECIPE) .RECIPEPREFIX := $(MB_@RECIPE)
MB__TARGET := $(1)-test-$(2)/@assert
$(1)-test-$(2)/@assert: $(1)/@build $(1)-test-$(2)/@assert: $(1)/@build
$(MB_@RECIPE)$$(call mb_make_call,mb_os_dir_create,$(1)-test-$(2)) $(MB_@RECIPE)$$(call mb_make_call,mb_os_dir_create,$(1)-test-$(2))
$(MB_@RECIPE)$$(call mb_make_call,mb_os_file_copy,$(1)/$(3).com,$(1)-test-$(2)) $(MB_@RECIPE)$$(call mb_make_call,mb_os_file_copy,$(1)/$(3).com,$(1)-test-$(2))
@ -32,6 +35,7 @@ $(MB_ᕽᕽᕽ　　　)$$(call mb_make_call,mb_proj_grow_deps_phase,@test,$(1)-
.RECIPEPREFIX := $(MB_@RECIPEPREFIX) .RECIPEPREFIX := $(MB_@RECIPEPREFIX)
endef endef
#$(call mb_make_call,mb_flow_clone_deps,$(DIST_QA_MSX1_BIN),$(DIST_BIN),$(DIST_DEPS),$(DIST_QA_MSX1_MACHINE))
define mb_assert_flow_bdos_grep define mb_assert_flow_bdos_grep
$(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_check_arg4,mb_assert_flow_bdos_grep,$(1),$(2),$(3),$(4)) $(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_check_arg4,mb_assert_flow_bdos_grep,$(1),$(2),$(3),$(4))
$(MB_ᕽᕽᕽ　　　)$(eval $(call mb_make_call,__mb_assert_flow_bdos_grep,$(1),$(2),$(3),$(4),$(5))) $(MB_ᕽᕽᕽ　　　)$(eval $(call mb_make_call,__mb_assert_flow_bdos_grep,$(1),$(2),$(3),$(4),$(5)))

10
lib/make/𓃬𓍄𓋹𓀭/mb_flow_clone.mk
View file

@ -1,5 +1,5 @@
define __mb_tool_clone_flow_deps define __mb_flow_clone_deps
.RECIPEPREFIX := $(MB_@RECIPE) .RECIPEPREFIX := $(MB_@RECIPE)
$(1)/@clean: @@clean $(1)/@clean: @@clean
@ -33,9 +33,9 @@ $(MB_ᕽᕽᕽ　　　)$$(call mb_make_call,mb_make_target_phony,$(1)/@run)
.RECIPEPREFIX := $(MB_@RECIPEPREFIX) .RECIPEPREFIX := $(MB_@RECIPEPREFIX)
endef endef
define mb_tool_clone_flow_deps define mb_flow_clone_deps
$(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_check_arg3,mb_tool_clone_flow_deps,$(1),$(2),$(3)) $(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_check_arg3,$(0),$(1),$(2),$(3))
$(MB_ᕽᕽᕽ　　　)$(eval $(call mb_make_call,__mb_tool_clone_flow_deps,$(1),$(2),$(3),$(call mb_make_call,mb_proj_module_local_deps,$(1),$(3)),$(4),$(5))) $(MB_ᕽᕽᕽ　　　)$(eval $(call mb_make_call,__$(0),$(1),$(2),$(3),$(call mb_make_call,mb_proj_module_local_deps,$(1),$(3)),$(4),$(5)))
endef endef
$(call mb_make_call,mb_doc_function_flow,mb_tool_clone_flow_deps,"Inject flow of file copy toolchain module.","<bin-to> <bin-from> <deps> [machine] [os-version]") $(call mb_make_call,mb_doc_function_flow,mb_flow_clone_deps,"Inject flow of file copy toolchain module.","<bin-to> <bin-from> <deps> [machine] [os-version]")

6
lib/make/𓃬𓍄𓋹𓀭/mb_flow_m80.mk
View file

@ -1,5 +1,5 @@
define __mb_tool_m80_flow_bdos_mono define __mb_flow_m80_bdos_mono
.RECIPEPREFIX := $(MB_@RECIPE) .RECIPEPREFIX := $(MB_@RECIPE)
$(1): | @init $(1): | @init
@ -41,9 +41,9 @@ $(MB_ᕽᕽᕽ　　　)$$(call mb_make_call,mb_make_target_phony,$(1)/@run)
.RECIPEPREFIX := $(MB_@RECIPEPREFIX) .RECIPEPREFIX := $(MB_@RECIPEPREFIX)
endef endef
define mb_tool_m80_flow_bdos_mono define mb_flow_m80_bdos_mono
$(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_check_arg3,$(0),$(1),$(2),$(3)) $(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_check_arg3,$(0),$(1),$(2),$(3))
$(MB_ᕽᕽᕽ　　　)$(eval $(call mb_make_call,__$(0),$(1),$(2),$(3))) $(MB_ᕽᕽᕽ　　　)$(eval $(call mb_make_call,__$(0),$(1),$(2),$(3)))
endef endef
$(call mb_make_call,mb_doc_function_flow,mb_tool_m80_flow_bdos_mono,"Inject flow of m80 toolchain bdos mono file module.","<bin-dir> <src-dir> <objname>") $(call mb_make_call,mb_doc_function_flow,mb_flow_m80_bdos_mono,"Inject flow of m80 toolchain bdos mono file module.","<bin-dir> <src-dir> <objname>")

6
lib/make/𓃬𓍄𓋹𓀭/mb_flow_sdcc.mk
View file

@ -1,5 +1,5 @@
define __mb_tool_sdcc_flow_bdos_mono define __mb_flow_sdcc_bdos_mono
.RECIPEPREFIX := $(MB_@RECIPE) .RECIPEPREFIX := $(MB_@RECIPE)
$(1): | @init $(1): | @init
@ -33,9 +33,9 @@ $(MB_ᕽᕽᕽ　　　)$$(call mb_make_call,mb_make_target_phony,$(1)/@run)
.RECIPEPREFIX := $(MB_@RECIPEPREFIX) .RECIPEPREFIX := $(MB_@RECIPEPREFIX)
endef endef
define mb_tool_sdcc_flow_bdos_mono define mb_flow_sdcc_bdos_mono
$(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_check_arg3,$(0),$(1),$(2),$(3)) $(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_check_arg3,$(0),$(1),$(2),$(3))
$(MB_ᕽᕽᕽ　　　)$(eval $(call mb_make_call,__$(0),$(1),$(2),$(3))) $(MB_ᕽᕽᕽ　　　)$(eval $(call mb_make_call,__$(0),$(1),$(2),$(3)))
endef endef
$(call mb_make_call,mb_doc_function_flow,mb_tool_sdcc_flow_bdos_mono,"Inject flow of sdcc toolchain bdos mono file module.","<bin-dir> <src-dir> <objname>") $(call mb_make_call,mb_doc_function_flow,mb_flow_sdcc_bdos_mono,"Inject flow of sdcc toolchain bdos mono file module.","<bin-dir> <src-dir> <objname>")

2
src/ahello-m80/0module.mk
View file

@ -3,7 +3,7 @@ AHELLO_M80_SRC := $(call mb_make_call,mb_proj_module_path_src,$(PATH_SRC))
AHELLO_M80_BIN := $(call mb_make_call,mb_proj_module_path_bin,$(PATH_SRC),$(PATH_BIN)) AHELLO_M80_BIN := $(call mb_make_call,mb_proj_module_path_bin,$(PATH_SRC),$(PATH_BIN))
$(call mb_make_call,mb_tool_m80_flow_bdos_mono,$(AHELLO_M80_BIN),$(AHELLO_M80_SRC),ahello) $(call mb_make_call,mb_flow_m80_bdos_mono,$(AHELLO_M80_BIN),$(AHELLO_M80_SRC),ahello)
$(call mb_make_call,mb_assert_flow_bdos_grep,$(AHELLO_M80_BIN),check-m80,ahello,M80) $(call mb_make_call,mb_assert_flow_bdos_grep,$(AHELLO_M80_BIN),check-m80,ahello,M80)
$(call mb_make_call,mb_assert_flow_bdos_grep,$(AHELLO_M80_BIN),check-txt,ahello,"o world...") $(call mb_make_call,mb_assert_flow_bdos_grep,$(AHELLO_M80_BIN),check-txt,ahello,"o world...")

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

@ -3,7 +3,7 @@ AHELLO_SDCC_SRC := $(call mb_make_call,mb_proj_module_path_src,$(PATH_SRC))
AHELLO_SDCC_BIN := $(call mb_make_call,mb_proj_module_path_bin,$(PATH_SRC),$(PATH_BIN)) AHELLO_SDCC_BIN := $(call mb_make_call,mb_proj_module_path_bin,$(PATH_SRC),$(PATH_BIN))
$(call mb_make_call,mb_tool_sdcc_flow_bdos_mono,$(AHELLO_SDCC_BIN),$(AHELLO_SDCC_SRC),ahello) $(call mb_make_call,mb_flow_sdcc_bdos_mono,$(AHELLO_SDCC_BIN),$(AHELLO_SDCC_SRC),ahello)
$(call mb_make_call,mb_assert_flow_bdos_grep,$(AHELLO_SDCC_BIN),check-sdcc,ahello,SDCC) $(call mb_make_call,mb_assert_flow_bdos_grep,$(AHELLO_SDCC_BIN),check-sdcc,ahello,SDCC)
$(call mb_make_call,mb_assert_flow_bdos_grep,$(AHELLO_SDCC_BIN),check-hell,ahello,Hell) $(call mb_make_call,mb_assert_flow_bdos_grep,$(AHELLO_SDCC_BIN),check-hell,ahello,Hell)

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

@ -3,7 +3,7 @@ DIST_QA_DOS1_SRC := $(call mb_make_call,mb_proj_module_path_src,$(PATH_SRC))
DIST_QA_DOS1_BIN := $(call mb_make_call,mb_proj_module_path_bin,$(PATH_SRC),$(PATH_BIN)) DIST_QA_DOS1_BIN := $(call mb_make_call,mb_proj_module_path_bin,$(PATH_SRC),$(PATH_BIN))
$(call mb_make_call,mb_tool_clone_flow_deps,$(DIST_QA_DOS1_BIN),$(DIST_BIN),$(DIST_DEPS),,msxdos1) $(call mb_make_call,mb_flow_clone_deps,$(DIST_QA_DOS1_BIN),$(DIST_BIN),$(DIST_DEPS),,msxdos1)
$(DIST_QA_DOS1_BIN)/@assert: $(DIST_QA_DOS1_BIN)/@build $(DIST_QA_DOS1_BIN)/@assert: $(DIST_QA_DOS1_BIN)/@build

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

@ -3,7 +3,7 @@ DIST_QA_DOS2_SRC := $(call mb_make_call,mb_proj_module_path_src,$(PATH_SRC))
DIST_QA_DOS2_BIN := $(call mb_make_call,mb_proj_module_path_bin,$(PATH_SRC),$(PATH_BIN)) DIST_QA_DOS2_BIN := $(call mb_make_call,mb_proj_module_path_bin,$(PATH_SRC),$(PATH_BIN))
$(call mb_make_call,mb_tool_clone_flow_deps,$(DIST_QA_DOS2_BIN),$(DIST_BIN),$(DIST_DEPS),,msxdos2) $(call mb_make_call,mb_flow_clone_deps,$(DIST_QA_DOS2_BIN),$(DIST_BIN),$(DIST_DEPS),,msxdos2)
$(DIST_QA_DOS2_BIN)/@assert: $(DIST_QA_DOS2_BIN)/@build $(DIST_QA_DOS2_BIN)/@assert: $(DIST_QA_DOS2_BIN)/@build

2
src/dist-qa-msx1/0module.mk
View file

@ -7,7 +7,7 @@ DIST_QA_MSX1_MACHINE ?= Canon_V-20
$(call mb_make_call,mb_doc_variable,DIST_QA_MSX1_MACHINE,"The machine to run the msx1 qa module on.") $(call mb_make_call,mb_doc_variable,DIST_QA_MSX1_MACHINE,"The machine to run the msx1 qa module on.")
$(call mb_make_call,mb_tool_clone_flow_deps,$(DIST_QA_MSX1_BIN),$(DIST_BIN),$(DIST_DEPS),$(DIST_QA_MSX1_MACHINE)) $(call mb_make_call,mb_flow_clone_deps,$(DIST_QA_MSX1_BIN),$(DIST_BIN),$(DIST_DEPS),$(DIST_QA_MSX1_MACHINE))
$(DIST_QA_MSX1_BIN)/@assert: $(DIST_QA_MSX1_BIN)/@build $(DIST_QA_MSX1_BIN)/@assert: $(DIST_QA_MSX1_BIN)/@build
_$(MB_ᕽᕽᕽ　　)$(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSX1_BIN)/ahello1.out) _$(MB_ᕽᕽᕽ　　)$(call mb_make_call,mb_os_file_delete,$(DIST_QA_MSX1_BIN)/ahello1.out)

7
src/make-on-msx/0module.mk
View file

@ -47,10 +47,5 @@ _$(MB_ᕽᕽᕽ　　)$(call mb_make_call,mb_msxpipe_run_gui,$(MAKE_ON_MSX_BIN))
$(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_doc_target_run,$(MAKE_ON_MSX_BIN)/@run,"Run the make build manually.") $(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_doc_target_run,$(MAKE_ON_MSX_BIN)/@run,"Run the make build manually.")
$(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_target_phony,$(MAKE_ON_MSX_BIN)/@run) $(MB_ᕽᕽᕽ　　　)$(call mb_make_call,mb_make_target_phony,$(MAKE_ON_MSX_BIN)/@run)
$(call mb_make_call,mb_assert_flow_grep_binary,$(MAKE_ON_MSX_BIN),check-bin,nfbsshot.bin,screenshot) $(call mb_make_call,mb_flow_assert_grep_binary_test,$(MAKE_ON_MSX_BIN),check-bin,nfbsshot.bin,screenshot)
#$(MAKE_ON_MSX_BIN)/@assert-check-bin: $(MAKE_ON_MSX_BIN)/@build
# grep -U "screenshot" $(MAKE_ON_MSX_BIN)/nfbsshot.bin
#MB_DOC_FIRE_TARGET += $(call mb_make_call,mb_doc_target,$(MAKE_ON_MSX_BIN)/@assert-check-bin,"Asserts that binary contains screenshot string.")
#MB_PROJ_PHASE_TEST_DEPS += $(MAKE_ON_MSX_BIN)/@assert-check-bin
#$(call mb_make_call,mb_make_flag_phony,$(MAKE_ON_MSX_BIN)/@assert-check-bin)

2
src/mbboot80/0module.mk
View file

@ -3,7 +3,7 @@ MBBOOT80_SRC := $(call mb_make_call,mb_proj_module_path_src,$(PATH_SRC))
MBBOOT80_BIN := $(call mb_make_call,mb_proj_module_path_bin,$(PATH_SRC),$(PATH_BIN)) MBBOOT80_BIN := $(call mb_make_call,mb_proj_module_path_bin,$(PATH_SRC),$(PATH_BIN))
$(call mb_make_call,mb_tool_sdcc_flow_bdos_mono,$(MBBOOT80_BIN),$(MBBOOT80_SRC),mbboot80) $(call mb_make_call,mb_flow_sdcc_bdos_mono,$(MBBOOT80_BIN),$(MBBOOT80_SRC),mbboot80)
$(call mb_make_call,mb_assert_flow_bdos_grep,$(MBBOOT80_BIN),check-boot80,mbboot80,"mb::boot mode 80") $(call mb_make_call,mb_assert_flow_bdos_grep,$(MBBOOT80_BIN),check-boot80,mbboot80,"mb::boot mode 80")