From 603409d092f5008d12e09f712eac4ba3381207eb Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Tue, 13 Jan 2015 20:30:40 +0000 Subject: [PATCH] Couple of fixes to the new web-page mechanism. I missed some spaces in the autogenerated s, and I generated the web page components including unfinished puzzles by mistake. --- Buildscr | 6 +++--- webpage.pl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Buildscr b/Buildscr index e63df1b..1b99d5d 100644 --- a/Buildscr +++ b/Buildscr @@ -126,6 +126,9 @@ in puzzles do zip -j puzzles.zip winbin/*.exe puzzles.chm puzzles.hlp puzzles.cn # _parent_ directory, so be careful when we deliver it.) in puzzles do ./makedist.sh $(Version) +# Build the autogenerated pieces of the main web page. +in puzzles do perl webpage.pl + ifneq "$(JAVA_UNFINISHED)" "" in puzzles do perl -i~ -pe 'print "!srcdir unfinished/\n" if /!srcdir icons/' Recipe ifneq "$(JAVA_UNFINISHED)" "" in puzzles do ln -s unfinished/group.R . ifneq "$(JAVA_UNFINISHED)" "" in puzzles do perl mkfiles.pl @@ -146,9 +149,6 @@ delegate emscripten return puzzles/js/*.js enddelegate -# Build the autogenerated pieces of the main web page. -in puzzles do perl webpage.pl - # Set up .htaccess containing a redirect for the archive filename. in puzzles do echo "AddType application/octet-stream .chm" > .htaccess in puzzles do echo "AddType application/octet-stream .hlp" >> .htaccess diff --git a/webpage.pl b/webpage.pl index 800b183..de2478e 100755 --- a/webpage.pl +++ b/webpage.pl @@ -30,11 +30,11 @@ while (<$desc>) { ''. ''. '['. - 'java'. + ' java '. '|'. - 'js'. + ' js '. '|'. - 'manual'. + ' manual '. ']
['. '%s'. ']'.