diff options
| author | Jamie Madill <jmadill@chromium.org> | 2014-04-30 14:51:53 -0400 |
|---|---|---|
| committer | Jamie Madill <jmadill@chromium.org> | 2014-05-01 17:55:53 +0000 |
| commit | a18299c961d0cc03c3cbd0a3b9f51dd6c80578d7 (patch) | |
| tree | 5f932c336d90723cbfafad7b2ec2a9a7de3124cb /projects | |
| parent | 25bf006a617e8ea9535a0313926b98f73a11ea74 (diff) | |
| download | angle-a18299c961d0cc03c3cbd0a3b9f51dd6c80578d7.tar.gz | |
Reference .git/index as a dependency of commit_id.
Any time the git index changes, we will re-run the commit id hook.
This will ensure we never are left with stale commit ids from
other git commits.
BUG=angle:626
Change-Id: I03c37225fb902b6c1801e8f993d767122e8bfeb6
Reviewed-on: https://chromium-review.googlesource.com/197723
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/src/commit_id.vcxproj | 4 | ||||
| -rw-r--r-- | projects/src/commit_id.vcxproj.filters | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/projects/src/commit_id.vcxproj b/projects/src/commit_id.vcxproj index 17973811..193c7ff1 100644 --- a/projects/src/commit_id.vcxproj +++ b/projects/src/commit_id.vcxproj @@ -101,6 +101,9 @@ </ItemDefinitionGroup> <ItemGroup> <None Include="..\..\src\angle.gyp"/> + <None Include="..\..\.git\index"> + <ExcludedFromBuild>true</ExcludedFromBuild> + </None> </ItemGroup> <ItemGroup> <CustomBuild Include="$(OutDir)obj\global_intermediate\commit_id.bat"> @@ -108,6 +111,7 @@ <Command>call call $(OutDir)obj\global_intermediate\commit_id.bat "$(OutDir)obj\global_intermediate"</Command> <Message>Generating commit ID header...</Message> <Outputs>$(OutDir)obj\global_intermediate\commit.h</Outputs> + <AdditionalInputs>..\..\.git\index</AdditionalInputs> </CustomBuild> </ItemGroup> <ItemGroup> diff --git a/projects/src/commit_id.vcxproj.filters b/projects/src/commit_id.vcxproj.filters index 8a30d7ab..36138339 100644 --- a/projects/src/commit_id.vcxproj.filters +++ b/projects/src/commit_id.vcxproj.filters @@ -19,6 +19,12 @@ <Filter Include="..\..\src"> <UniqueIdentifier>{8CDEE807-BC53-E450-C8B8-4DEBB66742D4}</UniqueIdentifier> </Filter> + <Filter Include="..\..\.git"> + <UniqueIdentifier>{3C74FDB1-3FB1-8FA9-1073-A344751C6694}</UniqueIdentifier> + </Filter> + <Filter Include="..\..\.git\_excluded_files"> + <UniqueIdentifier>{158E591E-B6EA-0C85-8F5A-18EAFA09B4CE}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <None Include="$(OutDir)obj\global_intermediate\commit_id.bat"> @@ -27,5 +33,8 @@ <None Include="..\..\src\angle.gyp"> <Filter>..\..\src</Filter> </None> + <None Include="..\..\.git\index"> + <Filter>..\..\.git\_excluded_files</Filter> + </None> </ItemGroup> </Project> |