summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-09 02:28:44 +0000
committerennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-09 02:28:44 +0000
commit291962f5315d107d4b7272f11e77fc09e039619b (patch)
treed183ec5be383a7ca7fc817f1d8a4d6b7e818e219
parenta44a3a7b1ec33866374ac546f75d79f8342275d6 (diff)
downloadcrawl-ref-291962f5315d107d4b7272f11e77fc09e039619b.tar.gz
crawl-ref-291962f5315d107d4b7272f11e77fc09e039619b.zip
Allow BUILD_REVISION to be defined at compilation time to manually specify the SVN revision, overriding the number derived from keywords.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9010 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/command.cc2
-rw-r--r--crawl-ref/source/version.cc4
-rw-r--r--crawl-ref/source/version.h2
3 files changed, 6 insertions, 2 deletions
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 95159c5c26..55023f0af5 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -99,7 +99,7 @@ static const char *features[] = {
static std::string _get_version_information(void)
{
std::string result = "This is <w>" CRAWL " " VERSION "</w> (";
-#ifdef BUILD_REVISION
+#ifdef DISPLAY_BUILD_REVISION
result += "r" + number_to_string(svn_revision()) + ", ";
#endif
result += VERSION_DETAIL ").";
diff --git a/crawl-ref/source/version.cc b/crawl-ref/source/version.cc
index a7cf9b0e21..5cfec287bc 100644
--- a/crawl-ref/source/version.cc
+++ b/crawl-ref/source/version.cc
@@ -21,5 +21,9 @@ check_revision::check_revision(const char *rev_str)
int svn_revision()
{
+#if BUILD_REVISION
+ return BUILD_REVISION;
+#else
return check_revision::max_rev;
+#endif
}
diff --git a/crawl-ref/source/version.h b/crawl-ref/source/version.h
index eec4da025c..1670367082 100644
--- a/crawl-ref/source/version.h
+++ b/crawl-ref/source/version.h
@@ -36,7 +36,7 @@
#define VER_QUAL "-svn"
// Undefine for official releases.
-#define BUILD_REVISION
+#define DISPLAY_BUILD_REVISION
// last updated 07august2001 {mv}
/* ***********************************************************************