diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/assets-attribution.txt | 47 | ||||
-rw-r--r-- | doc/release-process.txt | 106 |
2 files changed, 66 insertions, 87 deletions
diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt index 91d2e65804..5cf0a734bf 100644 --- a/doc/assets-attribution.txt +++ b/doc/assets-attribution.txt @@ -1,21 +1,20 @@ Icon: src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png, src/qt/res/src/*.svg Designer: Wladimir van der Laan -License: Creative Commons Attribution - -Icon: src/qt/res/icons/send.png -Icon Pack: Vista Style Arrow -Designer: Icons Land -License: Freeware Non-commercial -Site: http://findicons.com/icon/231371/right3green - -Icon: src/qt/res/icons/address-book.png -Icon Pack: Farm-Fresh Web -Designer: FatCow Web Hosting -License: Creative Commons Attribution (by) -Site: http://findicons.com/icon/163938/book_open +License: MIT + +Icon: src/qt/res/icons/address-book.png, src/qt/res/icons/export.png, + src/qt/res/icons/history.png, src/qt/res/icons/key.png, + src/qt/res/icons/lock_*.png, src/qt/res/icons/overview.png, + src/qt/res/icons/receive.png, src/qt/res/icons/send.png, + src/qt/res/icons/synced.png +Icon Pack: NUVOLA ICON THEME for KDE 3.x +Designer: David Vignoni (david@icon-king.com) + ICON KING - www.icon-king.com +License: LGPL +Site: http://www.icon-king.com/projects/nuvola/ -Icon: src/qt/res/icons/connect*.png, src/qt/res/icons/synced.png, src/qt/res/icons/lock_*.png +Icon: src/qt/res/icons/connect*.png Icon Pack: Human-O2 Designer: schollidesign License: GNU/GPL @@ -35,24 +34,11 @@ Designer: http://www.everaldo.com Icon Pack: Crystal SVG License: LGPL -Icon: src/qt/res/icons/receive.png, src/qt/res/icons/history.png, - src/qt/res/icons/export.png -Designer: Oxygen team -Icon Pack: Oxygen -License: Creative Common Attribution-ShareAlike 3.0 License or LGPL -Site: http://www.oxygen-icons.org/ - Icon: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png Designer: Bitboy (optimized for 16x16 by Wladimir van der Laan) License: Public Domain Site: http://forum.bitcoin.org/?topic=1756.0 -Icon: src/qt/res/icons/overview.png -Icon Pack: Primo -Designer: Jack Cai -License: Creative Commons Attribution No Derivatives (by-nd) -Site: http://findicons.com/icon/175944/home?id=176221# - Icon: scripts/img/reload.xcf (modified),src/qt/res/movies/update_spinner.mng Icon Pack: Kids Designer: Everaldo (Everaldo Coelho) @@ -64,10 +50,3 @@ Designer: Crobbo (forum) Site: https://bitcointalk.org/index.php?topic=32273.0 License: Public domain -Icon: src/qt/res/icons/key.png -Designer: VisualPharm (Ivan Boyko) -Icon Pack: Must Have -Site: http://findicons.com/icon/51009/key?id=51009 -License: Creative Commons Attribution (by) - - diff --git a/doc/release-process.txt b/doc/release-process.txt index 27e2cf5b93..ac388847c2 100644 --- 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 @@ -80,7 +70,8 @@ qmake USE_SSL=1 USE_UPNP=1 bitcoin-qt.pro make export QTDIR=/opt/local/share/qt4 # needed to find translations/qt_*.qm files - contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr de,es,ru -dmg -fancy contrib/macdeploy/fancy.plist + T=$(contrib/qt_translations.py $QTDIR/translations src/qt/locale) + contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr $T -dmg -fancy contrib/macdeploy/fancy.plist Build output expected: Bitcoin-Qt.dmg @@ -93,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 |