diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-04-07 02:06:53 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2012-04-10 18:16:53 +0200 |
| commit | a20c0d0f6792acf532309eee2e9f29120c801ee4 (patch) | |
| tree | 0065544e660157fa0701977583b2876c81e833dd /src/main.h | |
| parent | 138d08c5315c45b3dd08184c4eeb77ee3e47ef0a (diff) | |
Build identification strings
All client version information is moved to version.cpp, which optionally
(-DHAVE_BUILD_INFO) includes build.h. build.h is automatically generated
on supporting platforms via contrib/genbuild.sh, using git describe.
The git export-subst attribute is used to put the commit id statically
in version.cpp inside generated archives, and this value is used if no
build.h is present.
The gitian descriptors are modified to use git archive instead of a
copy, to create the src/ directory in the output. This way,
src/src/version.cpp will contain the static commit id. To prevent
gitian builds from getting the "-dirty" marker in their git-describe
generated identifiers, no touching of files or running sed on the
makefile is performed anymore. This does not seem to influence
determinism.
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/main.h b/src/main.h index 6c81abad56..1d46851ac2 100644 --- a/src/main.h +++ b/src/main.h @@ -10,6 +10,7 @@ #include "key.h" #include "script.h" #include "db.h" +#include "version.h" #ifdef WIN32 #include <io.h> /* for _commit */ @@ -30,10 +31,6 @@ class CInv; class CRequestTracker; class CNode; -static const int CLIENT_VERSION = 60099; -static const bool VERSION_IS_BETA = true; -extern const std::string CLIENT_NAME; - static const unsigned int MAX_BLOCK_SIZE = 1000000; static const unsigned int MAX_BLOCK_SIZE_GEN = MAX_BLOCK_SIZE/2; static const int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50; |