aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bitcoin-qt.pro2
-rw-r--r--doc/release-process.txt103
-rw-r--r--share/setup.nsi6
-rw-r--r--src/qt/overviewpage.cpp2
-rw-r--r--src/serialize.h2
5 files changed, 57 insertions, 58 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index e7adabe756..7444ff4ac1 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
TARGET =
-VERSION = 0.5.0
+VERSION = 0.5.1
INCLUDEPATH += src src/json src/qt
DEFINES += QT_GUI BOOST_THREAD_USE_LIB
CONFIG += no_include_pwd
diff --git a/doc/release-process.txt b/doc/release-process.txt
index c62079d541..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
@@ -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
diff --git a/share/setup.nsi b/share/setup.nsi
index 19f5a5329b..0c0fa048af 100644
--- a/share/setup.nsi
+++ b/share/setup.nsi
@@ -5,7 +5,7 @@ SetCompressor /SOLID lzma
# General Symbol Definitions
!define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 0.5.0
+!define VERSION 0.5.1
!define COMPANY "Bitcoin project"
!define URL http://www.bitcoin.org/
@@ -45,13 +45,13 @@ Var StartMenuGroup
!insertmacro MUI_LANGUAGE English
# Installer attributes
-OutFile bitcoin-0.5.0-win32-setup.exe
+OutFile bitcoin-0.5.1-win32-setup.exe
InstallDir $PROGRAMFILES\Bitcoin
CRCCheck on
XPStyle on
BrandingText " "
ShowInstDetails show
-VIProductVersion 0.5.0.0
+VIProductVersion 0.5.1.0
VIAddVersionKey ProductName Bitcoin
VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index fe0987178c..5b5a8f5271 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -111,7 +111,7 @@ OverviewPage::OverviewPage(QWidget *parent) :
ui->labelNumTransactions->setToolTip(tr("Total number of transactions in wallet"));
// Recent transactions
- ui->listTransactions->setStyleSheet("background:transparent");
+ ui->listTransactions->setStyleSheet("QListView { background:transparent }");
ui->listTransactions->setItemDelegate(txdelegate);
ui->listTransactions->setIconSize(QSize(DECORATION_SIZE, DECORATION_SIZE));
ui->listTransactions->setSelectionMode(QAbstractItemView::NoSelection);
diff --git a/src/serialize.h b/src/serialize.h
index 53867e939a..78cff43d53 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -60,7 +60,7 @@ class CDataStream;
class CAutoFile;
static const unsigned int MAX_SIZE = 0x02000000;
-static const int VERSION = 50001;
+static const int VERSION = 50100;
static const char* pszSubVer = "";
static const bool VERSION_IS_BETA = true;
generated by cgit v1.2.3 (git 2.26.2) at 2024-07-03 07:11:05 +0000