diff --git a/lib/make/天房系統擴展/mb_autoexec.mk b/lib/make/天房系統擴展/mb_autoexec.mk index 23cdf6f..0ecf69f 100644 --- a/lib/make/天房系統擴展/mb_autoexec.mk +++ b/lib/make/天房系統擴展/mb_autoexec.mk @@ -155,7 +155,7 @@ endef define mb-autoexec-write-default -$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-os-echo-remark,$(MB_I18N_AUTOEXEC_WRITE) $@) +$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-os-echo-remark,$(MB_I18N_AUTOEXEC_WRITE) $(1)) $(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-os-file-empty,$(1)/autoexec.bat) $(MB_ᕽᕽᕽ   )$(if $(wildcard $(1)/utils),$(call mb-make-call,_mb-autoexec-write-preboot,$(1),utils\,$(2),$(3)),$(call mb-make-call,_mb-autoexec-write-preboot,$(1),,$(2),$(3))) $(MB_ᕽᕽᕽ   )$(if $(filter on,$(MB_AUTOEXEC_SHOW_HOST)),$(call mb-make-call,mb-autoexec-append-cmd,$(1),omsxctl boot_exec_show_host)) diff --git a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk index e15344f..abb4b28 100644 --- a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk +++ b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk @@ -5,7 +5,7 @@ define __mb-flow-assert-grep-binary-x $(1)/@assert/$(5)/@$(2): $(1)/@$(5) $(MB_@RECIPE)@echo -n "$(MB_I18N_OS_CRAYON_TAG) " $(MB_@RECIPE)grep --colour$(MB_MAKE_EQUALS)auto -U "$(4)" $(1)/$(3) -$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-assert,$$(MB_I18N_ASSERT_SUCCESS) $(1)/@assert/$(2)/@$(5)) +$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-assert,$$(MB_I18N_ASSERT_SUCCESS) $(1)/@assert/$(5)/@$(2)) $(MB_@RECIPE)$$(call mb-make-call,mb-proj-grow-assert-success,$(5)) $(MB_ᕽᕽᕽ   )$$(call mb-make-call,mb-doc-target-assert,$(1)/@assert/$(5)/@$(2),Asserts that $(3) output matches.) $(MB_ᕽᕽᕽ   )$$(call mb-make-call,mb-make-target-phony,$(1)/@assert/$(5)/@$(2)) @@ -34,25 +34,30 @@ $(MB_@RECIPE)$$(if $$(wildcard $(7)/$(3).out),,$$(call mb-make-call,mb-os-file-d $(MB_@RECIPE)$$(call mb-make-call,mb-msxpipe-safe-assert,$(7),$(3) > $(3).out,$(6)) $(MB_@RECIPE)@echo -n "$(MB_I18N_OS_CRAYON_TAG) " $(MB_@RECIPE)grep --colour$(MB_MAKE_EQUALS)auto "$(4)" $(7)/$(3).out -$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-assert,$$(MB_I18N_ASSERT_SUCCESS) $(1)/@assert/$(2)/@$(5)) +$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-assert,$$(MB_I18N_ASSERT_SUCCESS) $(1)/@assert/$(5)/@$(2)) $(MB_@RECIPE)$$(call mb-make-call,mb-proj-grow-assert-success,$(5)) $(MB_ᕽᕽᕽ   )$$(call mb-make-call,mb-doc-target-assert,$(1)/@assert/$(5)/@$(2),Asserts that $(3) output matches.) $(MB_ᕽᕽᕽ   )$$(call mb-make-call,mb-make-target-phony,$(1)/@assert/$(5)/@$(2)) $(MB_ᕽᕽᕽ   )$$(call mb-make-call,mb-proj-grow-deps-phase,$(5),$(1)/@assert/$(5)/@$(2)) +# Add phase dep link in source project build phase target $(1)/@$(5)-deps:: $(1)/@assert/$(5)/@$(2) + +# (extra) Add local phase dep link in clone poject for build phase target +$(7)/@$(5)-deps:: $(1)/@assert/$(5)/@$(2) + .RECIPEPREFIX := $(MB_@RECIPEPREFIX) endef define mb-flow-assert-msxpipe-grep-test $(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-make-check-arg5,$(0),$(1),$(2),$(3),$(4),$(5)) -$(MB_ᕽᕽᕽ   )$(eval $(call mb-make-call,mb-flow-clone-deps-proj-setup-orphan,$(1)$(MB_@WORK)_assert/$(notdir $(1))/test-$(3),$(1),$(2),$(6),$(7))) -$(MB_ᕽᕽᕽ   )$(eval $(call mb-make-call,__mb-flow-assert-msxpipe-grep-x,$(1),$(3),$(4),$(5),@test,$(7),$(1)$(MB_@WORK)_assert/$(notdir $(1))/test-$(3))) +$(MB_ᕽᕽᕽ   )$(eval $(call mb-make-call,mb-flow-clone-deps-proj-setup-orphan,$(subst $(abspath $(dir $(1)))/,,$(dir $(1))$(abspath $(1)$(MB_@WORK)_assert_test/$(notdir $(1))/$(3))),$(1),$(2),$(6),$(7))) +$(MB_ᕽᕽᕽ   )$(eval $(call mb-make-call,__mb-flow-assert-msxpipe-grep-x,$(1),$(3),$(4),$(5),@test,$(7),$(subst $(abspath $(dir $(1)))/,,$(dir $(1))$(abspath $(1)$(MB_@WORK)_assert_test/$(notdir $(1))/$(3))))) endef $(call mb-make-call,mb-doc-function-flow,mb-flow-assert-msxpipe-grep-test,Inject flow of single grep assert., [packages] [machine]) define mb_flow-assert-msxpipe-grep-package-qa $(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-make-check-arg5,$(0),$(1),$(2),$(3),$(4),$(5)) -$(MB_ᕽᕽᕽ   )$(eval $(call mb-make-call,mb-flow-clone-deps-proj-setup-orphan,$(1)$(MB_@WORK)_assert/$(notdir $(1))/package-qa-$(3),$(1),$(2),$(6),$(7))) -$(MB_ᕽᕽᕽ   )$(eval $(call mb-make-call,__mb-flow-assert-msxpipe-grep-x,$(1),$(3),$(4),$(5),@package-qa,$(7),$(1)$(MB_@WORK)_assert/$(notdir $(1))/package-qa-$(3))) +$(MB_ᕽᕽᕽ   )$(eval $(call mb-make-call,mb-flow-clone-deps-proj-setup-orphan,$(subst $(abspath $(dir $(1)))/,,$(dir $(1))$(abspath $(1)$(MB_@WORK)_assert_package_qa/$(notdir $(1))/$(3))),$(1),$(2),$(6),$(7))) +$(MB_ᕽᕽᕽ   )$(eval $(call mb-make-call,__mb-flow-assert-msxpipe-grep-x,$(1),$(3),$(4),$(5),@package-qa,$(7),$(subst $(abspath $(dir $(1)))/,,$(dir $(1))$(abspath $(1)$(MB_@WORK)_assert_package_qa/$(notdir $(1))/$(3))))) endef $(call mb-make-call,mb-doc-function-flow,mb-flow-assert-msxpipe-grep-package-qa,Inject flow of single grep assert., [packages] [machine])