From 2c0568090cc8c80017e4aa1916a95b0f021eed3b Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Fri, 9 May 2014 12:40:08 -0700 Subject: [PATCH] Add a custom build task for getting the git version info Eliminates the need to have a copy of git accessible in the msys build environment and reduces the dependency on msys to just FFmpeg. Probably trivially faster due to how slow shell scripts are on Windows. --- build/Aegisub/Aegisub.vcxproj | 6 +- build/BuildTasks/BuildTasks.csproj | 13 +++- build/BuildTasks/GitVersion.cs | 113 +++++++++++++++++++++++++++++ build/BuildTasks/UpdateFile.cs | 40 ---------- build/BuildTasks/Utils.cs | 14 ---- build/BuildTasks/packages.config | 7 +- build/tasks.props | 2 +- 7 files changed, 131 insertions(+), 64 deletions(-) create mode 100644 build/BuildTasks/GitVersion.cs delete mode 100644 build/BuildTasks/UpdateFile.cs diff --git a/build/Aegisub/Aegisub.vcxproj b/build/Aegisub/Aegisub.vcxproj index 1b543cae7..50127c391 100644 --- a/build/Aegisub/Aegisub.vcxproj +++ b/build/Aegisub/Aegisub.vcxproj @@ -30,11 +30,7 @@ - + diff --git a/build/BuildTasks/BuildTasks.csproj b/build/BuildTasks/BuildTasks.csproj index 8c93c8f50..4e1cef4a0 100644 --- a/build/BuildTasks/BuildTasks.csproj +++ b/build/BuildTasks/BuildTasks.csproj @@ -37,6 +37,9 @@ ..\..\.nuget\lib\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll + + ..\..\.nuget\lib\LibGit2Sharp.0.17.0.0\lib\net35\LibGit2Sharp.dll + @@ -52,11 +55,11 @@ + - @@ -64,6 +67,14 @@ + + +if not exist "$(TargetDir)NativeBinaries" md "$(TargetDir)NativeBinaries" +if not exist "$(TargetDir)NativeBinaries\x86" md "$(TargetDir)NativeBinaries\x86" +xcopy /s /y /d "$(SolutionDir).nuget\lib\LibGit2Sharp.0.17.0.0\lib\net35\NativeBinaries\x86\*.*" "$(TargetDir)NativeBinaries\x86" +if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\amd64" +xcopy /s /y /d "$(SolutionDir).nuget\lib\LibGit2Sharp.0.17.0.0\lib\net35\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64" +