Fixed autoexec boot and found bug in make in splitting folders.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in -6s
All checks were successful
Run test asserts / Test-Asserts (push) Successful in -6s
This commit is contained in:
parent
8c07ce2b1a
commit
ded142d36e
18
README.md
18
README.md
|
@ -33,8 +33,8 @@ For debian use;
|
|||
Have access or copy the `lib` folder in your project and start writing make files.
|
||||
|
||||
Include the `lib/make/msxbuild.mk` and override the paths if needed;
|
||||
* PATH_SDCC=/usr/bin
|
||||
* PATH_OPENMSX=/usr/bin
|
||||
* MB_SDCC_PATH=/usr/bin
|
||||
* MB_OPENMSX_PATH=/usr/bin
|
||||
|
||||
## Usage Docker
|
||||
|
||||
|
@ -85,27 +85,27 @@ When you want to see whats happening do a debug run;
|
|||
|
||||
normal run;
|
||||
time make @package-qa
|
||||
real 0m3.223s
|
||||
real 0m8.058s
|
||||
|
||||
debug run at 11 Mhz;
|
||||
time VERBOSE=on MB_OPENMSX_HEADLESS=off MB_OPENMSX_THROTTLE=on make @package-qa
|
||||
real 1m4.856s
|
||||
time VERBOSE=on DEBUG=on MB_OPENMSX_HEADLESS=off MB_OPENMSX_THROTTLE=on make @package-qa
|
||||
real 2m34.071s
|
||||
|
||||
debug run real msx speed;
|
||||
time VERBOSE=on MB_OPENMSX_HEADLESS=off MB_OPENMSX_THROTTLE=on MB_OPENMSX_SPEED=100 make @package-qa
|
||||
time VERBOSE=on DEBUG=on MB_OPENMSX_HEADLESS=off MB_OPENMSX_THROTTLE=on MB_OPENMSX_SPEED=100 make @package-qa
|
||||
real 2m37.379s
|
||||
|
||||
record run with screenshot on exit; (black screens without throttle)
|
||||
time MB_OPENMSX_HEADLESS=off MB_OPENMSX_THROTTLE=on MB_FLIGHT_SCREEN=on make @package-qa
|
||||
real 1m14.043s
|
||||
real 2m40.784s
|
||||
|
||||
record run with video per session and merge to one video file;
|
||||
time make @flight-video-package-qa
|
||||
real 0m7.136s
|
||||
real 0m18.184s
|
||||
|
||||
build parallel;
|
||||
time make -j4 @package-qa
|
||||
real 0m1.817s
|
||||
real 0m4.226s
|
||||
|
||||
manual test all packages on other MSX1 machine;
|
||||
make DIST_QA_MSXHUB_MACHINE=Philips_VG_8000 bin/dist-qa-msxhub/@run
|
||||
|
|
|
@ -8,23 +8,27 @@ MB__RECIPEPREFIX := $(.RECIPEPREFIX)
|
|||
MB__BASEPATH := $(dir $(lastword $(MAKEFILE_LIST)))../..
|
||||
MB__BASEPATH_REAL := $(if $(realpath $(MB__BASEPATH)),$(realpath $(MB__BASEPATH)),$(MB__BASEPATH))
|
||||
|
||||
include $(MB__BASEPATH)/lib/make/mb_doc.mk
|
||||
include $(MB__BASEPATH)/lib/make/mb_make_call.mk
|
||||
include $(MB__BASEPATH)/lib/make/mb_make_xml.mk
|
||||
include $(MB__BASEPATH)/lib/make/mb_make.mk
|
||||
include $(MB__BASEPATH)/lib/make/mb_conv.mk
|
||||
include $(MB__BASEPATH)/lib/make/mb_sdcc.mk
|
||||
# BUG1 Unicode bug in make, read+parse ok but function call fails.
|
||||
#include $(MB__BASEPATH)/lib/make/प्रणालीᐥᔆʸᔆᐪᓫᔿ/mb_doc.mk
|
||||
|
||||
include $(MB__BASEPATH)/lib/make/प्रणाली/mb_doc.mk
|
||||
include $(MB__BASEPATH)/lib/make/प्रणाली/mb_make_call.mk
|
||||
include $(MB__BASEPATH)/lib/make/प्रणाली/mb_make_xml.mk
|
||||
include $(MB__BASEPATH)/lib/make/प्रणाली/mb_make.mk
|
||||
include $(MB__BASEPATH)/lib/make/ᐊᑐᕐᓗᒍ/mb_os.mk
|
||||
include $(MB__BASEPATH)/lib/make/ᐊᑐᕐᓗᒍ/mb_conv.mk
|
||||
include $(MB__BASEPATH)/lib/make/ᐊᑐᕐᓗᒍ/mb_sdcc.mk
|
||||
include $(MB__BASEPATH)/lib/make/麥加系統擴大/mb_msxrom.mk
|
||||
include $(MB__BASEPATH)/lib/make/麥加系統擴大/mb_msxhub.mk
|
||||
include $(MB__BASEPATH)/lib/make/麥加系統擴大/mb_msxpipe.mk
|
||||
include $(MB__BASEPATH)/lib/make/麥加系統擴大/mb_openmsx.mk
|
||||
include $(MB__BASEPATH)/lib/make/麥加系統擴大/mb_autoexec.mk
|
||||
include $(MB__BASEPATH)/lib/make/mb_flight.mk
|
||||
include $(MB__BASEPATH)/lib/make/mb_msxrom.mk
|
||||
include $(MB__BASEPATH)/lib/make/mb_msxhub.mk
|
||||
include $(MB__BASEPATH)/lib/make/mb_msxpipe.mk
|
||||
include $(MB__BASEPATH)/lib/make/mb_openmsx.mk
|
||||
include $(MB__BASEPATH)/lib/make/mb_autoexec.mk
|
||||
include $(MB__BASEPATH)/lib/make/mb_assert.mk
|
||||
include $(MB__BASEPATH)/lib/make/mb_tool.mk
|
||||
include $(MB__BASEPATH)/lib/make/mb_proj.mk
|
||||
include $(MB__BASEPATH)/lib/make/mb_i18n.mk
|
||||
include $(MB__BASEPATH)/lib/make/mb_os.mk
|
||||
|
||||
|
||||
$(call mb_make_call,mb_doc_variable_rock,MB__RECIPEPREFIX,"Recipe prefix to restore to after flow eval.")
|
||||
$(call mb_make_call,mb_doc_variable_rock,MB__BASEPATH,"Path where msxbuild lib folder is located.")
|
||||
|
|
|
@ -38,7 +38,7 @@ $(MB__ )MB_OS_STDOUT_IGNORE ?= >NUL
|
|||
$(MB__ )MB_OS_STDERR_IGNORE ?= 2>NUL || true
|
||||
$(MB__ )MB_OS_SEP ?=\
|
||||
$(MB__ )MB_OS_CACHE ?= %LOCALAPPDATA%
|
||||
$(MB__ )MB_OS_COLORS ?= -1
|
||||
$(MB__ )MB_OS_TERM_COLORS ?= -1
|
||||
endif
|
||||
endif
|
||||
|
|
@ -161,8 +161,8 @@ $(MB__ )$(if $(wildcard $(1)/utils),$(call mb_make_call,_mb_autoexec_
|
|||
$(MB__ )$(if $(filter on,$(MB_AUTOEXEC_SHOW_HOST)),$(call mb_make_call,mb_autoexec_append_cmd,$(1),omsxctl boot_exec_show_host))
|
||||
$(MB__ )$(if $(MB_AUTOEXEC_STARTUP_NOTE),$(call mb_make_call,mb_autoexec_append_echo,$(1),mb::note $(MB_AUTOEXEC_STARTUP_NOTE)))
|
||||
$(MB__ )$(if $(filter on,$(MB_FLIGHT_VIDEO)),$(call mb_make_call,mb_autoexec_append_save_video,$(1)))
|
||||
$(MB__ )echo -n "$(subst $(MB_MAKE_SPACE)set,set,$(foreach var,$(MB_AUTOEXEC_EMBED_VARS),set MSX_$(var)$(MB_MAKE_EQUALS)$($(var))\r\n))" >> $(1)/autoexec.bat
|
||||
$(MB__ )echo -n "$(subst $(MB_MAKE_SPACE)set,set,$(foreach var,$(MB_AUTOEXEC_EMBED_VARS),echo MSX_$(var)$(MB_MAKE_EQUALS)%MSX_$(var)%\r\n))" >> $(1)/autoexec.bat
|
||||
$(MB__ )echo -n -e "$(subst $(MB_MAKE_SPACE)set,set,$(foreach var,$(MB_AUTOEXEC_EMBED_VARS),set MSX_$(var)$(MB_MAKE_EQUALS)$($(var))\r\n))" >> $(1)/autoexec.bat
|
||||
$(MB__ )echo -n -e "$(subst $(MB_MAKE_SPACE)set,set,$(foreach var,$(MB_AUTOEXEC_EMBED_VARS),echo MSX_$(var)$(MB_MAKE_EQUALS)%MSX_$(var)%\r\n))" >> $(1)/autoexec.bat
|
||||
$(MB__ )$(call mb_make_call,mb_autoexec_append_cmd,$(1),set TIME$(MB_MAKE_EQUALS)$(MB_AUTOEXEC_TIME_FORMAT))
|
||||
$(MB__ )$(call mb_make_call,mb_autoexec_append_cmd,$(1),set DATE$(MB_MAKE_EQUALS)$(MB_AUTOEXEC_DATE_FORMAT))
|
||||
$(MB__ )$(if $(filter on,$(MB_AUTOEXEC_SHOW_PATH)),$(call mb_make_call,mb_autoexec_append_cmd,$(1),echo mb::path %PATH%))
|
Loading…
Reference in a new issue