X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/0c315fc3a4fa87ed920c3d9ad3a3ecd1f1b5b8d2..0968d748f157ecce4155b255ff98fa909c325bd9:/Buildscr

diff --git a/Buildscr b/Buildscr
index 033ece4..951795b 100644
--- a/Buildscr
+++ b/Buildscr
@@ -1,6 +1,8 @@
 # -*- sh -*-
 # Build script to build Puzzles.
 
+module puzzles
+
 # First build some local binaries, to run the icon build.
 in puzzles do perl mkfiles.pl
 in puzzles do make
@@ -8,6 +10,9 @@ in puzzles do make
 # Now build the screenshots and icons.
 in puzzles/icons do xvfb-run make web winicons gtkicons
 
+# Re-run mkfiles.pl now that it knows the icons are there.
+in puzzles do perl mkfiles.pl
+
 # Destroy the local binaries, mostly to avoid wasting network
 # bandwidth by transferring them to the delegate servers.
 in puzzles do make clean
@@ -15,27 +20,32 @@ in puzzles do make clean
 # Build the OS X .dmg archive.
 delegate osx
   in puzzles do make -f Makefile.osx clean
-  in puzzles do make -f Makefile.osx release
+  in puzzles do make -f Makefile.osx release VER=-DREVISION=$(revision)
   return puzzles/Puzzles.dmg
 enddelegate
 
-# Build the Windows binaries and the CHM file.
+# Build the Windows binaries and installer, and the CHM file.
 in puzzles do make -f Makefile.doc clean
 in puzzles do make -f Makefile.doc chm
+in puzzles do make -f Makefile.doc # build help file for installer
+in puzzles do perl winiss.pl $(revision) wingames.lst > 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
   # FIXME: Cygwin alternative?
   in puzzles do cmd /c 'vcvars32 & nmake -f Makefile.vc clean'
-  in puzzles do cmd /c 'vcvars32 & nmake -f Makefile.vc'
+  in puzzles do cmd /c 'vcvars32 & nmake -f Makefile.vc VER=-DREVISION=$(revision)'
+  # Build installer.
+  in puzzles do iscc puzzles.iss
   return puzzles/puzzles.chm
   return puzzles/*.exe
+  return puzzles/Output/setup.exe
 enddelegate
 
 # Build the help file and the HTML docs.
-in puzzles do make -f Makefile.doc clean
-in puzzles do make -f Makefile.doc
+in puzzles do make -f Makefile.doc clean # remove CHM-target HTML
+in puzzles do make -f Makefile.doc # and rebuild help file...
 in puzzles do mkdir doc
 in puzzles do mkdir devel
 in puzzles/doc do halibut --html -Chtml-contents-filename:index.html -Chtml-index-filename:indexpage.html -Chtml-template-filename:%k.html -Chtml-template-fragment:%k ../puzzles.but
@@ -46,7 +56,7 @@ in puzzles/devel do halibut --html -Chtml-contents-filename:index.html -Chtml-in
 # excludes the command-line auxiliary utilities such as solosolver,
 # and nullgame.exe) into a subdirectory for easy access.
 in puzzles do mkdir winbin
-in puzzles do mv `cat wingames.lst` winbin
+in puzzles do mv `cut -f1 -d: wingames.lst` winbin
 
 # Make a zip file of the Windows binaries and help files.
 in puzzles do zip -j puzzles.zip winbin/*.exe puzzles.chm puzzles.hlp puzzles.cnt
@@ -60,6 +70,7 @@ in puzzles do echo "AddType application/octet-stream .chm" > .htaccess
 in puzzles do echo "AddType application/octet-stream .hlp" >> .htaccess
 in puzzles do echo "AddType application/octet-stream .cnt" >> .htaccess
 in . do set -- puzzles*.tar.gz; echo RedirectMatch temp '(.*/)'puzzles.tar.gz '$$1'"$$1" >> puzzles/.htaccess
+in puzzles do echo RedirectMatch temp '(.*/)'puzzles-installer.exe '$$1'puzzles-r$(revision)-installer.exe >> .htaccess
 
 # Phew, we're done. Deliver everything!
 deliver puzzles/icons/*-web.png $@
@@ -72,6 +83,7 @@ deliver puzzles/puzzles.chm $@
 deliver puzzles/puzzles.hlp $@
 deliver puzzles/puzzles.cnt $@
 deliver puzzles/puzzles.zip $@
+deliver puzzles/Output/setup.exe puzzles-r$(revision)-installer.exe
 # This one isn't in the puzzles subdir, because makedist.sh left it
 # one level up.
 deliver puzzles*.tar.gz $@