aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2017-04-05 09:39:16 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2017-04-06 10:41:34 +0200
commit08d9aee3ebc2c2401c4137e0575bdbbe056f5cae (patch)
treef8cac51be9c629ea753bac843831aaf2ce53e0a7
parent168a7034f5eefcf657f6332f0b7966e439ca4df5 (diff)
build: Remove duplicate version information from src/clientversion.h
Fail when the version information is not defined otherwise when HAVE_CONFIG_H is not set.
-rw-r--r--src/clientversion.h26
1 files changed, 5 insertions, 21 deletions
diff --git a/src/clientversion.h b/src/clientversion.h
index 69154d546d..8fde6daca5 100644
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -7,29 +7,13 @@
#if defined(HAVE_CONFIG_H)
#include "config/bitcoin-config.h"
-#else
-
-/**
- * client versioning and copyright year
- */
-
-//! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it
-#define CLIENT_VERSION_MAJOR 0
-#define CLIENT_VERSION_MINOR 14
-#define CLIENT_VERSION_REVISION 99
-#define CLIENT_VERSION_BUILD 0
-
-//! Set to true for release, false for prerelease or test build
-#define CLIENT_VERSION_IS_RELEASE false
-
-/**
- * Copyright year (2009-this)
- * Todo: update this when changing our copyright comments in the source
- */
-#define COPYRIGHT_YEAR 2017
-
#endif //HAVE_CONFIG_H
+// Check that required client information is defined
+#if !defined(CLIENT_VERSION_MAJOR) || !defined(CLIENT_VERSION_MINOR) || !defined(CLIENT_VERSION_REVISION) || !defined(CLIENT_VERSION_BUILD) || !defined(CLIENT_VERSION_IS_RELEASE) || !defined(COPYRIGHT_YEAR)
+#error Client version information missing: wasn't defined by bitcoin-config.h nor defined any other way
+#endif
+
/**
* Converts the parameter X to a string after macro replacement on X has been performed.
* Don't merge these into one macro!