From 1817478b0e5800bc9fefa655d30068d82fcbc853 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Sun, 25 May 2014 03:26:08 -0700
Subject: [PATCH] Add rev count back.

---
 core/metamod_console.cpp             | 3 ++-
 support/buildbot/generate_headers.py | 8 +++++---
 versionlib/versionlib.cpp            | 3 ++-
 versionlib/versionlib.h              | 3 ++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/metamod_console.cpp b/core/metamod_console.cpp
index bdedd8f..047a3f8 100644
--- a/core/metamod_console.cpp
+++ b/core/metamod_console.cpp
@@ -70,7 +70,8 @@ bool Command_Meta(IMetamodSourceCommandInfo *info)
 		else if (strcmp(command, "version") == 0)
 		{
 			CONMSG("Metamod:Source version %s\n", METAMOD_VERSION);
-			CONMSG("Build ID: %s\n", METAMOD_BUILD_ID);
+			CONMSG("Built from: https://github.com/alliedmodders/metamod-source/commit/%s\n", METAMOD_BUILD_SHA);
+			CONMSG("Build ID: %s:%s\n", METAMOD_BUILD_LOCAL_REV, METAMOD_BUILD_SHA);
 
 			if (g_Metamod.IsLoadedAsGameDLL())
 			{
diff --git a/support/buildbot/generate_headers.py b/support/buildbot/generate_headers.py
index 0c051a1..0135d2c 100644
--- a/support/buildbot/generate_headers.py
+++ b/support/buildbot/generate_headers.py
@@ -64,13 +64,15 @@ def output_version_header():
 #define _METAMOD_AUTO_VERSION_INFORMATION_H_
 
 #define MMS_BUILD_STRING     \"{0}\"
-#define MMS_BUILD_UNIQUEID    \"{1}\" MMS_BUILD_STRING
+#define MMS_BUILD_LOCAL_REV   \"{5}\"
+#define MMS_BUILD_SHA         \"{1}\"
+#define MMS_BUILD_UNIQUEID    \"{5}:{1}\" MMS_BUILD_STRING
 #define MMS_FULL_VERSION    \"{2}.{3}.{4}\" MMS_BUILD_STRING
-#define MMS_FILE_VERSION    {5},{6},{7},0
+#define MMS_FILE_VERSION    {2},{3},{4},0
 
 #endif /* _METAMOD_AUTO_VERSION_INFORMATION_H_ */
 
-""".format(tag, shorthash, major, minor, release, major, minor, release))
+""".format(tag, shorthash, major, minor, release, count))
 
 output_version_header()
 
diff --git a/versionlib/versionlib.cpp b/versionlib/versionlib.cpp
index e4f3b57..a30505f 100644
--- a/versionlib/versionlib.cpp
+++ b/versionlib/versionlib.cpp
@@ -26,6 +26,7 @@
 #include <metamod_version.h>
 #include <versionlib.h>
 
-const char *METAMOD_BUILD_ID = MMS_BUILD_UNIQUEID;
+const char *METAMOD_BUILD_LOCAL_REV = MMS_BUILD_LOCAL_REV;
+const char *METAMOD_BUILD_SHA = MMS_BUILD_SHA;
 const char *METAMOD_VERSION = MMS_FULL_VERSION;
 
diff --git a/versionlib/versionlib.h b/versionlib/versionlib.h
index 0044416..47bb91f 100644
--- a/versionlib/versionlib.h
+++ b/versionlib/versionlib.h
@@ -25,7 +25,8 @@
 #ifndef _INCLUDE_METAMOD_VERSIONLIB_H_
 #define _INCLUDE_METAMOD_VERSIONLIB_H_
 
-extern "C" const char *METAMOD_BUILD_ID;
+extern "C" const char *METAMOD_BUILD_LOCAL_REV;
+extern "C" const char *METAMOD_BUILD_SHA;
 extern "C" const char *METAMOD_VERSION;
 
 #endif // _INCLUDE_METAMOD_VERSIONLIB_H_