gitrev.bat revision marking for server 2.1

diff --git a/common/common.vcxproj b/common/common.vcxproj
index 46b96cc096e27c58a4c895bf02926ac443e8d118..0a283960a9d2ed6ec1a895e92a90a4bc79b42ac0 100644 (file)
--- a/common/common.vcxproj
+++ b/common/common.vcxproj
@@ -81,7 +81,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
     <PostBuildEvent>\r
@@ -116,7 +116,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>false</LinkTimeCodeGeneration>\r
@@ -131,7 +131,7 @@
       <Command>"SubWCRev.exe" "$(SolutionDir)." "$(SolutionDir)\version.tmpl" "$(SolutionDir)\version.h"</Command>\r
     </PostBuildEvent>\r
     <PreBuildEvent>\r
-      <Command>"SubWCRev.exe" "$(SolutionDir)." "$(SolutionDir).\version.tmpl" "$(SolutionDir).\version.h"</Command>\r
+      <Command> "$(SolutionDir).\gitrev.bat"</Command>\r
     </PreBuildEvent>\r
     <ClCompile>\r
       <ForcedIncludeFiles>compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r
@@ -142,7 +142,7 @@
       <Command>"SubWCRev.exe" "$(SolutionDir)." "$(SolutionDir)\version.tmpl" "$(SolutionDir)\version.h"</Command>\r
     </PostBuildEvent>\r
     <PreBuildEvent>\r
-      <Command>"SubWCRev.exe" "$(SolutionDir)." "$(SolutionDir).\version.tmpl" "$(SolutionDir).\version.h"</Command>\r
+      <Command> "$(SolutionDir).\gitrev.bat"</Command>\r
     </PreBuildEvent>\r
     <ClCompile>\r
       <ForcedIncludeFiles>compiler/vs/disable_silly_warnings.h</ForcedIncludeFiles>\r

diff --git a/common/env.cpp b/common/env.cpp
index 684273d9e71a2c4b07e0a7eea8a2ab3f560bdbac..817553c7ce829aa7cd14c4a89e22056ff661d485 100644 (file)
--- a/common/env.cpp
+++ b/common/env.cpp
@@ -159,7 +159,7 @@ const std::wstring& version()
                        EXPAND_AND_QUOTE(CASPAR_GEN)    "." 
                        EXPAND_AND_QUOTE(CASPAR_MAYOR)  "." 
                        EXPAND_AND_QUOTE(CASPAR_MINOR)  "." 
-                       EXPAND_AND_QUOTE(CASPAR_REV)    " " 
+                       CASPAR_REV      " " 
                        CASPAR_TAG);
        return ver;
 }

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 cb6e9fd131ab327576299b3a5d8a5903840bcea6..f2f5f61d8ec63bf3c761c80315918747069426ba 100644 (file)
Binary files a/shell/shell.rc and b/shell/shell.rc differ

diff --git a/version.tmpl b/version.tmpl
index b5ca1ffa1805598fbba70ca68e3bcbbc4b910fdc..98c3d68b4d2e83abae488fe724a98068aefef73a 100644 (file)
--- a/version.tmpl
+++ b/version.tmpl
@@ -1,5 +1,4 @@
 #define CASPAR_GEN 2\r
 #define CASPAR_MAYOR 1\r
 #define CASPAR_MINOR 0\r
-#define CASPAR_REV $WCREV$\r
 #define CASPAR_TAG "UNSTABLE"\r