From 6970c727183352e5778c5f661846a3aba0cc0e81 Mon Sep 17 00:00:00 2001 From: zilmar Date: Fri, 11 Jun 2021 21:19:28 +0930 Subject: [PATCH] Remove calling git describe from UpdateVersion.cmd --- Source/Script/UpdateVersion.cmd | 6 ++---- Source/UpdateVersion/UpdateVersion.cpp | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Source/Script/UpdateVersion.cmd b/Source/Script/UpdateVersion.cmd index 0425589a9..05fe49bbb 100644 --- a/Source/Script/UpdateVersion.cmd +++ b/Source/Script/UpdateVersion.cmd @@ -16,9 +16,7 @@ if not "%~2" == "" set Platform=%~2 if not "%~2" == "" set InFile="%~3" if not "%~3" == "" set OutFile="%~4" -FOR /F "tokens=1 delims=" %%A in ('git describe --tags --long --dirty') do SET current_tag=%%A - if %Platform%==x64 set BuildMode=%BuildMode%64 -echo "%base_dir%\Bin\%BuildMode%\UpdateVersion.exe" %InFile% %OutFile% "%current_tag%" -"%base_dir%\Bin\%BuildMode%\UpdateVersion.exe" %InFile% %OutFile% "%current_tag%" +echo "%base_dir%\Bin\%BuildMode%\UpdateVersion.exe" %InFile% %OutFile% +"%base_dir%\Bin\%BuildMode%\UpdateVersion.exe" %InFile% %OutFile% diff --git a/Source/UpdateVersion/UpdateVersion.cpp b/Source/UpdateVersion/UpdateVersion.cpp index ba05b0204..8b153397c 100644 --- a/Source/UpdateVersion/UpdateVersion.cpp +++ b/Source/UpdateVersion/UpdateVersion.cpp @@ -111,7 +111,7 @@ std::string GitRevisionShort(CPath & SourceDirectory) int main() { - if (__argc < 4) + if (__argc < 3) { return 0; }