From e6059f18d49410beaab5aa0679a7467ce021fdc1 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sat, 21 Jan 2017 14:55:52 +0000 Subject: [PATCH] Build a set of Windows 32-bit 'legacy' binaries with VS2003. The downside of moving to VS2015 is that its output won't run on very old versions of Windows. It's not yet clear whether anyone still cares about things before, say, Win2000 or WinXP, but since my build environment still _has_ VS2003 available, it's easy enough to build the extra set of binaries anyway just in case. (At least for now.) The new binaries live in a build output directory 'w32old'. As with w64, there is no installer for them; but unlike w64, I don't intend to add one. --- Buildscr | 11 ++++++++++- sign.sh | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Buildscr b/Buildscr index 7895634d..c7e32302 100644 --- a/Buildscr +++ b/Buildscr @@ -155,7 +155,10 @@ in putty do convert -size 164x312 'gradient:blue-white' -distort SRT -90 -swirl in putty do convert -size 493x58 canvas:white \( icons/putty-48.png -geometry +440+5 \) -composite windows/msibanner.bmp delegate windows - # Build the main binaries. + # Build the original binaries. + in putty/windows with visualstudio do/win mkdir buildold && nmake -f Makefile.vc BUILDDIR=buildold\ $(Makeargs) all cleantestprogs + + # Build the VS2015 binaries. in putty/windows with visualstudio2015_32bit do/win mkdir build32 && nmake -f Makefile.vc BUILDDIR=build32\ $(Makeargs) all cleantestprogs in putty/windows with visualstudio2015_64bit do/win mkdir build64 && nmake -f Makefile.vc BUILDDIR=build64\ $(Makeargs) all cleantestprogs @@ -181,6 +184,8 @@ delegate windows ifneq "$(winsigncode)" "" in putty/windows do $(winsigncode) -i http://www.chiark.greenend.org.uk/~sgtatham/putty/ -n "PuTTY Installer" installer.msi Output/installer.exe # Finished Windows builds. + return putty/windows/buildold/*.exe + return putty/windows/buildold/*.map return putty/windows/build32/*.exe return putty/windows/build32/*.map return putty/windows/build64/*.exe @@ -191,11 +196,14 @@ delegate windows enddelegate in putty/doc do make mostlyclean in putty/doc do make $(Docmakever) +in putty/windows/buildold do zip -k -j putty.zip `ls *.exe | grep -v puttytel` ../../doc/putty.chm ../../doc/putty.hlp ../../doc/putty.cnt in putty/windows/build32 do zip -k -j putty.zip `ls *.exe | grep -v puttytel` ../../doc/putty.chm ../../doc/putty.hlp ../../doc/putty.cnt in putty/windows/build64 do zip -k -j putty.zip `ls *.exe | grep -v puttytel` ../../doc/putty.chm ../../doc/putty.hlp ../../doc/putty.cnt in putty/doc do zip puttydoc.zip *.html # Deliver the actual PuTTY release directory into a subdir `putty'. +deliver putty/windows/buildold/*.exe putty/w32old/$@ +deliver putty/windows/buildold/putty.zip putty/w32old/$@ deliver putty/windows/build32/*.exe putty/w32/$@ deliver putty/windows/build32/putty.zip putty/w32/$@ deliver putty/windows/build64/*.exe putty/w64/$@ @@ -212,6 +220,7 @@ deliver putty/putty-src.zip putty/$@ deliver putty/*.tar.gz putty/$@ # Deliver the map files alongside the `proper' release deliverables. +deliver putty/windows/buildold/*.map maps/w32old/$@ deliver putty/windows/build32/*.map maps/w32/$@ deliver putty/windows/build64/*.map maps/w64/$@ diff --git a/sign.sh b/sign.sh index f7a75482..3fdae569 100755 --- a/sign.sh +++ b/sign.sh @@ -27,7 +27,7 @@ sign() { cd "$1" echo "===== Signing with key '$keyname'" -for i in putty*src.zip putty*.tar.gz w32/*.exe w32/*.zip w32/*.msi w64/*.exe w64/*.zip; do +for i in putty*src.zip putty*.tar.gz w32/*.exe w32/*.zip w32/*.msi w64/*.exe w64/*.zip w32old/*.exe w32old/*.zip; do sign --detach-sign "$i" "$i.gpg" done for i in md5sums sha1sums sha256sums sha512sums; do