From: Helge Norberg <helge.norberg@svt.se>
Date: Wed, 23 Nov 2016 12:15:19 +0000 (+0100)
Subject: [build] Created automatically generated build number, so that it is easier to see... 
X-Git-Tag: 2.1.0_Beta2~138
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4ba1228f05d637cef4611067dc1ca541f5e4b25f;p=casparcg

[build] Created automatically generated build number, so that it is easier to see whether a build is newer or older than an other.
---

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 f2f5f61d8..9c14de5b2 100644
Binary files a/shell/shell.rc and b/shell/shell.rc differ
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}"