X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/9bb2f5af8376dce30342a462e24708244763e00c..f3ed4ec32e8aae98bfb9d3f184f6d755ba1c871f:/Buildscr

diff --git a/Buildscr b/Buildscr
index 5c555ae..dde4726 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,7 +20,7 @@ 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
 
@@ -28,7 +33,7 @@ delegate windows
   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)'
   return puzzles/puzzles.chm
   return puzzles/*.exe
 enddelegate
@@ -59,7 +64,7 @@ in puzzles do ./makedist.sh $(revision)
 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 puzzles do set -- puzzles*.tar.gz; echo RedirectMatch temp '(.*/)'puzzles.tar.gz '$$1'"$$1" >> .htaccess
+in . do set -- puzzles*.tar.gz; echo RedirectMatch temp '(.*/)'puzzles.tar.gz '$$1'"$$1" >> puzzles/.htaccess
 
 # Phew, we're done. Deliver everything!
 deliver puzzles/icons/*-web.png $@