From 09aa8de52cb962f1ceebfb1fd44f2c54a924fc5c Mon Sep 17 00:00:00 2001 From: Franklin Wei Date: Mon, 22 Jul 2024 21:43:25 -0400 Subject: puzzles: resync with upstream This brings the puzzles source in sync with Simon's branch, commit fd304c5 (from March 2024), with some added Rockbox-specific compatibility changes: https://www.franklinwei.com/git/puzzles/commit/?h=rockbox-devel&id=516830d9d76bdfe64fe5ccf2a9b59c33f5c7c078 There are quite a lot of backend changes, including a new "Mosaic" puzzle. In addition, some new frontend changes were necessary: - New "Preferences" menu to access the user preferences system. - Enabled spacebar input for several games. Change-Id: I94c7df674089c92f32d5f07025f6a1059068af1e --- apps/plugins/puzzles/genhelp.sh | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'apps/plugins/puzzles/genhelp.sh') diff --git a/apps/plugins/puzzles/genhelp.sh b/apps/plugins/puzzles/genhelp.sh index 3df7706b5d..f515bb25dc 100755 --- a/apps/plugins/puzzles/genhelp.sh +++ b/apps/plugins/puzzles/genhelp.sh @@ -36,6 +36,9 @@ BEGIN { if($3 ~ "Rectangles") file = "help/rect.c"; + if($3 ~ "Train") + file = "help/tracks.c"; + print "/* auto-generated by genhelp.sh (intermediate file) */" > file; print "/* DO NOT EDIT! */" > file; print "const char help_text[] = " > file; @@ -87,8 +90,24 @@ do mv $f.tmp $f done -# generate quick help from all the .R files -cat src/*.R | awk 'print_next { print_next = 0; print; } /!begin/ && />/ && /gamedesc.txt/ { print_next = 1; }' | awk -F ":" '{print "const char quick_help_text[] = \""$5"\";" >> "help/"$1".c" }' +# Generate quick help by parsing the CMakeLists.txt file to isolate +# the "Objective" text for each puzzle. +cat < parsed_cmakelists.txt +function(puzzle NAME) + cmake_parse_arguments(OPT + "" "DISPLAYNAME;DESCRIPTION;OBJECTIVE;WINDOWS_EXE_NAME" "" \${ARGN}) + + message("\${NAME}:\${OPT_OBJECTIVE}") +endfunction() +EOF + +# This parses out the puzzle(...) definitions from CMakeLists. + +# TODO: Perhaps ask Simon to include special header/footer comments to +# make this less brittle? +cat src/CMakeLists.txt | awk '/puzzle\(/{p=1} p{print} /\)/{p=0}' >> parsed_cmakelists.txt +cmake -P parsed_cmakelists.txt 2>&1 | awk -F ":" '{print "const char quick_help_text[] = \""$2"\";" >> "help/"$1".c" }' +rm parsed_cmakelists.txt rm puzzles.txt rm compress -- cgit v1.2.3