From 4e27098c3ba687ec442f33b4466e98d1d4d6d5a0 Mon Sep 17 00:00:00 2001 From: Willem Date: Wed, 17 Jul 2024 12:46:31 +0200 Subject: [PATCH] Moved doc out of shell and made include 18 bit to remove binary. --- lib/make/सिस्टमₚᵣₐᵧToੴ/mb_doc.mk | 47 ++++--- lib/make/सिस्टमₚᵣₐᵧToੴ/mb_make_xml.mk | 10 +- lib/make/𓃬𓍄𓋹𓀭/mb_flow_help.mk | 130 +++++++----------- .../{mb_flow_0module.mk => mb_flow_nx01.mk} | 15 +- lib/msxbuild.mk | 14 +- 5 files changed, 100 insertions(+), 116 deletions(-) rename lib/make/𓃬𓍄𓋹𓀭/{mb_flow_0module.mk => mb_flow_nx01.mk} (53%) diff --git a/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_doc.mk b/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_doc.mk index 6551560..31197cb 100644 --- a/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_doc.mk +++ b/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_doc.mk @@ -1,44 +1,44 @@ -MB_DOC_FIRE_VARIABLE_FLOW ?= \\n +MB_DOC_FIRE_VARIABLE_FLOW ?= \n #*** Recursive variable: MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_VARIABLE_FLOW,Flow builder of fire flow variable data.) -MB_DOC_FIRE_VARIABLE ?= \\n +MB_DOC_FIRE_VARIABLE ?= \n MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_VARIABLE,Flow builder of firemake variable data.) -MB_DOC_FIRE_VARIABLE_DEEP ?= \\n +MB_DOC_FIRE_VARIABLE_DEEP ?= \n MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_VARIABLE_DEEP,Flow builder of makefire deep variable data.) -MB_DOC_FIRE_VARIABLE_ROCK ?= \\n +MB_DOC_FIRE_VARIABLE_ROCK ?= \n MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_VARIABLE_ROCK,Flow builder of makefire rock variable data.) -MB_DOC_FIRE_VARIABLE_I18N ?= \\n +MB_DOC_FIRE_VARIABLE_I18N ?= \n MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_VARIABLE_I18N,Flow builder of makefire i18n variable data.) -MB_DOC_FIRE_FUNCTION ?= \\n +MB_DOC_FIRE_FUNCTION ?= \n MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_FUNCTION,Flow builder of firemake function data.) -MB_DOC_FIRE_FUNCTION_DEEP ?= \\n +MB_DOC_FIRE_FUNCTION_DEEP ?= \n MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_FUNCTION_DEEP,Flow builder of firemake deep function data.) -MB_DOC_FIRE_FUNCTION_FLOW ?= \\n +MB_DOC_FIRE_FUNCTION_FLOW ?= \n MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_FUNCTION_FLOW,Flow builder of firemake flow function data.) -MB_DOC_FIRE_TARGET ?= \\n +MB_DOC_FIRE_TARGET ?= \n MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_TARGET,Flow builder of firemake target data.) -MB_DOC_FIRE_TARGET_DEEP ?= \\n +MB_DOC_FIRE_TARGET_DEEP ?= \n MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_TARGET_DEEP,Flow builder of firemake deep target data.) -MB_DOC_FIRE_TARGET_RUN ?= \\n +MB_DOC_FIRE_TARGET_RUN ?= \n MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_TARGET_RUN,Flow builder of firemake run target data.) -MB_DOC_FIRE_TARGET_MODULE ?= \\n +MB_DOC_FIRE_TARGET_MODULE ?= \n MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_TARGET_MODULE,Flow builder of firemake module target data.) -MB_DOC_FIRE_TARGET_ASSERT ?= \\n +MB_DOC_FIRE_TARGET_ASSERT ?= \n MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_TARGET_ASSERT,Flow builder of firemake assert target data.) -MB_DOC_FIRE_TARGET_HELP ?= \\n +MB_DOC_FIRE_TARGET_HELP ?= \n MB_DOC_FIRE_VARIABLE_FLOW += $(call mb-make-call,_mb-doc-variable4u-flow,MB_DOC_FIRE_TARGET_HELP,Flow builder of firemake help data.) MB_DOC_XML_ROOT := firemake @@ -59,21 +59,20 @@ MB_DOC_FIRE_VARIABLE_ROCK += $(call mb-make-call,_mb-doc-variable4u-rock,MB_DOC_ MB_DOC_XML_TAG_VALUE := value MB_DOC_FIRE_VARIABLE_ROCK += $(call mb-make-call,_mb-doc-variable4u-rock,MB_DOC_XML_TAG_VALUE,XML value tag for firemake output.) +#MB_DOC_XML_TAG_MACHINE := machine +#MB_DOC_FIRE_VARIABLE_ROCK += $(call mb-make-call,_mb-doc-variable4u-rock,MB_DOC_XML_TAG_MACHINE,XML machine tag for firemake output.) + # rename now internal: _MB_DOC_FORMAT MB_DOC_FORMAT ?= txt #MB_DOC_FIRE_VARIABLE_DEEP += $(call mb-make-call,_mb-doc-variable4u-deep,MB_DOC_FORMAT,Output format of documention$(MB_MAKE_COMMA) only 'txt' or 'xml' is supported.) -define _escape -$(MB_ᕽᕽᕽ　　　)$(subst ;,';',$(subst <,'<',$(subst >,'>',$(subst \\n,\\\n,$(subst ',"'","$(1)"))))) -endef - define _mb-doc-variable-txt -$(MB_ᕽᕽᕽ　　　)"* $(2)$(MB_MAKE_EQUALS)$(call mb-make-call,_escape,$(4))\\n$(if $(3),\\t$(call mb-make-call,_escape,$(3))\\n)\\n" +$(MB_ᕽᕽᕽ　　　)* $(2)$(MB_MAKE_EQUALS)$(4)\n$(if $(3),\t$(3)\n)\n endef define _mb-doc-variable-xml -$(MB_ᕽᕽᕽ　　　)\\n\\t$(call mb-make-call,mb-make-xml-open,variable,$(MB_DOC_XML_ATTR_NAME),$(2),$(MB_DOC_XML_ATTR_LEVEL),$(1))\\n\\t\\t$(call mb-make-call,mb-make-xml-tag-value,$(MB_DOC_XML_TAG_VALUE),$(4))\\n\\t\\t$(call mb-make-call,mb-make-xml-tag-value,$(MB_DOC_XML_TAG_DESC),$(3))\\n\\t$(call mb-make-call,mb-make-xml-close,variable) +$(MB_ᕽᕽᕽ　　　)\n\t$(call mb-make-call,mb-make-xml-open,variable,$(MB_DOC_XML_ATTR_NAME),$(2),$(MB_DOC_XML_ATTR_LEVEL),$(1))\n\t\t$(call mb-make-call,mb-make-xml-tag-value,$(MB_DOC_XML_TAG_VALUE),$(4))\n\t\t$(call mb-make-call,mb-make-xml-tag-value,$(MB_DOC_XML_TAG_DESC),$(3))\n\t$(call mb-make-call,mb-make-xml-close,variable) endef define _mb-doc-variable4u-deep $(MB_ᕽᕽᕽ　　　)$(call mb-make-call,_mb-doc-variable-$(MB_DOC_FORMAT),deep,$(1),$(2),$($(1))) @@ -110,10 +109,10 @@ MB_DOC_FIRE_FUNCTION_DEEP += $(call mb-make-call,_mb-doc-function4u-deep,mb-doc- define _mb-doc-function-txt -$(MB_ᕽᕽᕽ　　　)"* $(2) $(if $(4),$(MB_MAKE_EQUALS) $(call mb-make-call,_escape,$(4)))$(if $(3),\\n\\t$(call mb-make-call,_escape,$(3))\\n)\\n" +$(MB_ᕽᕽᕽ　　　)* $(2) $(if $(4),$(MB_MAKE_EQUALS) $(4))$(if $(3),\n\t$(3)\n)\n endef define _mb-doc-function-xml -$(MB_ᕽᕽᕽ　　　)\\n\\t$(call mb-make-call,mb-make-xml-open,function,$(MB_DOC_XML_ATTR_NAME),$(2),$(MB_DOC_XML_ATTR_LEVEL),$(1))\\n\\t\\t$(call mb-make-call,mb-make-xml-tag-value,$(MB_DOC_XML_TAG_ARGS),$(4))\\n\\t\\t$(call mb-make-call,mb-make-xml-tag-value,$(MB_DOC_XML_TAG_DESC),$(3))\\n\\t$(call mb-make-call,mb-make-xml-close,function) +$(MB_ᕽᕽᕽ　　　)\n\t$(call mb-make-call,mb-make-xml-open,function,$(MB_DOC_XML_ATTR_NAME),$(2),$(MB_DOC_XML_ATTR_LEVEL),$(1))\n\t\t$(call mb-make-call,mb-make-xml-tag-value,$(MB_DOC_XML_TAG_ARGS),$(4))\n\t\t$(call mb-make-call,mb-make-xml-tag-value,$(MB_DOC_XML_TAG_DESC),$(3))\n\t$(call mb-make-call,mb-make-xml-close,function) endef define _mb-doc-function4u-deep $(MB_ᕽᕽᕽ　　　)$(call mb-make-call,_mb-doc-function-$(MB_DOC_FORMAT),deep,$(1),$(2),$(3)) @@ -136,10 +135,10 @@ MB_DOC_FIRE_FUNCTION_DEEP += $(call mb-make-call,_mb-doc-function4u-deep,mb-doc- define _mb-doc-target-txt -$(MB_ᕽᕽᕽ　　　)"* $(2)$(if $(3),\\n\\t$(call mb-make-call,_escape,$(3)))\\n\\n" +$(MB_ᕽᕽᕽ　　　)* $(2)$(if $(3),\n\t$(3))\n\n endef define _mb-doc-target-xml -$(MB_ᕽᕽᕽ　　　)\\n\\t$(call mb-make-call,mb-make-xml-open,target,$(MB_DOC_XML_ATTR_NAME),$(2),$(MB_DOC_XML_ATTR_LEVEL),$(1))$(if $3,\\n\\t\\t$(call mb-make-call,mb-make-xml-tag-value,$(MB_DOC_XML_TAG_DESC),$(3))\\n\\t$(call mb-make-call,mb-make-xml-close,target),\\n\\t$(call mb-make-call,mb-make-xml-close,target)) +$(MB_ᕽᕽᕽ　　　)\n\t$(call mb-make-call,mb-make-xml-open,target,$(MB_DOC_XML_ATTR_NAME),$(2),$(MB_DOC_XML_ATTR_LEVEL),$(1))$(if $3,\n\t\t$(call mb-make-call,mb-make-xml-tag-value,$(MB_DOC_XML_TAG_DESC),$(3))\n\t$(call mb-make-call,mb-make-xml-close,target),\n\t$(call mb-make-call,mb-make-xml-close,target)) endef define mb-doc-target $(MB_ᕽᕽᕽ　　　)$(eval MB_DOC_FIRE_TARGET += $$(call mb-make-call,_mb-doc-target-$$(MB_DOC_FORMAT),build,$(1),$(2))) diff --git a/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_make_xml.mk b/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_make_xml.mk index 43552dc..ce44d34 100644 --- a/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_make_xml.mk +++ b/lib/make/सिस्टमₚᵣₐᵧToੴ/mb_make_xml.mk @@ -13,25 +13,25 @@ $(call mb-make-call,mb-doc-variable-rock,MB_MAKE_XML_CDATA_END,Expanded special define _escape-xml-attr -$(MB_ᕽᕽᕽ　　　)$(subst <,\u0026lt\u003B,$(subst >,\u003Cgt\u003B,$(subst $(MB_MAKE_XML_CDATA_START),,$(subst $(MB_MAKE_XML_CDATA_END),,"$(1)")))) +$(MB_ᕽᕽᕽ　　　)$(subst <,<,$(subst >,>,$(subst $(MB_MAKE_XML_CDATA_START),,$(subst $(MB_MAKE_XML_CDATA_END),,$(1))))) endef define mb-make-xml-open -$(MB_ᕽᕽᕽ　　　)"$(MB_MAKE_XML_LT)"$(1)$(if $(2), $(2)$(MB_MAKE_EQUALS)\"$(call mb-make-call,_escape-xml-attr,$(3))\")$(if $(4), $(4)$(MB_MAKE_EQUALS)\"$(call mb-make-call,_escape-xml-attr,$(5))\")"$(MB_MAKE_XML_GT)" +$(MB_ᕽᕽᕽ　　　)$(MB_MAKE_XML_LT)$(1)$(if $(2), $(2)$(MB_MAKE_EQUALS)\"$(call mb-make-call,_escape-xml-attr,$(3))\")$(if $(4), $(4)$(MB_MAKE_EQUALS)\"$(call mb-make-call,_escape-xml-attr,$(5))\")$(MB_MAKE_XML_GT) endef $(call mb-make-call,mb-doc-function-deep,mb-make-xml-open,Print xml open tag., [attr1-name] [attr1-value] [attr2-name] [attr2-value]) define mb-make-xml-close -$(MB_ᕽᕽᕽ　　　)"$(MB_MAKE_XML_LT)"/$(1)"$(MB_MAKE_XML_GT)" +$(MB_ᕽᕽᕽ　　　)$(MB_MAKE_XML_LT)/$(1)$(MB_MAKE_XML_GT) endef $(call mb-make-call,mb-doc-function-deep,mb-make-xml-close,Print xml close tag.,) define _escape-xml-value -$(MB_ᕽᕽᕽ　　　)$(subst <,\u003C,$(subst >,\u003E,$(subst $(MB_MAKE_XML_CDATA_START),,$(subst $(MB_MAKE_XML_CDATA_END),,"$(1)")))) +$(MB_ᕽᕽᕽ　　　)$(subst $(MB_MAKE_XML_CDATA_START),,$(subst $(MB_MAKE_XML_CDATA_END),,$(1))) endef define mb-make-xml-value -$(MB_ᕽᕽᕽ　　　)"$(MB_MAKE_XML_CDATA_START)"$(call mb-make-call,_escape-xml-value,$(1))"$(MB_MAKE_XML_CDATA_END)" +$(MB_ᕽᕽᕽ　　　)$(MB_MAKE_XML_CDATA_START)$(call mb-make-call,_escape-xml-value,$(1))$(MB_MAKE_XML_CDATA_END) endef $(call mb-make-call,mb-doc-function-deep,mb-make-xml-value,Print xml value in cdata wrapper.,) diff --git a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_help.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_help.mk index d1a4eb7..7504c94 100644 --- a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_help.mk +++ b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_help.mk @@ -1,88 +1,86 @@ +MB_FLOW_HELP_TEMP := $(shell mktemp) +$(call mb-make-call,mb-doc-variable-rock,MB_FLOW_HELP_TEMP,Temp file to output help with.) + + +# Never use echo to display real text: Argument List Too Long +define _mb-flow-print-help +$(MB_ᕽᕽᕽ　　　)@echo -e "$(2)" +$(MB_ᕽᕽᕽ　　　)$(file >$(MB_FLOW_HELP_TEMP),$($(1))) +$(MB_ᕽᕽᕽ　　　)@cat $(MB_FLOW_HELP_TEMP) | sed 's/\\n/\n/g' | sed 's/\\t/\t/g' +$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-os-file-delete,$(MB_FLOW_HELP_TEMP)) +endef + + define __mb-flow-doc-help .RECIPEPREFIX := $(MB_@RECIPE) @help: -$(MB_@RECIPE)@echo -e "Welcome to the $$(if $$(MB_PROJ_META_NAME),$$(MB_PROJ_META_NAME),MSXBUILD) help system.\\n\\nFor detailed fire help use one of the following targets;" -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_HELP) +$(MB_@RECIPE)$$(call mb-make-call,_mb-flow-print-help,MB_DOC_FIRE_TARGET_HELP,Welcome to the $$(if $$(MB_PROJ_META_NAME),$$(MB_PROJ_META_NAME),MSXBUILD) help system.\\n\\nFor detailed fire help use one of the following targets;) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,@help) @help-variable: -$(MB_@RECIPE)@echo -e "Documention of the make fire variables;" -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_VARIABLE) +$(MB_@RECIPE)$$(call mb-make-call,_mb-flow-print-help,MB_DOC_FIRE_VARIABLE,Documention of the make fire variables;) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-help,@help-variable,Lists build variables.) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,@help-variable) @help-variable-deep: -$(MB_@RECIPE)@echo "Documention of the deep make variables;" -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_VARIABLE_DEEP) +$(MB_@RECIPE)$$(call mb-make-call,_mb-flow-print-help,MB_DOC_FIRE_VARIABLE_DEEP,Documention of the deep make variables;) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-help,@help-variable-deep,Lists deep variables.) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,@help-variable-deep) @help-variable-rock: -$(MB_@RECIPE)@echo -e "Documention of the rock make variables;" -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_VARIABLE_ROCK) +$(MB_@RECIPE)$$(call mb-make-call,_mb-flow-print-help,MB_DOC_FIRE_VARIABLE_ROCK,Documention of the rock make variables;) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-help,@help-variable-rock,Lists rock variables.) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,@help-variable-rock) @help-variable-flow: -$(MB_@RECIPE)@echo -e "Documention of the flow make variables;" -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_VARIABLE_FLOW) +$(MB_@RECIPE)$$(call mb-make-call,_mb-flow-print-help,MB_DOC_FIRE_VARIABLE_FLOW,Documention of the flow make variables;) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-help,@help-variable-flow,Lists flow variables.) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,@help-variable-flow) @help-variable-i18n: -$(MB_@RECIPE)@echo -e "Documention of the i18n make variables;" -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_VARIABLE_I18N) +$(MB_@RECIPE)$$(call mb-make-call,_mb-flow-print-help,MB_DOC_FIRE_VARIABLE_I18N,Documention of the i18n make variables;) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-help,@help-variable-i18n,Lists i18n variables.) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,@help-variable-i18n) @help-function: -$(MB_@RECIPE)@echo -e "Documention of the make fire functions;" -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_FUNCTION) +$(MB_@RECIPE)$$(call mb-make-call,_mb-flow-print-help,MB_DOC_FIRE_FUNCTION,Documention of the make fire functions;) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-help,@help-function,Lists build functions.) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,@help-function) @help-function-deep: -$(MB_@RECIPE)@echo -e "Documention of the deep make functions;" -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_FUNCTION_DEEP) +$(MB_@RECIPE)$$(call mb-make-call,_mb-flow-print-help,MB_DOC_FIRE_FUNCTION_DEEP,Documention of the deep make functions;) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-help,@help-function-deep,Lists deep functions.) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,@help-function-deep) @help-function-flow: -$(MB_@RECIPE)@echo -e "Documention of the flow make functions;" -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_FUNCTION_FLOW) +$(MB_@RECIPE)$$(call mb-make-call,_mb-flow-print-help,MB_DOC_FIRE_FUNCTION_FLOW,Documention of the flow make functions;) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-help,@help-function-flow,Lists flow functions.) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,@help-function-flow) @help-target: -$(MB_@RECIPE)@echo -e "Build one of the following make fire targets;" -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET) +$(MB_@RECIPE)$$(call mb-make-call,_mb-flow-print-help,MB_DOC_FIRE_TARGET,Build one of the following make fire targets;) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-help,@help-target,Lists build targets.) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,@help-target) @help-target-deep: -$(MB_@RECIPE)@echo -e "Build one of the following deep make targets;" -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_DEEP) +$(MB_@RECIPE)$$(call mb-make-call,_mb-flow-print-help,MB_DOC_FIRE_TARGET_DEEP,Build one of the following deep make targets;) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-help,@help-target-deep,Lists deep targets.) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,@help-target-deep) @help-target-run: -$(MB_@RECIPE)@echo -e "Build one of the following run make targets;" -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_RUN) +$(MB_@RECIPE)$$(call mb-make-call,_mb-flow-print-help,MB_DOC_FIRE_TARGET_RUN,Build one of the following run make targets;) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-help,@help-target-run,Lists runnable targets.) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,@help-target-run) @help-target-module: -$(MB_@RECIPE)@echo -e "Build one of the following module make targets;" -$(MB_@RECIPE)$$(file >bin/@help.txt,$$(MB_DOC_FIRE_TARGET_MODULE)) -$(MB_@RECIPE)@cat bin/@help.txt | sed 's/\\\\n/\n/g' | sed 's/\\\\t/\t/g' | sed 's/\"//g' +$(MB_@RECIPE)$$(call mb-make-call,_mb-flow-print-help,MB_DOC_FIRE_TARGET_MODULE,Build one of the following module make targets;) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-help,@help-target-module,Lists module targets.) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,@help-target-module) @help-target-assert: -$(MB_@RECIPE)@echo -e "Build one of the following assert make targets;" -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_ASSERT) +$(MB_@RECIPE)$$(call mb-make-call,_mb-flow-print-help,MB_DOC_FIRE_TARGET_ASSERT,Build one of the following assert make targets;) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-help,@help-target-assert,Lists assert targets.) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,@help-target-assert) @@ -92,63 +90,41 @@ $(MB_@RECIPE)@echo -e "\n "$(foreach _rom,$(MB_MSXROM_FIRE_MACHINES)," * $(_rom) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-help,@help-machine,Lists supported machines.) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,@help-machine) -@help-all: -$(MB_@RECIPE)@echo -e "Documention of all fire functions/variables/targets;\\n" -$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-good,Variables) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_VARIABLE) -$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-good,Variables in the deep) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_VARIABLE_DEEP) -$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-good,Variables hard as rock) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_VARIABLE_ROCK) -$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-good,Variables defining flow) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_VARIABLE_FLOW) -$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-good,Variables for i18n letters) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_VARIABLE_I18N) -$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-good,Functions) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_FUNCTION) -$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-good,Functions in the deep) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_FUNCTION_DEEP) -$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-good,Functions building flow) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_FUNCTION_FLOW) -$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-good,Targets) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET) -$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-good,Targets in the deep) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_DEEP) -$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-good,Targets that run away) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_RUN) -$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-good,Targets from modules builds) -$(MB_@RECIPE)$$(file >bin/@help.txt,$$(MB_DOC_FIRE_TARGET_MODULE)) -$(MB_@RECIPE)@cat bin/@help.txt | sed 's/\\\\n/\n/g' | sed 's/\\\\t/\t/g' | sed 's/\"//g' -$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-good,Targets that assert hopefully) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_ASSERT) -$(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-good,Targets main project help) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_HELP) +@help-all: \ +$(MB_ᕽᕽᕽ　　　)@help-variable @help-variable-deep @help-variable-rock @help-variable-flow @help-variable-i18n \ +$(MB_ᕽᕽᕽ　　　)@help-function @help-function-deep @help-function-flow \ +$(MB_ᕽᕽᕽ　　　)@help-target @help-target-deep @help-target-run @help-target-module @help-target-assert \ +$(MB_ᕽᕽᕽ　　　)@help-machine $(MB_@RECIPE)$$(call mb-make-call,mb-os-echo-good,OK) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-help,@help-all,Lists all documented information.) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,@help-all) @help-firemake: $(MB_@RECIPE)$$(eval MB_DOC_FORMAT :$(MB_MAKE_EQUALS) xml) -$(MB_@RECIPE)@echo -e $$(call mb-make-call,mb-make-xml-open,$$(MB_DOC_XML_ROOT)) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_VARIABLE) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_VARIABLE_DEEP) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_VARIABLE_ROCK) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_VARIABLE_FLOW) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_VARIABLE_I18N) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_FUNCTION) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_FUNCTION_DEEP) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_FUNCTION_FLOW) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_DEEP) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_RUN) -$(MB_@RECIPE)$$(file >bin/@help.txt,$$(MB_DOC_FIRE_TARGET_MODULE)) -$(MB_@RECIPE)@cat bin/@help.txt | sed 's/\\\\n/\n/g' | sed 's/\\\\t/\t/g' | sed 's/\\\"/__TMP/g' | sed 's/\"//g' | sed 's/__TMP/\"/g' -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_ASSERT) -$(MB_@RECIPE)@echo -e $$(MB_DOC_FIRE_TARGET_HELP) -$(MB_@RECIPE)@echo -e $$(call mb-make-call,mb-make-xml-close,$$(MB_DOC_XML_ROOT)) +$(MB_@RECIPE)$$(file >$(MB_FLOW_HELP_TEMP),$$(call mb-make-call,mb-make-xml-open,$$(MB_DOC_XML_ROOT))) +$(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_VARIABLE)) +$(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_VARIABLE_DEEP)) +$(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_VARIABLE_ROCK)) +$(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_VARIABLE_FLOW)) +$(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_VARIABLE_I18N)) +$(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_FUNCTION)) +$(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_FUNCTION_DEEP)) +$(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_FUNCTION_FLOW)) +$(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_TARGET)) +$(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_TARGET_DEEP)) +$(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_TARGET_RUN)) +$(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_TARGET_MODULE)) +$(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_TARGET_ASSERT)) +$(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(MB_DOC_FIRE_TARGET_HELP)) +$(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(call mb-make-call,mb-make-xml-close,$$(MB_DOC_XML_ROOT))) +$(MB_@RECIPE)@cat $$(MB_FLOW_HELP_TEMP) | sed 's/\\n/\n/g' | sed 's/\\t/\t/g' | sed 's/\\"/\"/g' +$(MB_@RECIPE)$$(call mb-make-call,mb-os-file-delete,$$(MB_FLOW_HELP_TEMP)) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-help,@help-firemake,Output all documention in XML for IDE integration.) $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,@help-firemake) +# TODO: create doc for "warpue" xml tag + list Word vAriable Readout Private valUE (for UI) +#$(MB_@RECIPE)$$(file >>$(MB_FLOW_HELP_TEMP),$$(foreach _rom,$$(MB_MSXROM_FIRE_MACHINES),\t$$(call mb-make-call,mb-make-xml-open,$$(MB_DOC_XML_TAG_MACHINE),name,$$(_rom))$$(call mb-make-call,mb-make-xml-close,$$(MB_DOC_XML_TAG_MACHINE))\n)) + .RECIPEPREFIX := $(MB_@RECIPEPREFIX) endef define mb-flow-doc-help diff --git a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_0module.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_nx01.mk similarity index 53% rename from lib/make/𓃬𓍄𓋹𓀭/mb_flow_0module.mk rename to lib/make/𓃬𓍄𓋹𓀭/mb_flow_nx01.mk index 2099833..81d3e44 100644 --- a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_0module.mk +++ b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_nx01.mk @@ -1,5 +1,5 @@ -define __mb-flow-0module-include +define __mb-flow-nx01-skywalker $(MB_ᕽᕽᕽ　　　)ifdef DEBUG $(MB_ᕽᕽᕽ　　　　　　)ifneq ("$$(DEBUG)", "off") $(MB_ᕽᕽᕽ　　　　　　　　　)$$(warning DEBUG $(0) ($(1))) @@ -10,7 +10,7 @@ $(MB_ᕽᕽᕽ　　　)include $(1) $(MB_ᕽᕽᕽ　　　)@@include-mods:: $(1) $(MB_ᕽᕽᕽ　　　)$(1): @@include-tree endef -define mb-flow-0module-include +define mb-flow-nx01-skywalker $(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-check-arg1,$(0),$(1)) $(MB_ᕽᕽᕽ　　　)$(foreach _mod,$(call mb-make-call,mb-make-wildcard-treewalker,$(1),*/0module.mk),$(eval $(call mb-make-call,__$(0),$(_mod)))) $(MB_ᕽᕽᕽ　　　)$(foreach _mod,$(call mb-make-call,mb-make-wildcard-treewalker,$(1),*/0module000.mk),$(eval $(call mb-make-call,__$(0),$(_mod)))) @@ -21,6 +21,15 @@ $(MB_ᕽᕽᕽ　　　)$(foreach _mod,$(call mb-make-call,mb-make-wildcard-tree $(MB_ᕽᕽᕽ　　　)$(foreach _mod,$(call mb-make-call,mb-make-wildcard-treewalker,$(1),*/0module101.mk),$(eval $(call mb-make-call,__$(0),$(_mod)))) $(MB_ᕽᕽᕽ　　　)$(foreach _mod,$(call mb-make-call,mb-make-wildcard-treewalker,$(1),*/0module110.mk),$(eval $(call mb-make-call,__$(0),$(_mod)))) $(MB_ᕽᕽᕽ　　　)$(foreach _mod,$(call mb-make-call,mb-make-wildcard-treewalker,$(1),*/0module111.mk),$(eval $(call mb-make-call,__$(0),$(_mod)))) +$(MB_ᕽᕽᕽ　　　)$(foreach _mod,$(call mb-make-call,mb-make-wildcard-treewalker,$(1),*/1module.mk),$(eval $(call mb-make-call,__$(0),$(_mod)))) +$(MB_ᕽᕽᕽ　　　)$(foreach _mod,$(call mb-make-call,mb-make-wildcard-treewalker,$(1),*/1module000.mk),$(eval $(call mb-make-call,__$(0),$(_mod)))) +$(MB_ᕽᕽᕽ　　　)$(foreach _mod,$(call mb-make-call,mb-make-wildcard-treewalker,$(1),*/1module001.mk),$(eval $(call mb-make-call,__$(0),$(_mod)))) +$(MB_ᕽᕽᕽ　　　)$(foreach _mod,$(call mb-make-call,mb-make-wildcard-treewalker,$(1),*/1module010.mk),$(eval $(call mb-make-call,__$(0),$(_mod)))) +$(MB_ᕽᕽᕽ　　　)$(foreach _mod,$(call mb-make-call,mb-make-wildcard-treewalker,$(1),*/1module011.mk),$(eval $(call mb-make-call,__$(0),$(_mod)))) +$(MB_ᕽᕽᕽ　　　)$(foreach _mod,$(call mb-make-call,mb-make-wildcard-treewalker,$(1),*/1module100.mk),$(eval $(call mb-make-call,__$(0),$(_mod)))) +$(MB_ᕽᕽᕽ　　　)$(foreach _mod,$(call mb-make-call,mb-make-wildcard-treewalker,$(1),*/1module101.mk),$(eval $(call mb-make-call,__$(0),$(_mod)))) +$(MB_ᕽᕽᕽ　　　)$(foreach _mod,$(call mb-make-call,mb-make-wildcard-treewalker,$(1),*/1module110.mk),$(eval $(call mb-make-call,__$(0),$(_mod)))) +$(MB_ᕽᕽᕽ　　　)$(foreach _mod,$(call mb-make-call,mb-make-wildcard-treewalker,$(1),*/1module111.mk),$(eval $(call mb-make-call,__$(0),$(_mod)))) endef -$(call mb-make-call,mb-doc-function-flow,mb-flow-0module-include,Inject flow of recursive 0module.mk include.,) +$(call mb-make-call,mb-doc-function-flow,mb-flow-nx01-skywalker,Inject flow of 18 bit recursive binary loading schema 0/1module[000-111].mk for include levels.,) diff --git a/lib/msxbuild.mk b/lib/msxbuild.mk index c4894ad..0619266 100644 --- a/lib/msxbuild.mk +++ b/lib/msxbuild.mk @@ -63,7 +63,7 @@ $(eval $(call __mb-include,make/天房系統擴展/mb_openmsx.mk)) $(eval $(call __mb-include,make/天房系統擴展/mb_autoexec.mk)) @@include-libs:: $(MB_@INCLUDE_CHAIN) MB_@INCLUDE_CHAIN := @@include-parent -$(eval $(call __mb-include,make/𓃬𓍄𓋹𓀭/mb_flow_0module.mk)) +$(eval $(call __mb-include,make/𓃬𓍄𓋹𓀭/mb_flow_nx01.mk)) $(eval $(call __mb-include,make/𓃬𓍄𓋹𓀭/mb_flow_help.mk)) $(eval $(call __mb-include,make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk)) $(eval $(call __mb-include,make/𓃬𓍄𓋹𓀭/mb_flow_assert.mk)) @@ -93,15 +93,15 @@ $(MB_ᕽᕽᕽ　)$(call mb-make-call,mb-doc-variable-rock,MB_@RECIPE,Recipe pre $(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-doc-variable-rock,MB_@RECIPEPREFIX,Recipe prefix to restore to after flow eval rules.) $(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-variable-rock,MB_@BASEPATH,Path where msxbuild lib folder is located.) $(MB_ᕽᕽᕽ　　　　)$(call mb-make-call,mb-doc-variable-rock,MB_@WORK,Shorthand to move to the work folder of module.) -$(MB_ᕽᕽᕽ　　　　　)$(call mb-make-call,mb-doc-variable-rock,MB_@INCLUDE_CHAIN,Helper to chain includes into groups.) +$(MB_ᕽᕽᕽ　　　　　)$(call mb-make-call,mb-doc-variable-rock,MB_@INCLUDE_CHAIN,Helper to chain internal library sections includes into groups.) # Provider+doc easy single function start point for user define mb-setup-default -$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-check-arg2,$(0),$(1),$(2)) -$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-flow-doc-help) -$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-flow-0module-include,$(2)) -$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-flow-proj-setup,$(1),@include) -$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-flight-proj-flow-video,$(1)) +$(MB_ᕽᕽᕽ　)$(call mb-make-call,mb-make-check-arg2,$(0),$(1),$(2)) +$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-flow-doc-help) +$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-flow-nx01-skywalker,$(2)) +$(MB_ᕽᕽᕽ　　　　)$(call mb-make-call,mb-flow-proj-setup,$(1),@include) +$(MB_ᕽᕽᕽ　　　　　)$(call mb-make-call,mb-flight-proj-flow-video,$(1)) endef $(call mb-make-call,mb-doc-function,mb-setup-default,Setup default extenstions to configure dynamic project flow., )