Update Buildscr to use the new 'with' mechanism.

[sgt-puzzles.git] / Buildscr

diff --git a/Buildscr b/Buildscr
index a677531453181cfa688d68e66d504bcab4f047de..3097df59cff794e67d258cdc367cc83965f9b03f 100644 (file)
--- a/Buildscr
+++ b/Buildscr
@@ -18,6 +18,12 @@ in puzzles do perl -e 'print "\n\\versionid Simon Tatham'\''s Portable Puzzle Co
 in puzzles do echo '/* Generated by automated build script */' > version.h
 in puzzles do echo '$#define VER "Version $(Version)"' >> version.h
 
+# And do the same substitution in the OS X metadata. (This is a bit
+# icky in principle because it presumes that my version numbers don't
+# need XML escaping, but frankly, if they ever do then I should fix
+# them!)
+in puzzles do perl -i -pe 's/Unidentified build/$(Version)/' osx-info.plist
+
 # First build some local binaries, to run the icon build.
 in puzzles do perl mkfiles.pl -U
 in puzzles do make
@@ -51,12 +57,19 @@ in puzzles do perl winiss.pl $(Version) gamedesc.txt > puzzles.iss
 delegate windows
   # Ignore the poorly controlled return value from HHC, and instead
   # just test that the output file was generated.
-  in puzzles do hhc puzzles.hhp; test -f puzzles.chm
+  in puzzles with htmlhelp do/win hhc puzzles.hhp & type puzzles.chm >nul
   # FIXME: Cygwin alternative?
-  in puzzles do cmd /c 'vcvars32 & nmake -f Makefile.vc clean'
-  in puzzles do cmd /c 'vcvars32 & nmake -f Makefile.vc VER=-DVER=$(Version)'
+  in puzzles with visualstudio do/win nmake -f Makefile.vc clean
+  in puzzles with visualstudio do/win nmake -f Makefile.vc VER=-DVER=$(Version)
+  # Code-sign the binaries, if the local bob config provides a script
+  # to do so. We assume here that the script accepts an -i option to
+  # provide a 'more info' URL, and an optional -n option to provide a
+  # program name, and that it can take multiple .exe filename
+  # arguments and sign them all in place.
+  ifneq "$(winsigncode)" "" in puzzles do $(winsigncode) -i http://www.chiark.greenend.org.uk/~sgtatham/puzzles/ *.exe
   # Build installer.
-  in puzzles do iscc puzzles.iss
+  in puzzles with innosetup do/win iscc puzzles.iss
+  ifneq "$(winsigncode)" "" in puzzles do $(winsigncode) -i http://www.chiark.greenend.org.uk/~sgtatham/puzzles/ -n "Simon Tatham's Portable Puzzle Collection Installer" Output/setup.exe
   return puzzles/puzzles.chm
   return puzzles/*.exe
   return puzzles/Output/setup.exe
@@ -120,6 +133,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
@@ -163,6 +179,8 @@ deliver puzzles/*.jar java/$@
 deliver puzzles/js/*.js js/$@
 deliver puzzles/html/*.html html/$@
 deliver puzzles/html/*.pl html/$@
+deliver puzzles/wwwspans.html $@
+deliver puzzles/wwwlinks.html $@
 
 # deliver puzzles/puzzles.armv4.cab $@ # (not built at the moment)