gitian: Windows 64 bit support

- Build a 64 bit version of all dependencies
- Show 32/64 bit version in "About..." for x86
- Export 64-bit .exes and installer from gitian build

1 files changed, 28 insertions, 28 deletions

diff --git a/doc/release-process.md b/doc/release-process.md
index 7fccf2172e..aadacf05f8 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -51,18 +51,18 @@ Release Process
 	wget 'https://download.qt-project.org/official_releases/qt/5.2/5.2.0/single/qt-everywhere-opensource-src-5.2.0.tar.gz'
 	wget 'https://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2'
 	cd ..
+	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-linux.yml
+	mv build/out/boost-*.zip inputs/
 	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-linux.yml
 	mv build/out/bitcoin-deps-*.zip inputs/
-	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-linux.yml
-	mv build/out/boost-linux-*.zip inputs/
-	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-win32.yml
-	mv build/out/boost-win32-*.zip inputs/
-	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-win32.yml
+	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-win.yml
+	mv build/out/boost-*.zip inputs/
+	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-win.yml
 	mv build/out/bitcoin-deps-*.zip inputs/
-	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/qt-win32.yml
-	mv build/out/qt-win32-*.zip inputs/
-	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/protobuf-win32.yml
-	mv build/out/protobuf-win32-*.zip inputs/
+	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/qt-win.yml
+	mv build/out/qt-*.zip inputs/
+	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/protobuf-win.yml
+	mv build/out/protobuf-*.zip inputs/
 
  Build bitcoind and bitcoin-qt on Linux32, Linux64, and Win32:
   
@@ -72,19 +72,19 @@ Release Process
 	zip -r bitcoin-${VERSION}-linux-gitian.zip *
 	mv bitcoin-${VERSION}-linux-gitian.zip ../../../
 	popd
-	./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml
-	./bin/gsign --signer $SIGNER --release ${VERSION}-win32 --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml
+	./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
+	./bin/gsign --signer $SIGNER --release ${VERSION}-win --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
 	pushd build/out
-	zip -r bitcoin-${VERSION}-win32-gitian.zip *
-	mv bitcoin-${VERSION}-win32-gitian.zip ../../../
+	zip -r bitcoin-${VERSION}-win-gitian.zip *
+	mv bitcoin-${VERSION}-win-gitian.zip ../../../
 	popd
 	popd
 
   Build output expected:
 
   1. linux 32-bit and 64-bit binaries + source (bitcoin-${VERSION}-linux-gitian.zip)
-  2. windows 32-bit binary, installer + source (bitcoin-${VERSION}-win32-gitian.zip)
-  3. Gitian signatures (in gitian.sigs/${VERSION}[-win32]/(your gitian key)/
+  2. windows 32-bit and 64-bit binaries + installer + source (bitcoin-${VERSION}-win-gitian.zip)
+  3. Gitian signatures (in gitian.sigs/${VERSION}[-win]/(your gitian key)/
 
 repackage gitian builds for release as stand-alone zip/tar/installer exe
 
@@ -96,10 +96,10 @@ repackage gitian builds for release as stand-alone zip/tar/installer exe
 
 **Windows .zip and setup.exe:**
 
-	unzip bitcoin-${VERSION}-win32-gitian.zip -d bitcoin-${VERSION}-win32
-	mv bitcoin-${VERSION}-win32/bitcoin-*-setup.exe .
-	zip -r bitcoin-${VERSION}-win32.zip bitcoin-${VERSION}-win32
-	rm -rf bitcoin-${VERSION}-win32
+	unzip bitcoin-${VERSION}-win-gitian.zip -d bitcoin-${VERSION}-win
+	mv bitcoin-${VERSION}-win/bitcoin-*-setup.exe .
+	zip -r bitcoin-${VERSION}-win.zip bitcoin-${VERSION}-win
+	rm -rf bitcoin-${VERSION}-win
 
 **Perform Mac build:**
 
@@ -138,7 +138,7 @@ Commit your signature to gitian.sigs:
 
 	pushd gitian.sigs
 	git add ${VERSION}/${SIGNER}
-	git add ${VERSION}-win32/${SIGNER}
+	git add ${VERSION}-win/${SIGNER}
 	git commit -a
 	git push  # Assuming you can push to the gitian.sigs tree
 	popd
@@ -162,17 +162,17 @@ From a directory containing bitcoin source, gitian.sigs and gitian zips
 	zip -r bitcoin-${VERSION}-linux-gitian.zip *
 	cp bitcoin-${VERSION}-linux-gitian.zip ../
 	popd
-	mkdir bitcoin-${VERSION}-win32-gitian
-	pushd bitcoin-${VERSION}-win32-gitian
-	unzip ../bitcoin-${VERSION}-win32-gitian.zip
+	mkdir bitcoin-${VERSION}-win-gitian
+	pushd bitcoin-${VERSION}-win-gitian
+	unzip ../bitcoin-${VERSION}-win-gitian.zip
 	mkdir gitian
 	cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/
-	for signer in $(ls ../gitian.sigs/${VERSION}-win32/); do
-	 cp ../gitian.sigs/${VERSION}-win32/${signer}/bitcoin-build.assert ./gitian/${signer}-build.assert
-	 cp ../gitian.sigs/${VERSION}-win32/${signer}/bitcoin-build.assert.sig ./gitian/${signer}-build.assert.sig
+	for signer in $(ls ../gitian.sigs/${VERSION}-win/); do
+	 cp ../gitian.sigs/${VERSION}-win/${signer}/bitcoin-build.assert ./gitian/${signer}-build.assert
+	 cp ../gitian.sigs/${VERSION}-win/${signer}/bitcoin-build.assert.sig ./gitian/${signer}-build.assert.sig
 	done
-	zip -r bitcoin-${VERSION}-win32-gitian.zip *
-	cp bitcoin-${VERSION}-win32-gitian.zip ../
+	zip -r bitcoin-${VERSION}-win-gitian.zip *
+	cp bitcoin-${VERSION}-win-gitian.zip ../
 	popd
 
 - Upload gitian zips to SourceForge