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

Compare commits

base: arch-msx:a0141d962c5c28efad028c7bf63d6e7ca8256f59
Branches Tags
arch-msx:master
arch-msx:test_ci_parallel_build
arch-msx:test_ci_fail_match
arch-msx:test_ci_fail_hang
arch-msx:test_ci_fail_boot
..
compare: arch-msx:360e12c9e931284debeb813bb23c6b484e3ebc22
Branches Tags
arch-msx:master
arch-msx:test_ci_parallel_build
arch-msx:test_ci_fail_match
arch-msx:test_ci_fail_hang
arch-msx:test_ci_fail_boot

3 commits
a0141d962c ... 360e12c9e9

Author SHA1 Message Date
Willem
360e12c9e9 Deleted left over.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in 4s
Details
2024-07-17 23:19:36 +02:00
Willem
661097a30b Converted make4msx to flow project. 2024-07-17 23:19:23 +02:00
Willem
646c92f46b Fixed module @test deps. 2024-07-17 23:17:34 +02:00
5 changed files with 27 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@
define __mb-flow-assert-grep-binary-x define __mb-flow-assert-grep-binary-x
.RECIPEPREFIX := $(MB_@RECIPE) .RECIPEPREFIX := $(MB_@RECIPE)
$(1)/@@$(5)-deps:: $(1)/@assert/$(5)/$(2) $(1)/@$(5)-deps:: $(1)/@assert/$(5)/$(2)
$(1)/@assert/$(5)/$(2): $(1)/@build $(1)/@assert/$(5)/$(2): $(1)/@build
$(MB_@RECIPE)grep -q -U $(4) $(1)/$(3) $(MB_@RECIPE)grep -q -U $(4) $(1)/$(3)

4
lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk
View file

@ -290,7 +290,7 @@ define __mb-flow-proj-module-run
$(1)/@run: $(1)/@build $(1)/@run: $(1)/@build
$(MB_@RECIPE)$$(call mb-make-call,mb-msxpipe-run-gui,$(1),,$(2)) $(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 with gui.) $(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-make-target-phony,$(1)/@run) $(MB_α•½α•½α•½γ€€γ€€γ€€)$$(call mb-make-call,mb-make-target-phony,$(1)/@run)
.RECIPEPREFIX := $(MB_@RECIPEPREFIX) .RECIPEPREFIX := $(MB_@RECIPEPREFIX)
@ -307,7 +307,7 @@ define __mb-flow-proj-prepare-packages
.RECIPEPREFIX := $(MB_@RECIPE) .RECIPEPREFIX := $(MB_@RECIPE)
$(1)/@@prepare-deps:: $(1)/@msxhub/$(2) $(1)/@@prepare-deps:: $(1)/@msxhub/$(2)
$(1)/@msxhub/$(2): $(1)/@msxhub/$(2): @@module-msxhub
$(MB_@RECIPE)$$(if $$(wildcard $(1)$$(if $(3),/$(3))),,$$(call mb-make-call,mb-os-dir-create,$(1)$$(if $(3),/$(3)))) $(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_@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)) $(MB_α•½α•½α•½γ€€γ€€γ€€)$$(call mb-make-call,mb-make-target-phony,$(1)/@msxhub/$(2))

3
lib/msxbuild.mk
View file

@ -85,9 +85,10 @@ endif
MB_@INCLUDE_CHAIN := MB_@INCLUDE_CHAIN :=
# Glue phony targets to get internal @include tree (semi) correct (TODO: fix chain in: mb_flow_0module_setup) # 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 .PHONY: @include @@include-root @@include-libs @@include-mods @@include-parent @@include-tree @@module-msxhub
@@include-parent:: @@include-mods @@include-parent:: @@include-mods
@include:: @@include-libs @@include-root @include:: @@include-libs @@include-root
@@module-msxhub: @@include-libs
# Document our internal variables, now we have the functions loaded # 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.) $(MB_α•½α•½α•½γ€€)$(call mb-make-call,mb-doc-variable-rock,MB_@RECIPE,Recipe prefix to set and indent flow eval rules.)

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

@ -39,8 +39,6 @@ $(MB_α•½α•½α•½γ€€γ€€γ€€)$(call mb-make-call,mb-make-target-phony,$(ASSERT_MSXHUB
$(ASSERT_MSXHUB_BIN)/@assert: | $(ASSERT_MSXHUB_BIN) $(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-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-write-default,$(ASSERT_MSXHUB_BIN),336)
_$(MB_α•½α•½α•½γ€€γ€€)$(call mb-make-call,mb-autoexec-append-safe-assert,$(ASSERT_MSXHUB_BIN),dir utils > utils.out) _$(MB_α•½α•½α•½γ€€γ€€)$(call mb-make-call,mb-autoexec-append-safe-assert,$(ASSERT_MSXHUB_BIN),dir utils > utils.out)

42
src/example/hello-make4msx/0module000.mk
View file

@ -2,18 +2,22 @@
EXAMPLE_HELLO_MAKE4MSX_SRC := $(call mb-make-call,mb-make-module-path-src,$(PATH_SRC)) 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)) 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 #$(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)),,$(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_α•½α•½α•½γ€€γ€€)$(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-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-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-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-doc-target-deep,$(EXAMPLE_HELLO_MAKE4MSX_BIN))
$(MB_α•½α•½α•½γ€€γ€€γ€€)$(call mb-make-call,mb-make-target-phony,$(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) $(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.mac: $(EXAMPLE_HELLO_MAKE4MSX_SRC)/hello.mac | $(EXAMPLE_HELLO_MAKE4MSX_BIN)/@prepare
_$(MB_α•½α•½α•½γ€€γ€€)$(call mb-make-call,mb-conv-unix2dos,$<,$@) _$(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-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) $(MB_α•½α•½α•½γ€€γ€€γ€€)$(call mb-make-call,mb-proj-grow-deps-phase,@process,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.mac)
@ -36,17 +40,15 @@ _$(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) $(MB_α•½α•½α•½γ€€γ€€γ€€)$(call mb-make-call,mb-doc-target-deep,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.com)
$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build: $(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.com $(EXAMPLE_HELLO_MAKE4MSX_BIN)/@@build-deps:: $(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.) #$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build: $(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.com
$(MB_α•½α•½α•½γ€€γ€€γ€€)$(call mb-make-call,mb-proj-grow-deps-phase,@build,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build) #$(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-make-target-phony,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build) #$(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 #$(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-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-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) #$(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)