improve: git version generation will no longer be done at build time

now use: tools/generate_git_version.bat
mehah · Feb 28, 2023 · 9c2195e · 9c2195e
1 parent 3b3e55f
commit 9c2195e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 30 deletions.
diff --git a/tools/generate_git_version.bat b/tools/generate_git_version.bat
@@ -0,0 +1,13 @@
+WHERE git
+IF %ERRORLEVEL% EQU 0 (
+	IF EXIST ../.git/ (
+	  echo | set /p dummyName=#define GIT_BRANCH > ../src/gitinfo.h
+	  git rev-parse --abbrev-ref HEAD >> ../src/gitinfo.h
+
+	  echo | set /p dummyName=#define GIT_VERSION >> ../src/gitinfo.h
+	  git describe --abbrev=0 --tag >> ../src/gitinfo.h
+
+	  echo | set /p dummyName=#define GIT_COMMITS >> ../src/gitinfo.h
+	  git rev-list --count head >> ../src/gitinfo.h
+	)
+)
diff --git a/vc17/otclient.vcxproj b/vc17/otclient.vcxproj
@@ -169,20 +169,7 @@ cmd /c "start ../vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\tools\protobuf\
     </Link>
     <PreBuildEvent>
       <Command>if NOT EXIST "../src/protobuf/appearances.pb.cc" (
-	cmd /c "start ../vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\tools\protobuf\protoc" --cpp_out=../src/protobuf/ --proto_path=../src/protobuf/ appearances.proto
-)
-WHERE git
-IF %ERRORLEVEL% EQU 0 (
-	IF EXIST ../.git/ (
-	  echo | set /p dummyName=#define GIT_BRANCH &gt; ../src/gitinfo.h
-	  git rev-parse --abbrev-ref HEAD &gt;&gt; ../src/gitinfo.h
-
-	  echo | set /p dummyName=#define GIT_VERSION &gt;&gt; ../src/gitinfo.h
-	  git describe --abbrev=0 --tag &gt;&gt; ../src/gitinfo.h
-
-	  echo | set /p dummyName=#define GIT_COMMITS &gt;&gt; ../src/gitinfo.h
-	  git rev-list --count head &gt;&gt; ../src/gitinfo.h
-	)
+cmd /c "start ../vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\tools\protobuf\protoc" --cpp_out=../src/protobuf/ --proto_path=../src/protobuf/ appearances.proto
 )
 </Command>
     </PreBuildEvent>
@@ -208,22 +195,8 @@ IF %ERRORLEVEL% EQU 0 (
     </Link>
     <PreBuildEvent>
       <Command>if NOT EXIST "../src/protobuf/appearances.pb.cc" (
-	cmd /c "start ../vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\tools\protobuf\protoc" --cpp_out=../src/protobuf/ --proto_path=../src/protobuf/ appearances.proto
-)
-WHERE git
-IF %ERRORLEVEL% EQU 0 (
-	IF EXIST ../.git/ (
-	  echo | set /p dummyName=#define GIT_BRANCH &gt; ../src/gitinfo.h
-	  git rev-parse --abbrev-ref HEAD &gt;&gt; ../src/gitinfo.h
-
-	  echo | set /p dummyName=#define GIT_VERSION &gt;&gt; ../src/gitinfo.h
-	  git describe --abbrev=0 --tag &gt;&gt; ../src/gitinfo.h
-
-	  echo | set /p dummyName=#define GIT_COMMITS &gt;&gt; ../src/gitinfo.h
-	  git rev-list --count head &gt;&gt; ../src/gitinfo.h
-	)
-)
-</Command>
+cmd /c "start ../vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\tools\protobuf\protoc" --cpp_out=../src/protobuf/ --proto_path=../src/protobuf/ appearances.proto
+)</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>