diff --git a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk index d40d334..63ec204 100644 --- a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk +++ b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk @@ -2,7 +2,7 @@ define __mb-flow-assert-grep-binary-x .RECIPEPREFIX := $(MB_@RECIPE) -$(1)/@$(5)-deps:: $(1)/@assert/$(5)/$(2) +$(1)/@@$(5)-deps:: $(1)/@assert/$(5)/$(2) $(1)/@assert/$(5)/$(2): $(1)/@build $(MB_@RECIPE)grep -q -U $(4) $(1)/$(3) diff --git a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk index a28ca33..e0183e2 100644 --- a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk +++ b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk @@ -290,7 +290,7 @@ define __mb-flow-proj-module-run $(1)/@run: $(1)/@build $(MB_@RECIPE)$$(call mb-make-call,mb-msxpipe-run-gui,$(1),,$(2)) -$(MB_ᕽᕽᕽ   )$$(call mb-make-call,mb-doc-target-run,$(1)/@run,Run manually $(notdir $(1)) with gui$(if $(2), on $(2).,.)) +$(MB_ᕽᕽᕽ   )$$(call mb-make-call,mb-doc-target-run,$(1)/@run,Run manually with gui.) $(MB_ᕽᕽᕽ   )$$(call mb-make-call,mb-make-target-phony,$(1)/@run) .RECIPEPREFIX := $(MB_@RECIPEPREFIX) @@ -307,7 +307,7 @@ define __mb-flow-proj-prepare-packages .RECIPEPREFIX := $(MB_@RECIPE) $(1)/@@prepare-deps:: $(1)/@msxhub/$(2) -$(1)/@msxhub/$(2): @@module-msxhub +$(1)/@msxhub/$(2): $(MB_@RECIPE)$$(if $$(wildcard $(1)$$(if $(3),/$(3))),,$$(call mb-make-call,mb-os-dir-create,$(1)$$(if $(3),/$(3)))) $(MB_@RECIPE)$$(call mb-make-call,mb-msxhub-get-$(2),$(1)$$(if $(3),/$(3))) $(MB_ᕽᕽᕽ   )$$(call mb-make-call,mb-make-target-phony,$(1)/@msxhub/$(2)) diff --git a/lib/msxbuild.mk b/lib/msxbuild.mk index e85d07f..7ae04c9 100644 --- a/lib/msxbuild.mk +++ b/lib/msxbuild.mk @@ -85,10 +85,9 @@ endif MB_@INCLUDE_CHAIN := # Glue phony targets to get internal @include tree (semi) correct (TODO: fix chain in: mb_flow_0module_setup) -.PHONY: @include @@include-root @@include-libs @@include-mods @@include-parent @@include-tree @@module-msxhub +.PHONY: @include @@include-root @@include-libs @@include-mods @@include-parent @@include-tree @@include-parent:: @@include-mods @include:: @@include-libs @@include-root -@@module-msxhub: @@include-libs # Document our internal variables, now we have the functions loaded $(MB_ᕽᕽᕽ )$(call mb-make-call,mb-doc-variable-rock,MB_@RECIPE,Recipe prefix to set and indent flow eval rules.) diff --git a/src/assert/msxhub/0module100.mk b/src/assert/msxhub/0module100.mk index 0d3b88e..7c53d6b 100644 --- a/src/assert/msxhub/0module100.mk +++ b/src/assert/msxhub/0module100.mk @@ -39,6 +39,8 @@ $(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-make-target-phony,$(ASSERT_MSXHUB $(ASSERT_MSXHUB_BIN)/@assert: | $(ASSERT_MSXHUB_BIN) +_$(MB_ᕽᕽᕽ  )$(call mb-make-call,mb-os-file-delete,$(ASSERT_MSXHUB_BIN)/ahello1.out) +_$(MB_ᕽᕽᕽ  )$(call mb-make-call,mb-os-file-delete,$(ASSERT_MSXHUB_BIN)/ahello2.out) _$(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) diff --git a/src/example/hello-make4msx/0module000.mk b/src/example/hello-make4msx/0module000.mk index fcb8035..84b6f36 100644 --- a/src/example/hello-make4msx/0module000.mk +++ b/src/example/hello-make4msx/0module000.mk @@ -2,22 +2,18 @@ EXAMPLE_HELLO_MAKE4MSX_SRC := $(call mb-make-call,mb-make-module-path-src,$(PATH_SRC)) EXAMPLE_HELLO_MAKE4MSX_BIN := $(call mb-make-call,mb-make-module-path-bin,$(PATH_SRC),$(PATH_BIN)) -$(call mb-make-call,mb-flow-proj-setup,$(EXAMPLE_HELLO_MAKE4MSX_BIN),@init,$(EXAMPLE_HELLO_MAKE4MSX_BIN)) -$(call mb-make-call,mb-flow-proj-module-run,$(EXAMPLE_HELLO_MAKE4MSX_BIN)) -$(call mb-make-call,mb-flow-proj-prepare-packages,$(EXAMPLE_HELLO_MAKE4MSX_BIN),make macro80 z80asmuk,utils) -$(call mb-make-call,mb-flow-assert-grep-binary-test,$(EXAMPLE_HELLO_MAKE4MSX_BIN),check-bin,hello.com,MAKE) -#$(EXAMPLE_HELLO_MAKE4MSX_BIN): | @init -#_$(MB_ᕽᕽᕽ  )$(if $(wildcard $(EXAMPLE_HELLO_MAKE4MSX_BIN)),,$(call mb-make-call,mb-os-dir-create,$(EXAMPLE_HELLO_MAKE4MSX_BIN))) -#_$(MB_ᕽᕽᕽ  )$(if $(wildcard $(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils),,$(call mb-make-call,mb-os-dir-create,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils)) -#_$(MB_ᕽᕽᕽ  )$(call mb-make-call,mb-msxhub-get-make,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils) -#_$(MB_ᕽᕽᕽ  )$(call mb-make-call,mb-msxhub-get-macro80,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils) -#_$(MB_ᕽᕽᕽ  )$(call mb-make-call,mb-msxhub-get-z80asmuk,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils) -#$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-doc-target-deep,$(EXAMPLE_HELLO_MAKE4MSX_BIN)) -#$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_HELLO_MAKE4MSX_BIN)) +$(EXAMPLE_HELLO_MAKE4MSX_BIN): | @init +_$(MB_ᕽᕽᕽ  )$(if $(wildcard $(EXAMPLE_HELLO_MAKE4MSX_BIN)),,$(call mb-make-call,mb-os-dir-create,$(EXAMPLE_HELLO_MAKE4MSX_BIN))) +_$(MB_ᕽᕽᕽ  )$(if $(wildcard $(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils),,$(call mb-make-call,mb-os-dir-create,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils)) +_$(MB_ᕽᕽᕽ  )$(call mb-make-call,mb-msxhub-get-make,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb-make-call,mb-msxhub-get-macro80,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils) +_$(MB_ᕽᕽᕽ  )$(call mb-make-call,mb-msxhub-get-z80asmuk,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils) +$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-doc-target-deep,$(EXAMPLE_HELLO_MAKE4MSX_BIN)) +$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_HELLO_MAKE4MSX_BIN)) -$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.mac: $(EXAMPLE_HELLO_MAKE4MSX_SRC)/hello.mac | $(EXAMPLE_HELLO_MAKE4MSX_BIN)/@prepare +$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.mac: $(EXAMPLE_HELLO_MAKE4MSX_SRC)/hello.mac | $(EXAMPLE_HELLO_MAKE4MSX_BIN) _$(MB_ᕽᕽᕽ  )$(call mb-make-call,mb-conv-unix2dos,$<,$@) $(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-doc-target-deep,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.mac) $(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-proj-grow-deps-phase,@process,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.mac) @@ -40,15 +36,17 @@ _$(MB_ᕽᕽᕽ  )$(call mb-make-call,mb-msxpipe-safe-cmd,$(EXAMPLE_HELLO_MA $(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-doc-target-deep,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.com) -$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@@build-deps:: $(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.com -#$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build: $(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.com -#$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-doc-target,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build,Compiles binary with make on msx.) -#$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-proj-grow-deps-phase,@build,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build) -#$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build) +$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build: $(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.com +$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-doc-target,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build,Compiles binary with make on msx.) +$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-proj-grow-deps-phase,@build,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build) +$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build) -#$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@run: $(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build -#_$(MB_ᕽᕽᕽ  )$(call mb-make-call,mb-msxpipe-run-gui,$(EXAMPLE_HELLO_MAKE4MSX_BIN)) -#$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-doc-target-run,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@run,Run the make build manually.) -#$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@run) +$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@run: $(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build +_$(MB_ᕽᕽᕽ  )$(call mb-make-call,mb-msxpipe-run-gui,$(EXAMPLE_HELLO_MAKE4MSX_BIN)) +$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-doc-target-run,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@run,Run the make build manually.) +$(MB_ᕽᕽᕽ   )$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@run) + + +$(call mb-make-call,mb-flow-assert-grep-binary-test,$(EXAMPLE_HELLO_MAKE4MSX_BIN),check-bin,hello.com,MAKE)