ref: 7ae22afaf365d7012ebca82b069cf9b3a145b302
parent: 5732d1d2674573ce96b2203aec512e57533e64d1
author: Simon Tatham <anakin@pobox.com>
date: Thu Jun 27 17:17:04 EDT 2013
Adjust the build script to turn the NestedVM build into a delegation, so that not every machine on which I want to run the full Puzzles build will have to have a local NestedVM installation. [originally from svn r9882]
--- a/Buildscr
+++ b/Buildscr
@@ -106,11 +106,11 @@
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)
+# Build the Java applets.
+delegate nestedvm
+ in puzzles do make -f Makefile.nestedvm NESTEDVM="$$NESTEDVM" VER=-DREVISION=$(revision)
+ return puzzles/*.jar
+enddelegate
# Build the Javascript applets. Since my master build machine doesn't
# have the right dependencies installed for Emscripten, I do this by a