X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=Buildscr;h=1b99d5dd04cf518fce76ef73e109d201c67bd3d2;hb=3234912f921916a1b8da164fd61dc75579358577;hp=5d44ff9f563bffb4682dedf19b2b672a415f132a;hpb=e794621861ee5a93202d6df748fec638be76a211;p=sgt-puzzles.git diff --git a/Buildscr b/Buildscr index 5d44ff9..1b99d5d 100644 --- a/Buildscr +++ b/Buildscr @@ -3,24 +3,49 @@ module puzzles +set Version $(!builddate).$(vcsid) + +# Start by substituting the right version number in configure.ac. +in puzzles do perl -i~ -pe 's/6.66/$(Version)/' configure.ac +in puzzles do rm configure.ac~ + +# And put it into the documentation as a versionid. +# use perl to avoid inconsistent behaviour of echo '\v' +in puzzles do perl -e 'print "\n\\versionid Simon Tatham'\''s Portable Puzzle Collection, version $$ARGV[0]\n"' $(Version) >> puzzles.but +in puzzles do perl -e 'print "\n\\versionid Simon Tatham'\''s Portable Puzzle Collection, version $$ARGV[0]\n"' $(Version) >> devel.but + +# Write out a version.h that contains the real version number. +in puzzles do echo '/* Generated by automated build script */' > version.h +in puzzles do echo '$#define VER "Version $(Version)"' >> version.h + +# And do the same substitution in the OS X metadata. (This is a bit +# icky in principle because it presumes that my version numbers don't +# need XML escaping, but frankly, if they ever do then I should fix +# them!) +in puzzles do perl -i -pe 's/Unidentified build/$(Version)/' osx-info.plist + # First build some local binaries, to run the icon build. -in puzzles do perl mkfiles.pl +in puzzles do perl mkfiles.pl -U in puzzles do make # Now build the screenshots and icons. in puzzles/icons do xvfb-run -s "-screen 0 1024x768x24" make web winicons gtkicons +# Destroy the local binaries and autoconf detritus, mostly to avoid +# wasting network bandwidth by transferring them to the delegate +# servers. +in puzzles do make distclean + # 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 +# Rebuild the configure script. +in puzzles do ./mkauto.sh # 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) + in puzzles do make -f Makefile.osx release VER=-DVER=$(Version) return puzzles/Puzzles.dmg enddelegate @@ -28,14 +53,14 @@ enddelegate in puzzles do make -f Makefile.doc clean in puzzles do make -f Makefile.doc chm in puzzles do make -f Makefile.doc # build help file for installer -in puzzles do perl winiss.pl $(revision) wingames.lst > puzzles.iss +in puzzles do perl winiss.pl $(Version) gamedesc.txt > puzzles.iss delegate windows # Ignore the poorly controlled return value from HHC, and instead # just test that the output file was generated. 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 VER=-DREVISION=$(revision)' + in puzzles do cmd /c 'vcvars32 & nmake -f Makefile.vc VER=-DVER=$(Version)' # Build installer. in puzzles do iscc puzzles.iss return puzzles/puzzles.chm @@ -65,10 +90,10 @@ in puzzles do chmod +x *.exe # approaches such as a third-party CAB generator), I don't think I # can sensibly enable this build. -#in puzzles do perl wceinf.pl wingames.lst > puzzles.inf +#in puzzles do perl wceinf.pl gamedesc.txt > puzzles.inf #delegate windows # in puzzles do cmd /c 'wcearmv4 & nmake -f Makefile.wce clean' -# in puzzles do cmd /c 'wcearmv4 & nmake -f Makefile.wce VER=-DREVISION=$(revision)' +# in puzzles do cmd /c 'wcearmv4 & nmake -f Makefile.wce VER=-DVER=$(Version)' # # Nasty piece of sh here which saves the return code from cabwiz, # # outputs its errors and/or warnings, and then propagates the # # return code back to bob. If only cabwiz could output to @@ -88,31 +113,48 @@ in puzzles/doc do halibut --html -Chtml-contents-filename:index.html -Chtml-inde in puzzles/devel do halibut --html -Chtml-contents-filename:index.html -Chtml-index-filename:indexpage.html -Chtml-template-filename:%k.html -Chtml-template-fragment:%k ../devel.but # Move the deliver-worthy Windows binaries (those specified in -# wingames.lst, which is generated by mkfiles.pl and helpfully +# gamedesc.txt, which is generated by mkfiles.pl and helpfully # excludes the command-line auxiliary utilities such as solosolver, # and nullgame.exe) into a subdirectory for easy access. in puzzles do mkdir winbin -in puzzles do mv `cut -f1 -d: wingames.lst` winbin +in puzzles do mv `cut -f2 -d: gamedesc.txt` winbin # Make a zip file of the Windows binaries and help files. in puzzles do zip -j puzzles.zip winbin/*.exe puzzles.chm puzzles.hlp puzzles.cnt # Create the source archive. (That writes the archive into the # _parent_ directory, so be careful when we deliver it.) -in puzzles do ./makedist.sh $(revision) +in puzzles do ./makedist.sh $(Version) + +# Build the autogenerated pieces of the main web page. +in puzzles do perl webpage.pl + +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) +# Build the Java applets. +delegate nestedvm + in puzzles do make -f Makefile.nestedvm NESTEDVM="$$NESTEDVM" VER=-DVER=$(Version) + 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 +# delegation. +in puzzles do mkdir js # so we can tell output .js files from emcc*.js +delegate emscripten + in puzzles do make -f Makefile.emcc OUTPREFIX=js/ clean + in puzzles do make -f Makefile.emcc OUTPREFIX=js/ + return puzzles/js/*.js +enddelegate # 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 in puzzles do echo "AddType application/octet-stream .cnt" >> .htaccess in . do set -- puzzles*.tar.gz; echo RedirectMatch temp '(.*/)'puzzles.tar.gz '$$1'"$$1" >> puzzles/.htaccess -in puzzles do echo RedirectMatch temp '(.*/)'puzzles-installer.exe '$$1'puzzles-r$(revision)-installer.exe >> .htaccess +in puzzles do echo RedirectMatch temp '(.*/)'puzzles-installer.exe '$$1'puzzles-$(Version)-installer.exe >> .htaccess # Phew, we're done. Deliver everything! deliver puzzles/icons/*-web.png $@ @@ -125,8 +167,13 @@ 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/Output/setup.exe puzzles-$(Version)-installer.exe deliver puzzles/*.jar java/$@ +deliver puzzles/js/*.js js/$@ +deliver puzzles/html/*.html html/$@ +deliver puzzles/html/*.pl html/$@ +deliver puzzles/wwwspans.html $@ +deliver puzzles/wwwlinks.html $@ # deliver puzzles/puzzles.armv4.cab $@ # (not built at the moment)