From 7ae22afaf365d7012ebca82b069cf9b3a145b302 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Thu, 27 Jun 2013 21:17:04 +0000 Subject: [PATCH] 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] --- Buildscr | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Buildscr b/Buildscr index 9552fb3..a1b1a29 100644 --- a/Buildscr +++ b/Buildscr @@ -106,11 +106,11 @@ ifneq "$(JAVA_UNFINISHED)" "" in puzzles do perl -i~ -pe 'print "!srcdir unfinis 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 -- 2.30.2