From b492840349d2e0c37f4541127511820e3058e338 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 24 Nov 2017 17:51:12 +0000 Subject: [PATCH] Fetch git commit using LibGit2Sharp that ships with VS2015 when possible * Thanks to https://stackoverflow.com/a/43815817/4070143 --- qrenderdoc/qrenderdoc_local.vcxproj | 1 + .../driver/d3d11/renderdoc_d3d11.vcxproj | 1 + .../driver/d3d12/renderdoc_d3d12.vcxproj | 1 + renderdoc/driver/d3d8/renderdoc_d3d8.vcxproj | 1 + renderdoc/driver/d3d9/renderdoc_d3d9.vcxproj | 1 + renderdoc/driver/dxgi/renderdoc_dxgi.vcxproj | 1 + renderdoc/driver/gl/renderdoc_gl.vcxproj | 1 + renderdoc/driver/ihv/amd/AMD.vcxproj | 1 + .../shaders/dxbc/renderdoc_dxbc.vcxproj | 1 + .../shaders/spirv/renderdoc_spirv.vcxproj | 1 + .../driver/vulkan/renderdoc_vulkan.vcxproj | 1 + renderdoc/renderdoc.props | 65 +++++++++++++++++++ renderdoc/renderdoc.vcxproj | 1 + renderdoccmd/renderdoccmd.vcxproj | 1 + renderdocshim/renderdocshim.vcxproj | 1 + 15 files changed, 79 insertions(+) create mode 100644 renderdoc/renderdoc.props diff --git a/qrenderdoc/qrenderdoc_local.vcxproj b/qrenderdoc/qrenderdoc_local.vcxproj index 5b844070a..48566a86d 100644 --- a/qrenderdoc/qrenderdoc_local.vcxproj +++ b/qrenderdoc/qrenderdoc_local.vcxproj @@ -1713,4 +1713,5 @@ IF %ERRORLEVEL% NEQ 0 (echo ==================================================== + \ No newline at end of file diff --git a/renderdoc/driver/d3d11/renderdoc_d3d11.vcxproj b/renderdoc/driver/d3d11/renderdoc_d3d11.vcxproj index 5d807cfe0..3a8c02b37 100644 --- a/renderdoc/driver/d3d11/renderdoc_d3d11.vcxproj +++ b/renderdoc/driver/d3d11/renderdoc_d3d11.vcxproj @@ -159,4 +159,5 @@ + \ No newline at end of file diff --git a/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj b/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj index 4cec487e4..5fc6088d6 100644 --- a/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj +++ b/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj @@ -146,4 +146,5 @@ + \ No newline at end of file diff --git a/renderdoc/driver/d3d8/renderdoc_d3d8.vcxproj b/renderdoc/driver/d3d8/renderdoc_d3d8.vcxproj index 49b40d46f..c2571ca05 100644 --- a/renderdoc/driver/d3d8/renderdoc_d3d8.vcxproj +++ b/renderdoc/driver/d3d8/renderdoc_d3d8.vcxproj @@ -125,4 +125,5 @@ + \ No newline at end of file diff --git a/renderdoc/driver/d3d9/renderdoc_d3d9.vcxproj b/renderdoc/driver/d3d9/renderdoc_d3d9.vcxproj index a16832663..f9607fcfc 100644 --- a/renderdoc/driver/d3d9/renderdoc_d3d9.vcxproj +++ b/renderdoc/driver/d3d9/renderdoc_d3d9.vcxproj @@ -121,4 +121,5 @@ + \ No newline at end of file diff --git a/renderdoc/driver/dxgi/renderdoc_dxgi.vcxproj b/renderdoc/driver/dxgi/renderdoc_dxgi.vcxproj index 66a955b50..ac04cc3d5 100644 --- a/renderdoc/driver/dxgi/renderdoc_dxgi.vcxproj +++ b/renderdoc/driver/dxgi/renderdoc_dxgi.vcxproj @@ -121,4 +121,5 @@ + \ No newline at end of file diff --git a/renderdoc/driver/gl/renderdoc_gl.vcxproj b/renderdoc/driver/gl/renderdoc_gl.vcxproj index 51b0ba3f2..0ccc09150 100644 --- a/renderdoc/driver/gl/renderdoc_gl.vcxproj +++ b/renderdoc/driver/gl/renderdoc_gl.vcxproj @@ -196,4 +196,5 @@ + \ No newline at end of file diff --git a/renderdoc/driver/ihv/amd/AMD.vcxproj b/renderdoc/driver/ihv/amd/AMD.vcxproj index 7d896674b..7e3bede54 100644 --- a/renderdoc/driver/ihv/amd/AMD.vcxproj +++ b/renderdoc/driver/ihv/amd/AMD.vcxproj @@ -132,4 +132,5 @@ + \ No newline at end of file diff --git a/renderdoc/driver/shaders/dxbc/renderdoc_dxbc.vcxproj b/renderdoc/driver/shaders/dxbc/renderdoc_dxbc.vcxproj index 8abea2bcb..85167105a 100644 --- a/renderdoc/driver/shaders/dxbc/renderdoc_dxbc.vcxproj +++ b/renderdoc/driver/shaders/dxbc/renderdoc_dxbc.vcxproj @@ -120,4 +120,5 @@ + \ No newline at end of file diff --git a/renderdoc/driver/shaders/spirv/renderdoc_spirv.vcxproj b/renderdoc/driver/shaders/spirv/renderdoc_spirv.vcxproj index ea5cbffc6..f38eb7e6f 100644 --- a/renderdoc/driver/shaders/spirv/renderdoc_spirv.vcxproj +++ b/renderdoc/driver/shaders/spirv/renderdoc_spirv.vcxproj @@ -222,4 +222,5 @@ + \ No newline at end of file diff --git a/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj b/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj index 858994159..684ea5944 100644 --- a/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj +++ b/renderdoc/driver/vulkan/renderdoc_vulkan.vcxproj @@ -206,4 +206,5 @@ + \ No newline at end of file diff --git a/renderdoc/renderdoc.props b/renderdoc/renderdoc.props new file mode 100644 index 000000000..26dba20d2 --- /dev/null +++ b/renderdoc/renderdoc.props @@ -0,0 +1,65 @@ + + + + + + + $([MSBuild]::Unescape("$(DevEnvDir)\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\LibGit2Sharp.dll")) + + + + + + + + + + + + +using System; +using System.Linq; +using System.Runtime.CompilerServices; + +namespace GitIntrospection { + public class GetGitCommit : Microsoft.Build.Utilities.Task { + public override bool Execute() { + System.AppDomain.CurrentDomain.AssemblyResolve += (sender, args) => { + if (args.Name.Contains("LibGit2Sharp")) { + return System.Reflection.Assembly.LoadFrom(LibGit2SharpAssemblyPath); + } + return null; + }; + GetCommit(); + return !Log.HasLoggedErrors; + } + private void GetCommit() { + try { + Sha1 = (new LibGit2Sharp.Repository(Repository)).Commits.First().Id.Sha; + } catch(LibGit2Sharp.RepositoryNotFoundException) { + } + } + + [Microsoft.Build.Framework.Required] public string Repository { get; set; } + [Microsoft.Build.Framework.Required] public string LibGit2SharpAssemblyPath { get; set; } + [Microsoft.Build.Framework.Output] public string Sha1 { get; set; } + } +} + + + + + + + + + + + + + + GIT_COMMIT_HASH="$(CommitId)";%(PreprocessorDefinitions) + + + + diff --git a/renderdoc/renderdoc.vcxproj b/renderdoc/renderdoc.vcxproj index 6f7e3fd8d..345c55d55 100644 --- a/renderdoc/renderdoc.vcxproj +++ b/renderdoc/renderdoc.vcxproj @@ -488,4 +488,5 @@ + \ No newline at end of file diff --git a/renderdoccmd/renderdoccmd.vcxproj b/renderdoccmd/renderdoccmd.vcxproj index f37f243c2..5a681cffa 100644 --- a/renderdoccmd/renderdoccmd.vcxproj +++ b/renderdoccmd/renderdoccmd.vcxproj @@ -222,4 +222,5 @@ + \ No newline at end of file diff --git a/renderdocshim/renderdocshim.vcxproj b/renderdocshim/renderdocshim.vcxproj index e6344a4e4..8b1667869 100644 --- a/renderdocshim/renderdocshim.vcxproj +++ b/renderdocshim/renderdocshim.vcxproj @@ -200,4 +200,5 @@ + \ No newline at end of file