[build] Created automatically generated build number, so that it is easier to see...

diff --git a/CHANGELOG b/CHANGELOG
index 913e139fa95769ebfc90ef3722c0bbac772357b4..749f02d6fdade2c8a7ec372ed633999e79e95bdc 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,13 +15,15 @@ General
   o General stability improvements.\r
   o Native thread id is now logged in Linux as well. Finally they are mappable\r
     against INFO THREADS, ps and top.\r
+  o Created automatically generated build number, so that it is easier to see\r
+    whether a build is newer or older than an other.\r
 \r
 Producers\r
 ---------\r
 \r
   o FFmpeg producer:\r
-    + Increased the max number frames that audio/video can be badly interleaved\r
-      with (Dimitry Ishenko).\r
+    + Increased the max number of frames that audio/video can be badly\r
+      interleaved with (Dimitry Ishenko).\r
 \r
 AMCP\r
 ----\r

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2e81f8d4b8903e592760ea3f424815c6f3155d8..1c08ef1882d8092607b59497faa60fddcf5138ce 100644 (file)
--- 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 4dd5011050ffb039f54606c968d4ddb1856826f1..3c27669689dfc96906079abe85df61d032434c7f 100644 (file)
--- 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 (file)
Binary files a/shell/shell.rc and b/shell/shell.rc differ

diff --git a/version.tmpl b/version.tmpl
index 749f0cc8fec8c1232f27c463273c3616d3feaee4..456a2b3aa2de223ee566983c1989ff311ef5619b 100644 (file)
--- a/version.tmpl
+++ b/version.tmpl
@@ -2,4 +2,5 @@
 #define CASPAR_MAYOR 1\r
 #define CASPAR_MINOR 0\r
 #define CASPAR_TAG "Beta 1"\r
-#define CASPAR_REV "${GIT_REV}"\r
+#define CASPAR_REV ${GIT_REV}\r
+#define CASPAR_HASH "${GIT_HASH}"\r