Update release process instructions

diff --git a/doc/release-process.txt b/doc/release-process.txt
index c62079d..ac38884 100644 (file)
--- a/doc/release-process.txt
+++ b/doc/release-process.txt
@@ -1,31 +1,21 @@
 * update (commit) version in sources
+  bitcoin-qt.pro
   src/serialize.h
   share/setup.nsi
 
-* update (commit) version in OSX app bundle
- contrib/Bitcoin.app/Contents/Info.plist
-
-  * CFBundleShortVersionString should have value like 0.5.0
-  * CFBundleVersion should have value like 500
-
 * tag version in git
 
-   git tag -a v0.5.0
+   git tag -a v0.5.1
 
 * write release notes.  git shortlog helps a lot:
 
-   git shortlog --no-merges v0.4.0..
-
-* create source-only archive
-
-   git archive --format=tar --prefix=bitcoin-0.5.0/ HEAD | \
-       gzip -9c > ~/tmp/bitcoin-0.5.0-src.tar.gz 
+   git shortlog --no-merges v0.5.0..
 
 * perform gitian builds
 
   * From a directory containing the bitcoin source, gitian-builder and gitian.sigs
    export SIGNER=(your gitian key, ie bluematt, sipa, etc)
-   export VERSION=0.5.0
+   export VERSION=0.5.1
    cd ./gitian-builder
 
   * Fetch and build inputs:
@@ -42,36 +32,36 @@
    cp build/out/qt-win32-4.7.4-gitian.zip inputs/
 
   * Build bitcoind and bitcoin-qt on Linux32, Linux64, and Win32:
-   ./bin/gbuild --commit bitcoin=v$VERSION ../bitcoin/contrib/gitian-descriptors/gitian.yml
-   ./bin/gsign --signer $SIGNER --release $VERSION --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian.yml
+   ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian.yml
+   ./bin/gsign --signer $SIGNER --release ${VERSION} --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian.yml
    pushd build/out
-   zip -r bitcoin-$VERSION-linux-gitian.zip *
-   mv bitcoin-$VERSION-linux-gitian.zip ../../
+   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-win32.yml
+   ./bin/gsign --signer $SIGNER --release ${VERSION}-win32 --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml
    pushd build/out
-   zip -r bitcoin-$VERSION-win32-gitian.zip *
-   mv bitcoin-$VERSION-win32-gitian.zip ../../
+   zip -r bitcoin-${VERSION}-win32-gitian.zip *
+   mv bitcoin-${VERSION}-win32-gitian.zip ../../
    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)/
+  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)/
 
 * repackage gitian builds for release as stand-alone zip/tar/installer exe
 
   * Linux .tar.gz:
-   unzip bitcoin-$VERSION-linux-gitian.zip -d bitcoin-$VERSION-linux
-   tar czvf bitcoin-$VERSION-linux.tar.gz bitcoin-$VERSION-linux
-   rm -rf bitcoin-$VERSION-linux
+   unzip bitcoin-${VERSION}-linux-gitian.zip -d bitcoin-${VERSION}-linux
+   tar czvf bitcoin-${VERSION}-linux.tar.gz bitcoin-${VERSION}-linux
+   rm -rf bitcoin-${VERSION}-linux
 
   * 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}-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
 
 * perform Mac build
   See this blog post for how Gavin set up his build environment and
@@ -94,36 +84,45 @@
 
 * update forum version
 
-* update wiki
-
 * update wiki download links
 
-* release gitian-signed gitian archives
+* Commit your signature to gitian.sigs:
+  pushd gitian.sigs
+  git add ${VERSION}/${SIGNER}
+  git add ${VERSION}-win32/${SIGNER}
+  git commit -a
+  git push  # Assuming you can push to the gitian.sigs tree
+  popd
 
-  * Collect enough gitian signatures to meet minimum_weight (see contrib/gitian-downloader/*-download-config)
+-------------------------------------------------------------------------
+
+* After 3 or more people have gitian-built, repackage gitian-signed zips:
 
   * From a directory containing bitcoin source, gitian.sigs and gitian zips
-   export VERSION=0.5.0
-   mkdir bitcoin-$VERSION-linux-gitian; cd bitcoin-$VERSION-linux-gitian
-   unzip ../bitcoin-$VERSION-linux-gitian.zip
+   export VERSION=0.5.1
+   mkdir bitcoin-${VERSION}-linux-gitian
+   pushd bitcoin-${VERSION}-linux-gitian
+   unzip ../bitcoin-${VERSION}-linux-gitian.zip
    mkdir gitian
    cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/
-   for file in `ls ../gitian.sigs/$VERSION/`; do
-     cp ../gitian.sigs/$VERSION/$file/bitcoin-build.assert ./gitian/$file-build.assert
-     cp ../gitian.sigs/$VERSION/$file/bitcoin-build.assert.sig ./gitian/$file-build.assert.sig
+   for signer in $(ls ../gitian.sigs/${VERSION}/); do
+     cp ../gitian.sigs/${VERSION}/${signer}/bitcoin-build.assert ./gitian/${signer}-build.assert
+     cp ../gitian.sigs/${VERSION}/${signer}/bitcoin-build.assert.sig ./gitian/${signer}-build.assert.sig
    done
-   zip -r bitcoin-$VERSION-linux-gitian.zip *
-   cp bitcoin-$VERSION-linux-gitian.zip ../
-   cd ..
-   mkdir bitcoin-$VERSION-linux-gitian; cd bitcoin-$VERSION-linux-gitian
-   unzip ../bitcoin-$VERSION-linux-gitian.zip
+   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 gitian
    cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/
-   for file in `ls ../gitian.sigs/$VERSION/`; do
-     cp ../gitian.sigs/$VERSION/$file/bitcoin-build.assert ./gitian/$file-build.assert
-     cp ../gitian.sigs/$VERSION/$file/bitcoin-build.assert.sig ./gitian/$file-build.assert.sig
+   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
    done
-   zip -r bitcoin-$VERSION-linux-gitian.zip *
-   cp bitcoin-$VERSION-linux-gitian.zip ../
+   zip -r bitcoin-${VERSION}-win32-gitian.zip *
+   cp bitcoin-${VERSION}-win32-gitian.zip ../
+   popd
 
   * Upload gitian zips to SourceForge