Skip to content

Commit 122f4ce

Browse files
committed
Add libgit2_hash.txt to libgit2 folder
It's needed when building libgit2, and it's useful to have in the package.
1 parent b02d5e3 commit 122f4ce

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

UpdateLibgit2ToSha.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<#
22
.SYNOPSIS
3-
Updates the libgit2 submodule to the specified commit and updates NativeBinaries.props with the new hash value.
3+
Updates the libgit2 submodule to the specified commit and updates libgit2_hash.txt and NativeBinaries.props with the new hash value.
44
.PARAMETER sha
55
Desired libgit2 version. This is run through `git rev-parse`, so branch names are okay too.
66
#>
@@ -88,6 +88,8 @@ Push-Location $libgit2Directory
8888
$binaryFilename = "git2-" + $sha.Substring(0,7)
8989
}
9090

91+
sc -Encoding ASCII (Join-Path $projectDirectory "nuget.package\libgit2\libgit2_hash.txt") $sha
92+
9193
$buildProperties = @"
9294
<Project>
9395
<PropertyGroup>

build.libgit2.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ $projectDirectory = Split-Path $MyInvocation.MyCommand.Path
2222
$libgit2Directory = Join-Path $projectDirectory "libgit2"
2323
$x86Directory = Join-Path $projectDirectory "nuget.package\runtimes\win7-x86\native"
2424
$x64Directory = Join-Path $projectDirectory "nuget.package\runtimes\win7-x64\native"
25-
$hashFile = Join-Path $projectDirectory "nuget.package\contentFiles\any\any\libgit2_hash.txt"
25+
$hashFile = Join-Path $projectDirectory "nuget.package\libgit2\libgit2_hash.txt"
2626
$sha = Get-Content $hashFile
2727

2828
if (![string]::IsNullOrEmpty($libgit2Name)) {

build.libgit2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
LIBGIT2SHA=`cat ./nuget.package/contentFiles/any/any/libgit2_hash.txt`
3+
LIBGIT2SHA=`cat ./nuget.package/libgit2/libgit2_hash.txt`
44
SHORTSHA=${LIBGIT2SHA:0:7}
55

66
rm -rf libgit2/build
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
15e119375018fba121cf58e02a9f17fe22df0df8

0 commit comments

Comments
 (0)