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

Moved all openMSX data to local bin to enable video recorder.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in -7s
Details

Browse source
This commit is contained in:
Willem Cazander 2024-06-28 22:29:37 +02:00
parent 33ef6ed712
commit 82cb218bef
4 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
README.md
View file

@ -33,10 +33,11 @@ The files in this repro try to handle these steps for you.
* make + wget + tar + dos2unix * make + wget + tar + dos2unix
* sdcc * sdcc
* openmsx * openmsx
* ffmpeg (optional, see `test/0module.mk` howto merge videos)
For debian use; For debian use;
apt-get install make wget tar dos2unix sdcc openmsx apt-get install make wget tar dos2unix sdcc openmsx ffmpeg
## Usage ## Usage
@ -60,10 +61,10 @@ When you want to see whats happening do a debug run;
debug run real msx speed; debug run real msx speed;
time MB_OPENMSX_RENDERER=on MB_OPENMSX_THROTTLE=on MB_OPENMSX_SPEED=100 make assert-all time MB_OPENMSX_RENDERER=on MB_OPENMSX_THROTTLE=on MB_OPENMSX_SPEED=100 make assert-all
real 2m37.379s real 2m37.379s
debug run with video recorder; debug run with video recorder and merge to one video file;
time MB_OPENMSX_RENDERER=on MB_OPENMSX_RECORDER=on make -s -j4 assert-all time MB_OPENMSX_RENDERER=on MB_OPENMSX_RECORDER=on make -s assert-all-video
real 0m4.479s real 0m7.136s
build parallel; build parallel;
time make -s -j4 assert-all time make -s -j4 assert-all

5
lib/make/mb_openmsx.mk
View file

@ -43,7 +43,7 @@ define _mb_openmsx_run
FAIL_AFTER_PATH=$(MB_OPENMSX_PATH_BIN) \ FAIL_AFTER_PATH=$(MB_OPENMSX_PATH_BIN) \
BOOT_HDD_PATH="$(1)" \ BOOT_HDD_PATH="$(1)" \
BOOT_HDD_SIZE=$(MB_OPENMSX_HDD_SIZE) \ BOOT_HDD_SIZE=$(MB_OPENMSX_HDD_SIZE) \
BOOT_HDD_IMAGE="$(1)-omsx/disk-ide-hda.img" \ BOOT_HDD_IMAGE="$(1)-omsx/persistent/ide-nextor/untitled1/hd.dsk" \
JOYPORTA=$(MB_OPENMSX_JOYPORTA) \ JOYPORTA=$(MB_OPENMSX_JOYPORTA) \
JOYPORTB=$(MB_OPENMSX_JOYPORTB) \ JOYPORTB=$(MB_OPENMSX_JOYPORTB) \
SCALE_FACTOR=$(MB_OPENMSX_SCALE_FACTOR) \ SCALE_FACTOR=$(MB_OPENMSX_SCALE_FACTOR) \
@ -51,7 +51,8 @@ define _mb_openmsx_run
RENDERER=$(MB_OPENMSX_RENDERER) \ RENDERER=$(MB_OPENMSX_RENDERER) \
RENDERER_TYPE=$(MB_OPENMSX_RENDERER_TYPE) \ RENDERER_TYPE=$(MB_OPENMSX_RENDERER_TYPE) \
THROTTLE=$(MB_OPENMSX_THROTTLE) \ THROTTLE=$(MB_OPENMSX_THROTTLE) \
RECORDER=$(if $(filter on,$(MB_OPENMSX_RECORDER)),"$(1)-omsx/output.avi") \ RECORDER=$(if $(filter on,$(MB_OPENMSX_RECORDER)),msxbuild-) \
OPENMSX_HOME="$(1)-omsx" \
OPENMSX_USER_DATA="$(1)-omsx/share" \ OPENMSX_USER_DATA="$(1)-omsx/share" \
$(PATH_OPENMSX)/openmsx \ $(PATH_OPENMSX)/openmsx \
-machine $(2) \ -machine $(2) \

5
lib/openmsx/share/scripts/boot_env.tcl
View file

@ -98,8 +98,11 @@ if {[info exists ::env(JOYPORTB)] && ([string trim $::env(JOYPORTB)] != "")} {
} }
if {[info exists ::env(RECORDER)] && ([string trim $::env(RECORDER)] != "")} { if {[info exists ::env(RECORDER)] && ([string trim $::env(RECORDER)] != "")} {
if {[catch {after time 1 "record start [string trim $::env(RECORDER)]"} err_msg]} { if {[catch {after time 1 "record start -prefix [string trim $::env(RECORDER)]"} err_msg]} {
puts stderr "error: env.RECORDER value $err_msg" puts stderr "error: env.RECORDER value $err_msg"
exit 1 exit 1
} }
after quit {
record stop
}
} }

15
test/0module.mk
View file

@ -1,5 +1,5 @@
BUILD_HELP += \\n\\t* assert-all \(Run all asertion tests\) BUILD_HELP += \\n\\t* assert-all \(Run all asertion tests\)\\n\\t* assert-all-video \(Merges all video's to one\)
BUILD_TEST := \ BUILD_TEST := \
test-ahello-m80-assert \ test-ahello-m80-assert \
test-ahello-sdcc-assert \ test-ahello-sdcc-assert \
@ -8,5 +8,16 @@ test-dist-qa-dos2-assert \
test-dist-qa-msx1-assert test-dist-qa-msx1-assert
.PHONY: assert-all .PHONY: assert-all
assert-all: $(BUILD_TEST) assert-all: | $(BUILD_TEST)
@echo All assertions completed. @echo All assertions completed.
bin/test/video-merge.lst: | assert-all
@echo === Create video merge listing
ls -1 bin/test/*-omsx/videos/msxbuild-*.avi | awk -F "bin/test/" -v s="file '" -v e="'" '{print s$$2e}' > $@
bin/test/video-session.avi: bin/test/video-merge.lst
ffmpeg -f concat -i $< -c copy $@
.PHONY: assert-all-video
assert-all-video: bin/test/video-session.avi
@echo Video merge completed.