www

commit 47a7cf82b1d27d833712750f7802de051947dceb
parent c5a140661d6caf0075d246dfc4e9aa635f9b4427
Author: Georges Dupéron <georges.duperon@gmail.com>
Date:   Sun,  8 Jul 2018 23:43:55 +0200

There seems to sometimes be an issue when creating the animation with the parallel build. Added more debug output, increased timeout.

Diffstat:
M
example-os/Makefile
 | 
1
+
M
utils/gui-wrapper.sh
 | 
6
++++--

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/example-os/Makefile b/example-os/Makefile
@@ -118,6 +118,7 @@ $(os_filename): os.32k os.iso os.fat12 os.zip os.zip.adjusted ../deploy-screensh
 	set -x; dd if=/dev/zero seek=$$(( $(gpt_mirror_end) - 1 )) bs=1 count=1 conv=notrunc of=$@
 # patch the partition table
 	printf "p\nd\nn\np\n1\n$$(( $(fat12_start) / $(sector_size) ))\n$$(( $(fat12_size_sectors) ))\nt\n01\na\n1\np\nw\nq\n" | fdisk $@
+# Thanks to https://wiki.gentoo.org/wiki/Hybrid_partition_table for showing that gdisk can be used to make a hybrid MBR / GPT.
 # gdisk commands: recovery, make hybrid, add GPT partition #1 to the hybrid MBR, don't put the EFI partition first,
 #                 partition type=0x01, bootable=Y, don't add extra partitions, print GPT, print MBR, write, proceed, quit.
 	printf "r\nh\n1\nN\n01\nY\nN\np\no\nw\nY\nq\n" | gdisk $@
diff --git a/utils/gui-wrapper.sh b/utils/gui-wrapper.sh
@@ -23,12 +23,14 @@ cat > "$twm_cfg" <<EOF
 RandomPlacement
 EOF
 
+echo "$bg $twm_cfg $anim $resolution $@"
 # -fg chocolate -bg coral looks nice too :)
-echo "$bg $twm_cfg $anim"
 xvfb-run -a --server-args="-screen 0 ${resolution}" sh -c 'sleep 2; SM_SAVE_DIR="'"$twm_session_dir"'" twm -f "'"$twm_cfg"'" & sleep 1 && xsetroot -bitmap "'"$bg"'" -fg gray75 -bg gray50 && sleep 1 && utils/screenshots-loop.sh "'"$anim"'" & "$@"' utils/gui-wrapper.sh-subshell "$@"
 
 touch "$anim/stop-screenshots"
-for i in `seq 60`; do if test -e "$anim/anim-done"; then break; fi; sleep 1; done
+anim_done=false
+for i in `seq 300`; do if test -e "$anim/anim-done"; then anim_done=true; break; fi; sleep 1; done
+if $anim_done; then echo "anim: done ($*)"; else echo "anim: timeout ($*)"; fi
 if test -e "$anim/anim.gif"; then
   mv "$anim/anim.gif" "./deploy-screenshots/$(basename "$1" .sh)-anim.gif"
 fi