Rename the 'x86' build output directory to 'w32'.

This change does affect the layout of the output build directory, and
will need corresponding website changes to avoid breaking links.

'x86' was a misnomer anyway, because it was really Windows-specific
rather than just x86-specific. Calling it 'w32' will make it look less
strange to add 'w64' alongside it.

diff --git a/Buildscr b/Buildscr
index c8cce3898271f1b69955276aa1c4b5f1f13f2753..b90067e2bb57b9ca7f411dc79dd501bd4e59b1b9 100644 (file)
--- a/Buildscr
+++ b/Buildscr
@@ -192,10 +192,10 @@ in putty/windows/build32 do zip -k -j putty.zip `ls *.exe | grep -v puttytel` ..
 in putty/doc do zip puttydoc.zip *.html
 
 # Deliver the actual PuTTY release directory into a subdir `putty'.
-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/windows/build32/*.exe putty/w32/$@
+deliver putty/windows/build32/putty.zip putty/w32/$@
+deliver putty/windows/installer.msi putty/w32/$(Ifilename).msi
+deliver putty/windows/Output/installer.exe putty/w32/$(Ifilename).exe
 deliver putty/doc/puttydoc.zip putty/$@
 deliver putty/doc/putty.chm putty/$@
 deliver putty/doc/putty.hlp 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/build32/*.map maps-x86/$@
+deliver putty/windows/build32/*.map maps/w32/$@
 
 # Deliver sign.sh, so that whoever has just built PuTTY (the
 # snapshot scripts or me, depending) can conveniently sign it with
@@ -229,5 +229,5 @@ in-dest putty do echo "AddType application/octet-stream .chm" >> .htaccess
 in-dest putty do echo "AddType application/octet-stream .hlp" >> .htaccess
 in-dest putty do echo "AddType application/octet-stream .cnt" >> .htaccess
 in-dest putty do set -- putty*.tar.gz; for k in '' .gpg; do echo RedirectMatch temp '(.*/)'putty.tar.gz$$k\$$ '$$1'"$$1$$k" >> .htaccess; done
-# And one in the x86 directory, providing links for the installers.
-in-dest putty/x86 do for ext in msi exe; do set -- putty*installer.$$ext; for k in '' .gpg; do echo RedirectMatch temp '(.*/)'putty-installer.$$ext$$k\$$ '$$1'"$$1$$k" >> .htaccess; done; done
+# And one in the w32 directory, providing links for the installers.
+in-dest putty/w32 do for ext in msi exe; do set -- putty*installer.$$ext; for k in '' .gpg; do echo RedirectMatch temp '(.*/)'putty-installer.$$ext$$k\$$ '$$1'"$$1$$k" >> .htaccess; done; done

diff --git a/sign.sh b/sign.sh
index 887704751ff296b00268d11f21b1e9410ec5229f..84552cf3a0ffca632a1be2d0730b3bf0e5a9eea9 100755 (executable)
--- 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 x86/*.exe x86/*.zip x86/*.msi; do
+for i in putty*src.zip putty*.tar.gz w32/*.exe w32/*.zip w32/*.msi; do
     sign --detach-sign "$i" "$i.gpg"
 done
 for i in md5sums sha1sums sha256sums sha512sums; do