X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=Buildscr;h=b8a585b43ea5c31dd74549b697f85d5a907cb03e;hb=3aa4516a680f52e2e6c8a16234a7ecca0ec77233;hp=c72084477baf0a0733da248b99588732d70ff601;hpb=7bdfda840962e0de7442c4f58d37ca1f560a5797;p=sgt-puzzles.git

diff --git a/Buildscr b/Buildscr
index c720844..b8a585b 100644
--- a/Buildscr
+++ b/Buildscr
@@ -54,24 +54,30 @@ in puzzles do make -f Makefile.doc clean
 in puzzles do make -f Makefile.doc # build help files for installer
 in puzzles do mason.pl --args '{"version":"$(Version)","descfile":"gamedesc.txt"}' winwix.mc > puzzles.wxs
 in puzzles do perl winiss.pl $(Version) gamedesc.txt > puzzles.iss
-delegate windows
-  # FIXME: Cygwin alternative?
-  in puzzles with visualstudio do/win nmake -f Makefile.vc clean
-  in puzzles with visualstudio do/win nmake -f Makefile.vc VER=-DVER=$(Version)
+ifneq "$(VISUAL_STUDIO)" "yes" then
+  in puzzles with clangcl64 do Platform=x64 make -f Makefile.clangcl clean
+  in puzzles with clangcl64 do Platform=x64 make -f Makefile.clangcl VER=-DVER=$(Version)
   # Code-sign the binaries, if the local bob config provides a script
   # to do so. We assume here that the script accepts an -i option to
   # provide a 'more info' URL, and an optional -n option to provide a
   # program name, and that it can take multiple .exe filename
   # arguments and sign them all in place.
-  ifneq "$(winsigncode)" "" in puzzles do $(winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/puzzles/ *.exe
+  ifneq "$(cross_winsigncode)" "" in puzzles do $(cross_winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/puzzles/ *.exe
   # Build installers.
-  in puzzles with wix do/win candle puzzles.wxs && light -ext WixUIExtension -sval puzzles.wixobj
-  in puzzles with innosetup do/win iscc puzzles.iss
-  ifneq "$(winsigncode)" "" in puzzles do $(winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/puzzles/ -n "Simon Tatham's Portable Puzzle Collection Installer" puzzles.msi Output/installer.exe
-  return puzzles/*.exe
-  return puzzles/Output/installer.exe
-  return puzzles/puzzles.msi
-enddelegate
+  in puzzles with wixonlinux do candle -arch x64 puzzles.wxs && light -ext WixUIExtension -sval puzzles.wixobj
+  ifneq "$(cross_winsigncode)" "" in puzzles do $(cross_winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/puzzles/ -n "Simon Tatham's Portable Puzzle Collection Installer" puzzles.msi
+else
+  delegate windows
+    in puzzles with visualstudio do/win nmake -f Makefile.vc clean
+    in puzzles with visualstudio do/win nmake -f Makefile.vc VER=-DVER=$(Version)
+    ifneq "$(winsigncode)" "" in puzzles do $(winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/puzzles/ *.exe
+    # Build installers.
+    in puzzles with wix do/win candle puzzles.wxs && light -ext WixUIExtension -sval puzzles.wixobj
+    in puzzles with innosetup do/win iscc puzzles.iss
+    return puzzles/*.exe
+    return puzzles/puzzles.msi
+  enddelegate
+endif
 in puzzles do chmod +x *.exe
 
 # Build the Pocket PC binaries and CAB.
@@ -152,13 +158,22 @@ delegate emscripten
   return puzzles/js/*.js
 enddelegate
 
+# Build a set of wrapping HTML pages for easy testing of the
+# Javascript puzzles. These aren't quite the same as the versions that
+# will go on my live website, because those ones will substitute in a
+# different footer, and not have to link to the .js files with the
+# ../js/ prefix. But these ones should be good enough to just open
+# using a file:// URL in a browser after running a build, and make
+# sure the main functionality works.
+in puzzles do mkdir jstest
+in puzzles/jstest do ../html/jspage.pl --jspath=../js/ /dev/null ../html/*.html
+
 # 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.msi '$$1'puzzles-$(Version)-installer.msi >> .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 $@
@@ -172,9 +187,9 @@ deliver puzzles/puzzles.hlp $@
 deliver puzzles/puzzles.cnt $@
 deliver puzzles/puzzles.zip $@
 deliver puzzles/puzzles.msi puzzles-$(Version)-installer.msi
-deliver puzzles/Output/installer.exe puzzles-$(Version)-installer.exe
 deliver puzzles/*.jar java/$@
 deliver puzzles/js/*.js js/$@
+deliver puzzles/jstest/*.html jstest/$@
 deliver puzzles/html/*.html html/$@
 deliver puzzles/html/*.pl html/$@
 deliver puzzles/wwwspans.html $@