A better git revision tagging scheme. This marks the file manifest properly via...

Here is an example of what will in title of server console window:
CasparCG Server 2.0.4.0f063d7 STABLE

diff --git a/common/common.vcxproj b/common/common.vcxproj
index 9dbc3db9a859c78f42d69207daa32056c437d106..1863a5021954e967a2760915ef0dae65716debf8 100644 (file)
--- a/common/common.vcxproj
+++ b/common/common.vcxproj
@@ -107,7 +107,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
     </Link>\r
     <PreBuildEvent>\r
-      <Command>"SubWCRev.exe" "$(SolutionDir)." "$(SolutionDir).\version.tmpl" "$(SolutionDir).\version.h"</Command>\r
+      <Command>"$(SolutionDir)./gitrev.bat"</Command>\r
     </PreBuildEvent>\r
     <Lib />\r
   </ItemDefinitionGroup>\r
@@ -138,7 +138,7 @@
       <OptimizeReferences>true</OptimizeReferences>\r
     </Link>\r
     <PreBuildEvent>\r
-      <Command>"SubWCRev.exe" "$(SolutionDir)." "$(SolutionDir).\version.tmpl" "$(SolutionDir).\version.h"</Command>\r
+      <Command>"$(SolutionDir)./gitrev.bat"</Command>\r
     </PreBuildEvent>\r
     <Lib>\r
       <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>\r
@@ -171,7 +171,7 @@
       <OptimizeReferences>true</OptimizeReferences>\r
     </Link>\r
     <PreBuildEvent>\r
-      <Command>"SubWCRev.exe" "$(SolutionDir)." "$(SolutionDir).\version.tmpl" "$(SolutionDir).\version.h"</Command>\r
+      <Command>"$(SolutionDir)./gitrev.bat"</Command>\r
     </PreBuildEvent>\r
     <Lib />\r
   </ItemDefinitionGroup>\r
@@ -203,7 +203,7 @@
       <OptimizeReferences>true</OptimizeReferences>\r
     </Link>\r
     <PreBuildEvent>\r
-      <Command>"SubWCRev.exe" "$(SolutionDir)." "$(SolutionDir).\version.tmpl" "$(SolutionDir).\version.h"</Command>\r
+      <Command>"$(SolutionDir)./gitrev.bat"</Command>\r
     </PreBuildEvent>\r
     <Lib />\r
   </ItemDefinitionGroup>\r

diff --git a/common/env.cpp b/common/env.cpp
index c89cb3420b7d97e670aaf5d52e4d3440869c4933..6534bc052d865a0437d786ba1772fc1ec6db165f 100644 (file)
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -166,7 +166,7 @@ const std::wstring& version()
                        EXPAND_AND_QUOTE(CASPAR_GEN)    "." \r
                        EXPAND_AND_QUOTE(CASPAR_MAYOR)  "." \r
                        EXPAND_AND_QUOTE(CASPAR_MINOR)  "." \r
-                       EXPAND_AND_QUOTE(CASPAR_REV)    " " \r
+                       CASPAR_REV      " " \r
                        CASPAR_TAG);\r
        return ver;\r
 }\r

diff --git a/gitrev.bat b/gitrev.bat
new file mode 100644 (file)
index 0000000..d4cc6dd
--- /dev/null
+++ b/gitrev.bat
@@ -0,0 +1,9 @@
+@ECHO OFF
+for /f "tokens=*" %%a in ('git rev-parse --verify --short HEAD') do (
+    set TEMPRESPONSE=%%a
+)
+COPY "%~dp0\version.tmpl" "%~dp0\version.h" /Y
+ECHO #define CASPAR_REV "%TEMPRESPONSE%" >> "%~dp0\version.h"
+ECHO gitrev.bat: %TEMPRESPONSE%
+SET TEMPRESPONSE=
+exit /b 0
\ No newline at end of file

diff --git a/shell/shell.rc b/shell/shell.rc
index 7b54f2d88690a560fc6061881cae4794b9b78125..f2f5f61d8ec63bf3c761c80315918747069426ba 100644 (file)
Binary files a/shell/shell.rc and b/shell/shell.rc differ

diff --git a/version.tmpl b/version.tmpl
index 2431b7bdd5546c0da613cbe09cd60b1bacccfe2b..312499759f1aeb5d5c8c525859531abf70a10bd6 100644 (file)
--- a/version.tmpl
+++ b/version.tmpl
@@ -1,5 +1,4 @@
 #define CASPAR_GEN 2\r
 #define CASPAR_MAYOR 0\r
 #define CASPAR_MINOR 3\r
-#define CASPAR_REV $WCREV$\r
 #define CASPAR_TAG "STABLE"\r