From d8319f15f7b61488120368f3d5f50fc99ace6949 Mon Sep 17 00:00:00 2001 From: Willem Date: Sun, 7 Jul 2024 14:48:12 +0200 Subject: [PATCH] Added dist proces dep and allignment of text. --- lib/make/mb_assert.mk | 4 ++-- src/dist-qa-dos1/0module.mk | 2 +- src/dist-qa-msx1/0module.mk | 2 +- src/dist-qa-msxhub/0module.mk | 2 +- src/dist/0module.mk | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/make/mb_assert.mk b/lib/make/mb_assert.mk index 7048229..9657706 100644 --- a/lib/make/mb_assert.mk +++ b/lib/make/mb_assert.mk @@ -3,7 +3,7 @@ define mb_assert_flow_grep_binary $(1)/@assert-$(2): $(1)/@build grep -q -U $(4) $(1)/$(3) - $$(call mb_make_call,mb_make_echo_assert,Assert succes @assert-$(2)) + $$(call mb_make_call,mb_make_echo_assert,Assert succesfully @assert-$(2)) MB_DOC_FIRE_TARGET += $$(call mb_doc_target,$(1)/@assert-$(2),"Asserts that $(3) output matches.") MB_PROJ_PHASE_TEST_DEPS += $(1)/@assert-$(2) .PHONY: $(1)/@assert-$(2) @@ -17,7 +17,7 @@ $(1)-test-$(2)/@assert: $(1)/@build $$(call mb_copy,$(1)/$(3).com,$(1)-test-$(2)) $$(call mb_msxpipe_safe_test,$(1)-test-$(2),$(3) > $(3).out) grep -q $(4) $(1)-test-$(2)/$(3).out - $$(call mb_make_call,mb_make_echo_assert,Assert succes $(1)-test-$(2)/@assert) + $$(call mb_make_call,mb_make_echo_assert,Assert succesfully $(1)-test-$(2)/@assert) MB_DOC_FIRE_TARGET += $$(call mb_doc_target,$(1)-test-$(2)/@assert,"Asserts that $(3) output matches.") MB_PROJ_PHASE_TEST_DEPS += $(1)-test-$(2)/@assert .PHONY: $(1)-test-$(2)/@assert diff --git a/src/dist-qa-dos1/0module.mk b/src/dist-qa-dos1/0module.mk index eac1b23..f8b56c1 100644 --- a/src/dist-qa-dos1/0module.mk +++ b/src/dist-qa-dos1/0module.mk @@ -26,7 +26,7 @@ $(DIST_QA_DOS1_BIN)/@assert: | $(DIST_QA_DOS1_DEPS) $(call mb_autoexec_append_safe_test,$(DIST_QA_DOS1_BIN),ahello2) $(call mb_autoexec_append_exit,$(DIST_QA_DOS1_BIN)) $(call mb_openmsx_dosctl,$(DIST_QA_DOS1_BIN)) - $(call mb_make_call,mb_make_echo_assert,Assert succes $(DIST_QA_DOS1_BIN)/@assert) + $(call mb_make_call,mb_make_echo_assert,Assert succesfully $(DIST_QA_DOS1_BIN)/@assert) MB_DOC_FIRE_TARGET += $(call mb_make_call,mb_doc_target,$(DIST_QA_DOS1_BIN)/@assert,"Assert binaries on msxdos1.") MB_PROJ_PHASE_PACKAGE_QA_DEPS += $(DIST_QA_DOS1_BIN)/@assert .PHONY: $(DIST_QA_DOS1_BIN)/@assert diff --git a/src/dist-qa-msx1/0module.mk b/src/dist-qa-msx1/0module.mk index f166e3f..b12affd 100644 --- a/src/dist-qa-msx1/0module.mk +++ b/src/dist-qa-msx1/0module.mk @@ -31,7 +31,7 @@ $(DIST_QA_MSX1_BIN)/@assert: | $(DIST_QA_MSX1_DEPS) $(call mb_make_call,mb_openmsx_dosctl,$(DIST_QA_MSX1_BIN),$(DIST_QA_MSX1_MACHINE)) grep -q "M80: Hello world..." $(DIST_QA_MSX1_BIN)/ahello1.out grep -q "SDCC: Hello world..." $(DIST_QA_MSX1_BIN)/ahello2.out - $(call mb_make_call,mb_make_echo_assert,Assert succes $(DIST_QA_MSX1_BIN)/@assert) + $(call mb_make_call,mb_make_echo_assert,Assert succesfully $(DIST_QA_MSX1_BIN)/@assert) MB_DOC_FIRE_TARGET += $(call mb_make_call,mb_doc_target,$(DIST_QA_MSX1_BIN)/@assert,"Assert binaries on MSX1 machine.") MB_PROJ_PHASE_PACKAGE_QA_DEPS += $(DIST_QA_MSX1_BIN)/@assert .PHONY: $(DIST_QA_MSX1_BIN)/@assert diff --git a/src/dist-qa-msxhub/0module.mk b/src/dist-qa-msxhub/0module.mk index bbd92d8..8295902 100644 --- a/src/dist-qa-msxhub/0module.mk +++ b/src/dist-qa-msxhub/0module.mk @@ -57,7 +57,7 @@ $(DIST_QA_MSXHUB_BIN)/@assert: | $(DIST_QA_MSXHUB_DEPS) grep -q "SDCC: Hello world..." $(DIST_QA_MSXHUB_BIN)/ahello2.out grep -q "KONPASS COM" $(DIST_QA_MSXHUB_BIN)/utils.out grep -q "MAKE COM" $(DIST_QA_MSXHUB_BIN)/utils.out - $(call mb_make_call,mb_make_echo_assert,Assert succes $(DIST_QA_MSXHUB_BIN)/@assert) + $(call mb_make_call,mb_make_echo_assert,Assert succesfully $(DIST_QA_MSXHUB_BIN)/@assert) MB_DOC_FIRE_TARGET += $(call mb_make_call,mb_doc_target,$(DIST_QA_MSXHUB_BIN)/@assert,"Asserts that all dist artifacts execute results.") MB_PROJ_PHASE_TEST_DEPS += $(DIST_QA_MSXHUB_BIN)/@assert .PHONY: $(DIST_QA_MSXHUB_BIN)/@assert diff --git a/src/dist/0module.mk b/src/dist/0module.mk index 6dd3d55..c0fdc28 100644 --- a/src/dist/0module.mk +++ b/src/dist/0module.mk @@ -10,6 +10,7 @@ $(DIST_BIN): | @init $(DIST_BIN)/readme.txt: $(DIST_SRC)/readme.txt | $(DIST_BIN) $(call mb_conv_unix2dos,$<,$@) +MB_PROJ_PHASE_PROCESS_DEPS += $(DIST_BIN)/readme.txt $(DIST_BIN)/ahello1.com: bin/ahello-m80/ahello.com | $(DIST_BIN) $(call mb_copy,$<,$@)