Trying to fix GitInfo

OpenXRay · Oct 4, 2018 · c462859 · c462859
1 parent 529684f
commit c462859
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 11 deletions.
diff --git a/src/xrCore/.GitInfo.cmd b/src/xrCore/.GitInfo.cmd
@@ -1,8 +1,3 @@
-where git >nul 2>nul
-if %errorLevel% neq 0 (
-  goto :EOF
-)
-
 echo | set /p dummyName=#define GIT_INFO_CURRENT_COMMIT > .GitInfo.hpp
 git rev-parse --verify HEAD >> .GitInfo.hpp
 

diff --git a/src/xrCore/xrCore.vcxproj b/src/xrCore/xrCore.vcxproj
@@ -116,7 +116,13 @@
       <Message>Copying the required libraries ...</Message>
     </PostBuildEvent>
     <PreBuildEvent>
-      <Command>call .GitInfo.cmd</Command>
+      <Command>where /q git
+if errorlevel 1 (
+  echo git is not founded
+  goto :EOF
+)
+echo git is founded
+call .GitInfo.cmd</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -132,7 +138,13 @@
       <Message>Copying the required libraries ...</Message>
     </PostBuildEvent>
     <PreBuildEvent>
-      <Command>call .GitInfo.cmd</Command>
+      <Command>where /q git
+if errorlevel 1 (
+  echo git is not founded
+  goto :EOF
+)
+echo git is founded
+call .GitInfo.cmd</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -151,7 +163,13 @@
       <Message>Copying the required libraries ...</Message>
     </PostBuildEvent>
     <PreBuildEvent>
-      <Command>call .GitInfo.cmd</Command>
+      <Command>where /q git
+if errorlevel 1 (
+  echo git is not founded
+  goto :EOF
+)
+echo git is founded
+call .GitInfo.cmd</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -167,7 +185,13 @@
       <Message>Copying the required libraries ...</Message>
     </PostBuildEvent>
     <PreBuildEvent>
-      <Command>call .GitInfo.cmd</Command>
+      <Command>where /q git
+if errorlevel 1 (
+  echo git is not founded
+  goto :EOF
+)
+echo git is founded
+call .GitInfo.cmd</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
@@ -185,7 +209,13 @@
       <Message>Copying the required libraries ...</Message>
     </PostBuildEvent>
     <PreBuildEvent>
-      <Command>call .GitInfo.cmd</Command>
+      <Command>where /q git
+if errorlevel 1 (
+  echo git is not founded
+  goto :EOF
+)
+echo git is founded
+call .GitInfo.cmd</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
@@ -201,7 +231,13 @@
       <Message>Copying the required libraries ...</Message>
     </PostBuildEvent>
     <PreBuildEvent>
-      <Command>call .GitInfo.cmd</Command>
+      <Command>where /q git
+if errorlevel 1 (
+  echo git is not founded
+  goto :EOF
+)
+echo git is founded
+call .GitInfo.cmd</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>