From 5284e1b60e79bd535e808fb1d9968f22d565f9c2 Mon Sep 17 00:00:00 2001 From: Chris Moore Date: Fri, 21 Jan 2011 02:37:34 -0800 Subject: [PATCH] Add const bool VERSION_IS_BETA to serialize.h and use it when formatting the version string. Show the version string in --help text too. --- init.cpp | 4 +++- serialize.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/init.cpp b/init.cpp index 0f4b44a0f..1522fcc8d 100644 --- a/init.cpp +++ b/init.cpp @@ -158,7 +158,9 @@ bool AppInit2(int argc, char* argv[]) if (mapArgs.count("-?") || mapArgs.count("--help")) { + string beta = VERSION_IS_BETA ? _(" beta") : ""; string strUsage = string() + + _("Bitcoin version") + " " + FormatVersion(VERSION) + pszSubVer + beta + "\n\n" + _("Usage:") + "\t\t\t\t\t\t\t\t\t\t\n" + " bitcoin [options] \t " + "\n" + " bitcoin [options] [params]\t " + _("Send command to -server or bitcoind\n") + @@ -227,7 +229,7 @@ bool AppInit2(int argc, char* argv[]) if (!fDebug && !pszSetDataDir[0]) ShrinkDebugFile(); printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); - printf("Bitcoin version %s%s beta\n", FormatVersion(VERSION).c_str(), pszSubVer); + printf("Bitcoin version %s%s%s\n", FormatVersion(VERSION).c_str(), pszSubVer, VERSION_IS_BETA ? _(" beta") : ""); #ifdef GUI printf("OS version %s\n", ((string)wxGetOsDescription()).c_str()); printf("System default language is %d %s\n", g_locale.GetSystemLanguage(), ((string)g_locale.GetSysName()).c_str()); diff --git a/serialize.h b/serialize.h index 8153382ea..f434b04ca 100644 --- a/serialize.h +++ b/serialize.h @@ -27,6 +27,7 @@ static const unsigned int MAX_SIZE = 0x02000000; static const int VERSION = 31902; static const char* pszSubVer = ""; +static const bool VERSION_IS_BETA = true;