zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 08:01:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update Buildscr to use the new 'with' mechanism.

Browse Source
This commit is contained in:
Simon Tatham
2016-03-01 18:42:42 +00:00
parent 70cb6cfa7a
commit de91c4eac7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Buildscr
View File

@ -57,10 +57,10 @@ in puzzles do perl winiss.pl $(Version) gamedesc.txt > puzzles.iss
delegate windows delegate windows
# Ignore the poorly controlled return value from HHC, and instead # Ignore the poorly controlled return value from HHC, and instead
# just test that the output file was generated. # just test that the output file was generated.
in puzzles do/win hhc puzzles.hhp & type puzzles.chm >nul in puzzles with htmlhelp do/win hhc puzzles.hhp & type puzzles.chm >nul
# FIXME: Cygwin alternative? # FIXME: Cygwin alternative?
in puzzles do/win vcvars32 && nmake -f Makefile.vc clean in puzzles with visualstudio do/win nmake -f Makefile.vc clean
in puzzles do/win vcvars32 && nmake -f Makefile.vc VER=-DVER=$(Version) in puzzles with visualstudio do/win nmake -f Makefile.vc VER=-DVER=$(Version)
# Code-sign the binaries, if the local bob config provides a script # 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 # 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 # provide a 'more info' URL, and an optional -n option to provide a
@ -68,7 +68,7 @@ delegate windows
# arguments and sign them all in place. # arguments and sign them all in place.
ifneq "$(winsigncode)" "" in puzzles do $(winsigncode) -i http://www.chiark.greenend.org.uk/~sgtatham/puzzles/ *.exe ifneq "$(winsigncode)" "" in puzzles do $(winsigncode) -i http://www.chiark.greenend.org.uk/~sgtatham/puzzles/ *.exe
# Build installer. # Build installer.
in puzzles do/win iscc puzzles.iss in puzzles with innosetup do/win iscc puzzles.iss
ifneq "$(winsigncode)" "" in puzzles do $(winsigncode) -i http://www.chiark.greenend.org.uk/~sgtatham/puzzles/ -n "Simon Tatham's Portable Puzzle Collection Installer" Output/setup.exe ifneq "$(winsigncode)" "" in puzzles do $(winsigncode) -i http://www.chiark.greenend.org.uk/~sgtatham/puzzles/ -n "Simon Tatham's Portable Puzzle Collection Installer" Output/setup.exe
return puzzles/puzzles.chm return puzzles/puzzles.chm
return puzzles/*.exe return puzzles/*.exe