From 4ba1228f05d637cef4611067dc1ca541f5e4b25f Mon Sep 17 00:00:00 2001
From: Helge Norberg <helge.norberg@svt.se>
Date: Wed, 23 Nov 2016 13:15:19 +0100
Subject: [PATCH] [build] Created automatically generated build number, so that
 it is easier to see whether a build is newer or older than an other.

---
 CHANGELOG      |   6 ++++--
 CMakeLists.txt |   8 ++++++--
 common/env.cpp |   3 ++-
 shell/shell.rc | Bin 4682 -> 4760 bytes
 version.tmpl   |   3 ++-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 913e139fa..749f02d6f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,13 +15,15 @@ General
   o General stability improvements.
   o Native thread id is now logged in Linux as well. Finally they are mappable
     against INFO THREADS, ps and top.
+  o Created automatically generated build number, so that it is easier to see
+    whether a build is newer or older than an other.
 
 Producers
 ---------
 
   o FFmpeg producer:
-    + Increased the max number frames that audio/video can be badly interleaved
-      with (Dimitry Ishenko).
+    + Increased the max number of frames that audio/video can be badly
+      interleaved with (Dimitry Ishenko).
 
 AMCP
 ----
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2e81f8d4..1c08ef188 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,12 +3,16 @@ project ("CasparCG Server")
 
 find_package(Git)
 
-set(GIT_REV "N/A")
+set(GIT_REV "0")
+set(GIT_HASH "N/A")
 
 if (GIT_FOUND)
 	exec_program("${GIT_EXECUTABLE}" "${PROJECT_SOURCE_DIR}"
-			ARGS rev-parse --verify --short HEAD
+			ARGS rev-list --all --count
 			OUTPUT_VARIABLE GIT_REV)
+	exec_program("${GIT_EXECUTABLE}" "${PROJECT_SOURCE_DIR}"
+			ARGS rev-parse --verify --short HEAD
+			OUTPUT_VARIABLE GIT_HASH)
 endif ()
 
 configure_file("${PROJECT_SOURCE_DIR}/version.tmpl" "${PROJECT_SOURCE_DIR}/version.h")
diff --git a/common/env.cpp b/common/env.cpp
index 4dd501105..3c2766968 100644
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -197,7 +197,8 @@ const std::wstring& version()
 			EXPAND_AND_QUOTE(CASPAR_GEN)	"."
 			EXPAND_AND_QUOTE(CASPAR_MAYOR)  "."
 			EXPAND_AND_QUOTE(CASPAR_MINOR)  "."
-			CASPAR_REV	" "
+			EXPAND_AND_QUOTE(CASPAR_REV)	" "
+			CASPAR_HASH						" "
 			CASPAR_TAG);
 	return ver;
 }
diff --git a/shell/shell.rc b/shell/shell.rc
index f2f5f61d8ec63bf3c761c80315918747069426ba..9c14de5b26cc7925d721ee10fd782af3ab3badab 100644
GIT binary patch
delta 223
zcmX@5GDCI4BIe1<m~$q7W9DNGVsK>$n=H;!jKu3_QJ%bwMPc#<9;wOyIQb?su^yS+
zz%DVlj*VmTE7l4q`_<$-YzFLL{S2Cu>)EZr;@8*>z_b#FhGa5BB117l0gx<WNM=Z9
z&|^qtr~qOmplZp<4IB`a4IF%vZ*e>VnWhdkjX{Ay35uN=92tTc0)S)?Lp*~AnCG$i
ZGUsn5p!1S|SY~nnZwZLr{D?P&1ps;tKxO~{

delta 222
zcmbQCdP-%(B4%a<28GEBnR8hU7(gsVmSQMtIg2t_?j(yMn10Ff7EC{6mz?~LwE>CE
zF}aWJ(PS|$zR3&N+2G;_*p;AcPq>&9hsNYx90I(045<tiK&%9|6J+8X4g<KVIUIbG
zKXJfKWCyy7ftP`6vLl!1W*4qUOpFSXU$RI~cHs4ZvKH}{L0FrO_|jNdfNB{4;2k>Q

diff --git a/version.tmpl b/version.tmpl
index 749f0cc8f..456a2b3aa 100644
--- a/version.tmpl
+++ b/version.tmpl
@@ -2,4 +2,5 @@
 #define CASPAR_MAYOR 1
 #define CASPAR_MINOR 0
 #define CASPAR_TAG "Beta 1"
-#define CASPAR_REV "${GIT_REV}"
+#define CASPAR_REV ${GIT_REV}
+#define CASPAR_HASH "${GIT_HASH}"
-- 
2.39.2