Convert Buildscr to use the new "do/win" mechanism.

[sgt-puzzles.git] / Buildscr

diff --git a/Buildscr b/Buildscr
index 1b99d5dd04cf518fce76ef73e109d201c67bd3d2..a009d601c8b5a1db2ed930f9c5f95d9f29e9c6ed 100644 (file)
--- a/Buildscr
+++ b/Buildscr
@@ -57,12 +57,12 @@ 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
+  in puzzles do/win hhc puzzles.hhp & type puzzles.chm >nul
   # 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=-DVER=$(Version)'
+  in puzzles do/win vcvars32 && nmake -f Makefile.vc clean
+  in puzzles do/win vcvars32 && nmake -f Makefile.vc VER=-DVER=$(Version)
   # Build installer.
-  in puzzles do iscc puzzles.iss
+  in puzzles do/win iscc puzzles.iss
   return puzzles/puzzles.chm
   return puzzles/*.exe
   return puzzles/Output/setup.exe