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

Moved video concat to function.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in -9s
Details

Browse source
This commit is contained in:
Willem Cazander 2024-06-30 04:34:07 +02:00
parent 97655c2f1c
commit f6cb4a1f9b
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -67,7 +67,7 @@ When you want to see whats happening do a debug run;
real 1m14.043s real 1m14.043s
debug run with video recorder and merge to one video file; debug run with video recorder and merge to one video file;
time MB_OPENMSX_HEADLESS=off MB_FLIGHT_VIDEO=on make -s assert-all-video time MB_OPENMSX_HEADLESS=off MB_FLIGHT_VIDEO=on make -s assert-all
real 0m7.136s real 0m7.136s
build parallel; build parallel;
@ -165,6 +165,7 @@ Current set is WIP.
* mb_unix2dos * mb_unix2dos
* mb_dos2unix * mb_dos2unix
* mb_create_dist * mb_create_dist
* mb_create_flight_video
## Errata ## Errata

7
lib/make/msxbuild.mk
View file

@ -14,6 +14,7 @@ MB_FLIGHT_VIDEO ?= off
MB_FLIGHT_PREFIX ?= msxbuild MB_FLIGHT_PREFIX ?= msxbuild
MB_FLIGHT_SEPERATOR ?= - MB_FLIGHT_SEPERATOR ?= -
MB_FLIGHT_RECORD_FLAG ?= -doublesize MB_FLIGHT_RECORD_FLAG ?= -doublesize
MB_FLIGHT_VIDEO_NAME ?= flight-video
# OS cmds # OS cmds
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
@ -68,6 +69,12 @@ define mb_create_dist
@echo === Creating distribution archive. @echo === Creating distribution archive.
tar -czf $(1) -C $(2) `ls $(2)` tar -czf $(1) -C $(2) `ls $(2)`
endef endef
define mb_create_flight_video
@echo === Indexing flight videos
ls -1tr $(1)/*-omsx/videos/*.avi | awk -F "$(1)/" -v s="file '" -v e="'" '{print s$$2e}' > $(1)/$(MB_FLIGHT_VIDEO_NAME).lst
ffmpeg -v quiet -y -f concat -i $(1)/$(MB_FLIGHT_VIDEO_NAME)lst -c copy $(1)/$(MB_FLIGHT_VIDEO_NAME).avi
@echo === Flight video completed
endef
# Include extra features # Include extra features
include $(PATH_MSXBUILD)/lib/make/mb_sdcc.mk include $(PATH_MSXBUILD)/lib/make/mb_sdcc.mk

10
src/assert-all/0module.mk
View file

@ -1,5 +1,5 @@
BUILD_HELP += \\n\\t* assert-all \(Run all assertion tests\)\\n\\t* assert-all-video \(Merges all videos\) BUILD_HELP += \\n\\t* assert-all \(Run all assertion tests\)
ASSERT_ALL_DEPS := \ ASSERT_ALL_DEPS := \
bin/ahello-m80-test/@assert \ bin/ahello-m80-test/@assert \
bin/ahello-sdcc-test/@assert \ bin/ahello-sdcc-test/@assert \
@ -11,10 +11,4 @@ bin/dist-qa-msxhub/@assert
.PHONY: assert-all .PHONY: assert-all
assert-all: | $(ASSERT_ALL_DEPS) assert-all: | $(ASSERT_ALL_DEPS)
@echo === All assertions completed @echo === All assertions completed
$(if $(filter on,$(MB_FLIGHT_VIDEO)),$(call mb_create_flight_video,$(PATH_BIN)))
.PHONY: assert-all-video
assert-all-video: | assert-all
@echo === Build session video listing
ls -1tr bin/*-omsx/videos/msxbuild-*.avi | awk -F "bin/" -v s="file '" -v e="'" '{print s$$2e}' > bin/video-merge.lst
ffmpeg -v quiet -y -f concat -i bin/video-merge.lst -c copy bin/video-session.avi
@echo === Concatted video completed