diff options
| -rw-r--r-- | contrib/Bitcoin.app/Contents/Info.plist | 4 | ||||
| -rw-r--r-- | doc/README | 2 | ||||
| -rw-r--r-- | doc/README_windows.txt | 2 | ||||
| -rw-r--r-- | doc/coding.txt | 32 | ||||
| -rw-r--r-- | doc/release-process.txt | 3 | ||||
| -rw-r--r-- | share/setup.nsi | 6 | ||||
| -rw-r--r-- | src/serialize.h | 2 |
7 files changed, 34 insertions, 17 deletions
diff --git a/contrib/Bitcoin.app/Contents/Info.plist b/contrib/Bitcoin.app/Contents/Info.plist index bfeb2f8de4..a5c7da1c8f 100644 --- 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 763fc415bc..772fd7f31e 100644 --- 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 e715b32068..8378ae50d8 100644 --- a/doc/README_windows.txt +++ b/doc/README_windows.txt @@ -1,4 +1,4 @@ -Bitcoin 0.3.25 BETA
+Bitcoin 0.4.00rc1 BETA
Copyright (c) 2009-2011 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
diff --git a/doc/coding.txt b/doc/coding.txt index ec31ccded2..b3c812a486 100644 --- a/doc/coding.txt +++ b/doc/coding.txt @@ -43,38 +43,52 @@ bn CBigNum -------------------------
Locking/mutex usage notes
-The code is multi-threaded, and uses mutexes and the CRITICAL_BLOCK/TRY_CRITICAL_BLOCK macros to protect data structures.
+The code is multi-threaded, and uses mutexes and the
+CRITICAL_BLOCK/TRY_CRITICAL_BLOCK macros to protect data structures.
-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.
+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.
-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).
+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).
-------
Threads
StartNode : Starts other threads.
-ThreadGetMyExternalIP : Determines outside-the-firewall IP address, sends addr message to connected peers when it determines it.
+ThreadGetMyExternalIP : Determines outside-the-firewall IP address,
+sends addr message to connected peers when it determines it.
-ThreadIRCSeed : Joins IRC bootstrapping channel, watching for new peers and advertising this node's IP address.
+ThreadIRCSeed : Joins IRC bootstrapping channel, watching for new
+peers and advertising this node's IP address.
ThreadSocketHandler : Sends/Receives data from peers on port 8333.
-ThreadMessageHandler : Higher-level message handling (sending and receiving).
+ThreadMessageHandler : Higher-level message handling (sending and
+receiving).
ThreadOpenConnections : Initiates new connections to peers.
ThreadTopUpKeyPool : replenishes the keystore's keypool.
-ThreadCleanWalletPassphrase : re-locks an encrypted wallet after user has unlocked it for a period of time.
+ThreadCleanWalletPassphrase : re-locks an encrypted wallet after user
+has unlocked it for a period of time.
SendingDialogStartTransfer : used by pay-via-ip-address code (obsolete)
ThreadDelayedRepaint : repaint the gui
-ThreadFlushWalletDB : Close the wallet.dat file if it hasn't been used in 500ms.
+ThreadFlushWalletDB : Close the wallet.dat file if it hasn't been used
+in 500ms.
-ThreadRPCServer : Remote procedure call handler, listens on port 8332 for connections and services them.
+ThreadRPCServer : Remote procedure call handler, listens on port 8332
+for connections and services them.
ThreadBitcoinMiner : Generates bitcoins
diff --git a/doc/release-process.txt b/doc/release-process.txt index 4940afefa5..bcda64dbed 100644 --- 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 b4bf3cff47..6cf477747c 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.3.25
+!define VERSION 0.4.00
!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.3.25-win32-setup.exe
+OutFile bitcoin-0.4.00-win32-setup.exe
InstallDir $PROGRAMFILES\Bitcoin
CRCCheck on
XPStyle on
BrandingText " "
ShowInstDetails show
-VIProductVersion 0.3.25.0
+VIProductVersion 0.4.00.0
VIAddVersionKey ProductName Bitcoin
VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"
diff --git a/src/serialize.h b/src/serialize.h index 0a31ff557d..698bdfe6a9 100644 --- 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; |