X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/c15493932bd57ae7abf7897d7b0ed6a7bd7a8e85..HEAD:/Buildscr

diff --git a/Buildscr b/Buildscr
index b4995ed..b079367 100644
--- 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
@@ -18,11 +18,12 @@ in puzzles do perl mkfiles.pl
 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 VER=-DREVISION=$(revision)
-  return puzzles/Puzzles.dmg
-enddelegate
+# 2012-04-03: commented out because my Mac is dead.
+#delegate osx
+#  in puzzles do make -f Makefile.osx clean
+#  in puzzles do make -f Makefile.osx release VER=-DREVISION=$(revision)
+#  return puzzles/Puzzles.dmg
+#enddelegate
 
 # Build the Windows binaries and installer, and the CHM file.
 in puzzles do make -f Makefile.doc clean
@@ -42,6 +43,7 @@ delegate windows
   return puzzles/*.exe
   return puzzles/Output/setup.exe
 enddelegate
+in puzzles do chmod +x *.exe
 
 # Build the Pocket PC binaries and CAB.
 #
@@ -100,6 +102,16 @@ 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)
 
+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
+
+# 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
@@ -113,12 +125,13 @@ deliver puzzles/winbin/*.exe $@
 deliver puzzles/.htaccess $@
 deliver puzzles/doc/*.html doc/$@
 deliver puzzles/devel/*.html devel/$@
-deliver puzzles/Puzzles.dmg $@
+#deliver puzzles/Puzzles.dmg $@ # 2012-04-03 commented out, see above
 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
+deliver puzzles/*.jar java/$@
 
 # deliver puzzles/puzzles.armv4.cab $@ # (not built at the moment)