From 7ccc105c81094011110297ef8dfeba9ba08ad023 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sat, 21 Jan 2017 14:55:47 +0000 Subject: [PATCH] Do the Windows build in a subdirectory windows/build32. Uses the BUILDDIR mechanism I added to Makefile.vc in commit d3db17f3e. This change is purely internal to Buildscr, and shouldn't affect the output of a build. It paves the way to have Buildscr run multiple Windows builds using different compilers, by putting each one in a different subdirectory so that their outputs don't collide. --- Buildscr | 18 +++++++++--------- windows/installer.wxs | 12 ++++++------ windows/putty.iss | 12 ++++++------ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Buildscr b/Buildscr index 863f01bd..c8cce389 100644 --- a/Buildscr +++ b/Buildscr @@ -156,14 +156,14 @@ in putty do convert -size 493x58 canvas:white \( icons/putty-48.png -geometry +4 delegate windows # Build the main binaries. - in putty/windows with visualstudio do/win nmake -f Makefile.vc $(Makeargs) all cleantestprogs + in putty/windows with visualstudio do/win mkdir build32 && nmake -f Makefile.vc BUILDDIR=build32\ $(Makeargs) all cleantestprogs # 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 putty/windows do $(winsigncode) -i http://www.chiark.greenend.org.uk/~sgtatham/putty/ *.exe + ifneq "$(winsigncode)" "" in putty/windows do $(winsigncode) -i http://www.chiark.greenend.org.uk/~sgtatham/putty/ build*/*.exe # Ignore exit code from hhc, in favour of seeing whether the .chm # file was created. (Yuck; but hhc appears to return non-zero @@ -171,7 +171,7 @@ delegate windows in putty/doc with htmlhelp do/win hhc putty.hhp & type putty.chm >nul # Build the WiX MSI installer. - in putty/windows with wix do/win candle -dWinver="$(Winver)" -dPuttytextver="$(Puttytextver)" installer.wxs && light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj + in putty/windows with wix do/win candle -dBuilddir=build32\ -dWinver="$(Winver)" -dPuttytextver="$(Puttytextver)" installer.wxs && light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj # Build the old Inno Setup installer. in putty/windows with innosetup do/win iscc putty.iss @@ -180,20 +180,20 @@ 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/*.exe - return putty/windows/*.map + return putty/windows/build32/*.exe + return putty/windows/build32/*.map return putty/doc/putty.chm return putty/windows/installer.msi return putty/windows/Output/installer.exe enddelegate in putty/doc do make mostlyclean in putty/doc do make $(Docmakever) -in putty/windows 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/doc do zip puttydoc.zip *.html # Deliver the actual PuTTY release directory into a subdir `putty'. -deliver putty/windows/*.exe putty/x86/$@ -deliver putty/windows/putty.zip putty/x86/$@ +deliver putty/windows/build32/*.exe putty/x86/$@ +deliver putty/windows/build32/putty.zip putty/x86/$@ deliver putty/windows/installer.msi putty/x86/$(Ifilename).msi deliver putty/windows/Output/installer.exe putty/x86/$(Ifilename).exe deliver putty/doc/puttydoc.zip putty/$@ @@ -206,7 +206,7 @@ deliver putty/putty-src.zip putty/$@ deliver putty/*.tar.gz putty/$@ # Deliver the map files alongside the `proper' release deliverables. -deliver putty/windows/*.map maps-x86/$@ +deliver putty/windows/build32/*.map maps-x86/$@ # Deliver sign.sh, so that whoever has just built PuTTY (the # snapshot scripts or me, depending) can conveniently sign it with diff --git a/windows/installer.wxs b/windows/installer.wxs index 52e7cb77..53a3f84e 100644 --- a/windows/installer.wxs +++ b/windows/installer.wxs @@ -92,7 +92,7 @@ + Source="$(var.Builddir)putty.exe" KeyPath="yes"> @@ -101,7 +101,7 @@ + Source="$(var.Builddir)pageant.exe" KeyPath="yes"> @@ -110,7 +110,7 @@ + Source="$(var.Builddir)psftp.exe" KeyPath="yes"> @@ -119,7 +119,7 @@ + Source="$(var.Builddir)puttygen.exe" KeyPath="yes"> @@ -128,12 +128,12 @@ + Source="$(var.Builddir)plink.exe" KeyPath="yes" /> + Source="$(var.Builddir)pscp.exe" KeyPath="yes" />