1 files changed, 23 insertions, 4 deletions

diff --git a/apps/plugins/puzzles/genhelp.sh b/apps/plugins/puzzles/genhelp.sh
index 3df7706b5d..588eff4c97 100755
--- a/apps/plugins/puzzles/genhelp.sh
+++ b/apps/plugins/puzzles/genhelp.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 # usage: ./genhelp.sh
 #
-# Expects halibut to be installed in $PATH:
-# https://www.fwei.tk/git/halibut
+# Expects a modified version of `halibut' to be installed in $PATH:
+# https://github.com/built1n/halibut
 #
 # Also requires host CC and lz4 library to be available
 
@@ -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 <<EOF > 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