Added some machines and fixed c: drive boot disk support.

lib/make/सिस्टमₚᵣₐᵧToੴ/mb_make_xml.mk

@@ -20,13 +20,22 @@ endef
 $(call mb-make-call,mb-doc-function-deep,mb-make-xml-prolog,Print xml document prolog.)
 
 
-define _escape-xml-attr
+define mb-make-xml-escape-attr-value
 $(MB_ᕽᕽᕽ　　　)$(subst ',&apos;,$(subst ",&quote;,$(subst &,&amp;,$(subst <,&lt;,$(subst >,&gt;,$(subst $(MB_MAKE_XML_CDATA_START),,$(subst $(MB_MAKE_XML_CDATA_END),,$(1))))))))
 endef
+$(call mb-make-call,mb-doc-function-deep,mb-make-xml-escape-attr-value,Prints escaped XML attribute value.,<value>)
+
+
+define mb-make-xml-escape-tag-body
+$(MB_ᕽᕽᕽ　　　)$(subst $(MB_MAKE_XML_CDATA_START),,$(subst $(MB_MAKE_XML_CDATA_END),,$(1)))
+endef
+$(call mb-make-call,mb-doc-function-deep,mb-make-xml-escape-tag-body,Prints escaped XML element/tag body value.,<value>)
+
+
 define mb-make-xml-open
 $(MB_ᕽᕽᕽ　　　)$(MB_MAKE_XML_LT)$(1)$\
-$(MB_ᕽᕽᕽ　　　　)$(if $(2), $(2)$(MB_MAKE_EQUALS)"$(call mb-make-call,_escape-xml-attr,$(3))")$\
+$(MB_ᕽᕽᕽ　　　　)$(if $(2), $(2)$(MB_MAKE_EQUALS)"$(call mb-make-call,mb-make-xml-escape-attr-value,$(3))")$\
-$(MB_ᕽᕽᕽ　　　　)$(if $(4), $(4)$(MB_MAKE_EQUALS)"$(call mb-make-call,_escape-xml-attr,$(5))")$\
+$(MB_ᕽᕽᕽ　　　　)$(if $(4), $(4)$(MB_MAKE_EQUALS)"$(call mb-make-call,mb-make-xml-escape-attr-value,$(5))")$\
 $(MB_ᕽᕽᕽ　　　)$(MB_MAKE_XML_GT)
 endef
 $(call mb-make-call,mb-doc-function-deep,mb-make-xml-open,Print xml open tag.,<tag> [attr1-name] [attr1-value] [attr2-name] [attr2-value])
@@ -38,12 +47,9 @@ endef
 $(call mb-make-call,mb-doc-function-deep,mb-make-xml-close,Print xml close tag.,<tag>)
 
 
-define _escape-xml-value
-$(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)$\
-$(MB_ᕽᕽᕽ　　　　)$(call mb-make-call,_escape-xml-value,$(1))$\
+$(MB_ᕽᕽᕽ　　　　)$(call mb-make-call,mb-make-xml-escape-tag-body,$(1))$\
 $(MB_ᕽᕽᕽ　　　)$(MB_MAKE_XML_CDATA_END)
 endef
 $(call mb-make-call,mb-doc-function-deep,mb-make-xml-value,Print xml value in cdata wrapper.,<value>)

lib/make/天房系統擴展/mb_autoexec.mk

@@ -149,8 +149,8 @@ $(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-autoexec-append-cmd,$(1),$(2)omsx
 $(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-autoexec-append-cmd,$(1),$(2)omsxctl fail_after $(MB_AUTOEXEC_STARTUP_TIMEOUT) seconds err_exec $(MB_AUTOEXEC_STARTUP_EXITCODE))
 $(MB_ᕽᕽᕽ　　　)$(if $(filter on,$(MB_AUTOEXEC_SHOW_INIT)),$(call mb-make-call,mb-autoexec-append-cmd,$(1),$(2)omsxctl boot_exec_show_init))
 $(MB_ᕽᕽᕽ　　　)$(if $(filter on,$(MB_AUTOEXEC_SHOW_VERSION)),$(call mb-make-call,mb-autoexec-append-cmd,$(1),ver))
-$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-autoexec-append-cmd,$(1),PATH + A:\;)
+$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-autoexec-append-cmd,$(1),PATH + %@DRIVE%\;)
-$(MB_ᕽᕽᕽ　　　)$(if $(wildcard $(1)/utils),$(call mb-make-call,mb-autoexec-append-cmd,$(1),PATH + A:\UTILS))
+$(MB_ᕽᕽᕽ　　　)$(if $(wildcard $(1)/utils),$(call mb-make-call,mb-autoexec-append-cmd,$(1),PATH + %@DRIVE%\UTILS))
 endef
 
 

lib/make/天房系統擴展/mb_msxrom.mk

@@ -35,6 +35,8 @@ $(MB_ᕽᕽᕽ　　　)$(if $(wildcard $(1)$(MB_@WORK)$(notdir $(1))),,$(call m
 $(MB_ᕽᕽᕽ　　　)$(if $(wildcard $(1)$(MB_@WORK)$(notdir $(1))/share),,$(call mb-make-call,mb-os-dir-create,$(1)$(MB_@WORK)$(notdir $(1))/share))
 $(MB_ᕽᕽᕽ　　　)$(if $(wildcard $(1)$(MB_@WORK)$(notdir $(1))/share/systemroms),,$(call mb-make-call,mb-os-dir-create,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms))
 $(MB_ᕽᕽᕽ　　　)$(if $(wildcard $(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines),,$(call mb-make-call,mb-os-dir-create,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines))
+$(MB_ᕽᕽᕽ　　　)$(if $(wildcard $(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/philips),,$(call mb-make-call,mb-os-dir-create,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/philips))
+$(MB_ᕽᕽᕽ　　　)$(if $(wildcard $(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/sony),,$(call mb-make-call,mb-os-dir-create,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/sony))
 $(MB_ᕽᕽᕽ　　　)$(if $(wildcard $(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/extensions),,$(call mb-make-call,mb-os-dir-create,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/extensions))
 endef
 $(call mb-make-call,mb-doc-function-deep,mb-msxrom-setup,Creates needed systemrom folders.,<dir>)
@@ -126,30 +128,97 @@ $(call mb-make-call,_mb-msxrom-grow-fire-machines,Mitsubishi_ML-G3_ES)
 
 
 define mb-msxrom-machine-Philips_VG_8000
-$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines,machines/philips/vg8000_basic-bios1.rom)
+$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/philips,machines/philips/vg8000_basic-bios1.rom)
 endef
 $(call mb-make-call,mb-doc-function-deep,mb-msxrom-machine-Philips_VG_8000,Installs machine roms.,<dir>)
 $(call mb-make-call,_mb-msxrom-grow-fire-machines,Philips_VG_8000)
 
 
+define mb-msxrom-machine-Philips_VG_8010
+$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/philips,machines/philips/vg8010_basic-bios1.rom)
+endef
+$(call mb-make-call,mb-doc-function-deep,mb-msxrom-machine-Philips_VG_8010,Installs machine roms.,<dir>)
+$(call mb-make-call,_mb-msxrom-grow-fire-machines,Philips_VG_8010)
+
+
+define mb-msxrom-machine-Philips_VG_8010F
+$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/philips,machines/philips/vg8010f_basic-bios1.rom)
+endef
+$(call mb-make-call,mb-doc-function-deep,mb-msxrom-machine-Philips_VG_8010F,Installs machine roms.,<dir>)
+$(call mb-make-call,_mb-msxrom-grow-fire-machines,Philips_VG_8010F)
+
+
+define mb-msxrom-machine-Philips_VG_8020
+$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/philips,machines/philips/vg8020_basic-bios1.rom)
+endef
+$(call mb-make-call,mb-doc-function-deep,mb-msxrom-machine-Philips_VG_8020,Installs machine roms.,<dir>)
+$(call mb-make-call,_mb-msxrom-grow-fire-machines,Philips_VG_8020)
+
+
+define mb-msxrom-machine-Philips_VG_8020F
+$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/philips,machines/philips/vg8020f_basic-bios1.rom)
+endef
+$(call mb-make-call,mb-doc-function-deep,mb-msxrom-machine-Philips_VG_8020F,Installs machine roms.,<dir>)
+$(call mb-make-call,_mb-msxrom-grow-fire-machines,Philips_VG_8020F)
+
+
 define mb-msxrom-machine-Philips_VG_8230
-$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines,machines/philips/vg8230_basic-bios2.rom)
+$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/philips,machines/philips/vg8230_basic-bios2.rom)
-$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines,machines/philips/vg8230_disk.rom)
+$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/philips,machines/philips/vg8230_disk.rom)
-$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines,machines/philips/vg8230_msx2sub.rom)
+$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/philips,machines/philips/vg8230_msx2sub.rom)
 endef
 $(call mb-make-call,mb-doc-function-deep,mb-msxrom-machine-Philips_VG_8230,Installs machine roms.,<dir>)
 $(call mb-make-call,_mb-msxrom-grow-fire-machines,Philips_VG_8230)
 
 
+define mb-msxrom-machine-Philips_NMS_8245
+$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/philips,machines/philips/NMS8245SystemROM1.08.bin)
+endef
+$(call mb-make-call,mb-doc-function-deep,mb-msxrom-machine-Philips_NMS_8245,Installs machine roms.,<dir>)
+$(call mb-make-call,_mb-msxrom-grow-fire-machines,Philips_NMS_8245)
+
+
 define mb-msxrom-machine-Philips_NMS_8250
-$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines,machines/philips/nms8250_basic-bios2.rom)
+$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/philips,machines/philips/nms8250_basic-bios2.rom)
-$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines,machines/philips/nms8250_msx2sub.rom)
+$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/philips,machines/philips/nms8250_msx2sub.rom)
-$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines,machines/philips/nms8250_disk.rom)
+$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/philips,machines/philips/nms8250_disk.rom)
 endef
 $(call mb-make-call,mb-doc-function-deep,mb-msxrom-machine-Philips_NMS_8250,Installs machine roms.,<dir>)
 $(call mb-make-call,_mb-msxrom-grow-fire-machines,Philips_NMS_8250)
 
 
+define mb-msxrom-machine-Sony_HB-10
+$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/sony,machines/sony/hb-10_basic-bios1.rom)
+endef
+$(call mb-make-call,mb-doc-function-deep,mb-msxrom-machine-Sony_HB-10,Installs machine roms.,<dir>)
+$(call mb-make-call,_mb-msxrom-grow-fire-machines,Sony_HB-10)
+
+
+define mb-msxrom-machine-Sony_HB-10P
+$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/sony,machines/sony/hb-10p_basicbios1.rom)
+endef
+$(call mb-make-call,mb-doc-function-deep,mb-msxrom-machine-Sony_HB-10P,Installs machine roms.,<dir>)
+$(call mb-make-call,_mb-msxrom-grow-fire-machines,Sony_HB-10P)
+
+
+define mb-msxrom-machine-Sony_HB-F500P
+$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/sony,machines/sony/hb-f500p_basic-bios2.rom)
+$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/sony,machines/sony/hb-f500p_msx2sub.rom)
+$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/sony,machines/sony/hb-f500p_disk.rom)
+endef
+$(call mb-make-call,mb-doc-function-deep,mb-msxrom-machine-Sony_HB-F500P,Installs machine roms.,<dir>)
+$(call mb-make-call,_mb-msxrom-grow-fire-machines,Sony_HB-F500P)
+
+
+define mb-msxrom-machine-Sony_HB-F700P
+$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/sony,machines/sony/hb-f700p_basic-bios2.rom)
+$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/sony,machines/sony/hb-f700p_msx2sub.rom)
+$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines/sony,machines/sony/hb-f700p_disk.rom)
+endef
+$(call mb-make-call,mb-doc-function-deep,mb-msxrom-machine-Sony_HB-F700P,Installs machine roms.,<dir>)
+$(call mb-make-call,_mb-msxrom-grow-fire-machines,Sony_HB-F700P)
+
+
 define mb-msxrom-machine-Toshiba_HX-21
 $(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines,machines/toshiba/HX21-IC2.BIN)
 $(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-msxrom-file,$(1)$(MB_@WORK)$(notdir $(1))/share/systemroms/machines,machines/toshiba/HX21-IC3.BIN)

src/assert/msxrom/0module100.mk

@@ -10,7 +10,7 @@ ASSERT_MSXROM_MACHINES ?=
 $(call mb-make-call,mb-doc-variable,ASSERT_MSXROM_MACHINES,When set only test this list of machines else all supported.)
 
 
-# Package QA matrix on: <all-machines> <dos2,nextor> <hello1,hello2,hello3,hello4> = 13 * 2 * 4 = 104 assertion tests
+# Package QA matrix on: <all-machines> <dos2,nextor> <hello1,hello2,hello3,hello4> = 22 * 2 * 4 = 176 assertion tests
 ifeq ("$(ASSERT_MSXROM_MATRIX)", "on")
 $(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-flow-clone-deps-proj-setup-orphan,$(ASSERT_MSXROM_BIN),$(EXAMPLE_DIST_HELLO_BIN),$(EXAMPLE_DIST_HELLO_DEPS))
 $(MB_ᕽᕽᕽ　　　)$(foreach _rom,$(if $(ASSERT_MSXROM_MACHINES),$(ASSERT_MSXROM_MACHINES),$(MB_MSXROM_FIRE_MACHINES)),$\