nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-09 23:28:06 -05:00
Code Issues Projects Releases Wiki Activity

Fix errors in $(Makeargs) which only occur when building development

Browse Source 
snapshots.

[originally from svn r7220]
This commit is contained in:
Simon Tatham 2007-02-05 08:02:01 +00:00
parent 64b4984354
commit 9951498e63
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Buildscr
View File

@ -2,9 +2,10 @@
# Build script to construct a full distribution directory of PuTTY.
# Set up the arguments for the main make command.
set Makeargs VER="-DSVN_REV=$(revision)"
ifneq "$(RELEASE)" "" set Makeargs $(Makeargs) VER="-DRELEASE=$(RELEASE)"
ifneq "$(date)" "" set Makeargs $(Makeargs) VER="-DSNAPSHOT=$(date)"
set Makever -DSVN_REV=$(revision)
ifneq "$(RELEASE)" "" set Makever $(Makever) -DRELEASE=$(RELEASE)
ifneq "$(date)" "" set Makever $(Makever) -DSNAPSHOT=$(date)
set Makeargs VER="$(Makever)"
ifneq "$(XFLAGS)" "" set Makeargs $(makeargs) XFLAGS="$(XFLAGS)"
ifneq "$(MAKEARGS)" "" set Makeargs $(makeargs) $(MAKEARGS)
@ -46,7 +47,7 @@ in putty/windows do perl -i~ -pe 'BEGIN{$$a=shift@ARGV;$$a=~s/M//;}s/^(VersionIn
delegate windows
# FIXME: Cygwin alternative?
in putty/windows do cmd /c 'vcvars32 & nmake -f Makefile.vc $(Makeargs)'
in putty/windows do cmd /c vcvars32 \& nmake -f Makefile.vc $(Makeargs)
# Ignore exit code from hhc, in favour of seeing whether the .chm
# file was created. (Yuck; but hhc appears to return non-zero
# exit codes on whim.)