Bumped version numbers to 0.4.0rc1

diff --git a/contrib/Bitcoin.app/Contents/Info.plist b/contrib/Bitcoin.app/Contents/Info.plist
index bfeb2f8..a5c7da1 100644 (file)
--- a/contrib/Bitcoin.app/Contents/Info.plist
+++ b/contrib/Bitcoin.app/Contents/Info.plist
@@ -17,11 +17,11 @@
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>0.3.25</string>
+       <string>0.4.00</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>325</string>
+       <string>400</string>
        <key>LSMinimumSystemVersion</key>
        <string>10.5</string>
        <key>CFBundleIconFile</key>

diff --git a/doc/README b/doc/README
index 763fc41..772fd7f 100644 (file)
--- a/doc/README
+++ b/doc/README
@@ -1,4 +1,4 @@
-Bitcoin 0.3.25 BETA
+Bitcoin 0.4.0rc1 BETA
 
 Copyright (c) 2009-2011 Bitcoin Developers
 Distributed under the MIT/X11 software license, see the accompanying

diff --git a/doc/README_windows.txt b/doc/README_windows.txt
index e715b32..8378ae5 100644 (file)
--- a/doc/README_windows.txt
+++ b/doc/README_windows.txt
@@ -1,4 +1,4 @@
-Bitcoin 0.3.25 BETA\r
+Bitcoin 0.4.00rc1 BETA\r
 \r
 Copyright (c) 2009-2011 Bitcoin Developers\r
 Distributed under the MIT/X11 software license, see the accompanying\r

diff --git a/doc/coding.txt b/doc/coding.txt
index ec31ccd..b3c812a 100644 (file)
--- a/doc/coding.txt
+++ b/doc/coding.txt
@@ -43,38 +43,52 @@ bn      CBigNum
 -------------------------\r
 Locking/mutex usage notes\r
 \r
-The code is multi-threaded, and uses mutexes and the CRITICAL_BLOCK/TRY_CRITICAL_BLOCK macros to protect data structures.\r
+The code is multi-threaded, and uses mutexes and the\r
+CRITICAL_BLOCK/TRY_CRITICAL_BLOCK macros to protect data structures.\r
 \r
-Deadlocks due to inconsistent lock ordering (thread 1 locks cs_main and then cs_wallet, while thread 2 locks them in the opposite order: result, deadlock as each waits for the other to release its lock) are a problem. Compile with -DDEBUG_LOCKORDER to get lock order inconsistencies reported in the debug.log file.\r
+Deadlocks due to inconsistent lock ordering (thread 1 locks cs_main\r
+and then cs_wallet, while thread 2 locks them in the opposite order:\r
+result, deadlock as each waits for the other to release its lock) are\r
+a problem. Compile with -DDEBUG_LOCKORDER to get lock order\r
+inconsistencies reported in the debug.log file.\r
 \r
-Re-architecting the core code so there are better-defined interfaces between the various components is a goal, with any necessary locking done by the components (e.g. see the self-contained CKeyStore class and its cs_KeyStore lock for example).\r
+Re-architecting the core code so there are better-defined interfaces\r
+between the various components is a goal, with any necessary locking\r
+done by the components (e.g. see the self-contained CKeyStore class\r
+and its cs_KeyStore lock for example).\r
 \r
 -------\r
 Threads\r
 \r
 StartNode : Starts other threads.\r
 \r
-ThreadGetMyExternalIP : Determines outside-the-firewall IP address, sends addr message to connected peers when it determines it.\r
+ThreadGetMyExternalIP : Determines outside-the-firewall IP address,\r
+sends addr message to connected peers when it determines it. \r
 \r
-ThreadIRCSeed : Joins IRC bootstrapping channel, watching for new peers and advertising this node's IP address.\r
+ThreadIRCSeed : Joins IRC bootstrapping channel, watching for new\r
+peers and advertising this node's IP address. \r
 \r
 ThreadSocketHandler : Sends/Receives data from peers on port 8333.\r
 \r
-ThreadMessageHandler : Higher-level message handling (sending and receiving).\r
+ThreadMessageHandler : Higher-level message handling (sending and\r
+receiving).\r
 \r
 ThreadOpenConnections : Initiates new connections to peers.\r
 \r
 ThreadTopUpKeyPool : replenishes the keystore's keypool.\r
 \r
-ThreadCleanWalletPassphrase : re-locks an encrypted wallet after user has unlocked it for a period of time.\r
+ThreadCleanWalletPassphrase : re-locks an encrypted wallet after user\r
+has unlocked it for a period of time. \r
 \r
 SendingDialogStartTransfer : used by pay-via-ip-address code (obsolete)\r
 \r
 ThreadDelayedRepaint : repaint the gui \r
 \r
-ThreadFlushWalletDB : Close the wallet.dat file if it hasn't been used in 500ms.\r
+ThreadFlushWalletDB : Close the wallet.dat file if it hasn't been used\r
+in 500ms.\r
 \r
-ThreadRPCServer : Remote procedure call handler, listens on port 8332 for connections and services them.\r
+ThreadRPCServer : Remote procedure call handler, listens on port 8332\r
+for connections and services them.\r
 \r
 ThreadBitcoinMiner : Generates bitcoins\r
 \r

diff --git a/doc/release-process.txt b/doc/release-process.txt
index 4940afe..bcda64d 100644 (file)
--- a/doc/release-process.txt
+++ b/doc/release-process.txt
@@ -1,6 +1,9 @@
 * update (commit) version in sources
+  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.3.23
   * CFBundleVersion should have value like 323

diff --git a/share/setup.nsi b/share/setup.nsi
index b4bf3cf..6cf4777 100644 (file)
--- a/share/setup.nsi
+++ b/share/setup.nsi
@@ -5,7 +5,7 @@ SetCompressor /SOLID lzma
 \r
 # General Symbol Definitions\r
 !define REGKEY "SOFTWARE\$(^Name)"\r
-!define VERSION 0.3.25\r
+!define VERSION 0.4.00\r
 !define COMPANY "Bitcoin project"\r
 !define URL http://www.bitcoin.org/\r
 \r
@@ -45,13 +45,13 @@ Var StartMenuGroup
 !insertmacro MUI_LANGUAGE English\r
 \r
 # Installer attributes\r
-OutFile bitcoin-0.3.25-win32-setup.exe\r
+OutFile bitcoin-0.4.00-win32-setup.exe\r
 InstallDir $PROGRAMFILES\Bitcoin\r
 CRCCheck on\r
 XPStyle on\r
 BrandingText " "\r
 ShowInstDetails show\r
-VIProductVersion 0.3.25.0\r
+VIProductVersion 0.4.00.0\r
 VIAddVersionKey ProductName Bitcoin\r
 VIAddVersionKey ProductVersion "${VERSION}"\r
 VIAddVersionKey CompanyName "${COMPANY}"\r

diff --git a/src/serialize.h b/src/serialize.h
index 0a31ff5..698bdfe 100644 (file)
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -59,7 +59,7 @@ class CDataStream;
 class CAutoFile;
 static const unsigned int MAX_SIZE = 0x02000000;
 
-static const int VERSION = 32500;
+static const int VERSION = 40000;
 static const char* pszSubVer = "";
 static const bool VERSION_IS_BETA = true;