Make icon building cope with Solo's increased default tilesize as of r8455.

[sgt/puzzles] / Buildscr

diff --git a/Buildscr b/Buildscr
index b4995ed..3f2c863 100644 (file)
--- a/Buildscr
+++ b/Buildscr
@@ -8,7 +8,7 @@ in puzzles do perl mkfiles.pl
 in puzzles do make
 
 # Now build the screenshots and icons.
-in puzzles/icons do xvfb-run make web winicons gtkicons
+in puzzles/icons do xvfb-run -s "-screen 0 1024x768x24" make web winicons gtkicons
 
 # Re-run mkfiles.pl now that it knows the icons are there.
 in puzzles do perl mkfiles.pl
@@ -100,6 +100,12 @@ 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 $(revision)
 
+# Build the Java applets. This requires .bob.conf on the master
+# build machine to have defined the variable NESTEDVM pointing at
+# the top-level directory of an installation of the NestedVM
+# compiler and tools.
+in puzzles do make -f Makefile.nestedvm NESTEDVM=$(NESTEDVM) VER=-DREVISION=$(revision)
+
 # 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
@@ -119,6 +125,7 @@ deliver puzzles/puzzles.hlp $@
 deliver puzzles/puzzles.cnt $@
 deliver puzzles/puzzles.zip $@
 deliver puzzles/Output/setup.exe puzzles-r$(revision)-installer.exe
+deliver puzzles/*.jar java/$@
 
 # deliver puzzles/puzzles.armv4.cab $@ # (not built at the moment)