Skip to content

Commit 0afbd46

Browse files
committed
Remove partially implemented custom library name
1 parent 9fd8f2a commit 0afbd46

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

UpdateLibgit2ToSha.ps1

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
#>
77

88
Param(
9-
[string]$sha = 'HEAD',
10-
[string]$libgit2Name = ''
9+
[string]$sha = 'HEAD'
1110
)
1211

1312
Set-StrictMode -Version Latest
@@ -82,11 +81,7 @@ Push-Location $libgit2Directory
8281

8382
Pop-Location
8483

85-
if (![string]::IsNullOrEmpty($libgit2Name)) {
86-
$binaryFilename = $libgit2Name
87-
} else {
88-
$binaryFilename = "git2-" + $sha.Substring(0,7)
89-
}
84+
$binaryFilename = "git2-" + $sha.Substring(0,7)
9085

9186
Set-Content -Encoding ASCII (Join-Path $projectDirectory "nuget.package\libgit2\libgit2_hash.txt") $sha
9287

build.libgit2.ps1

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@
55
If set, run the libgit2 tests on the desired version.
66
.PARAMETER debug
77
If set, build the "Debug" configuration of libgit2, rather than "Release" (default).
8+
.PARAMETER x86
9+
If set, the 32-bit version will be built.
10+
.PARAMETER x64
11+
If set, the 64-bit version will be built.
812
#>
913

1014
Param(
11-
[string]$libgit2Name = '',
1215
[switch]$test,
1316
[switch]$debug,
1417
[switch]$x86,
@@ -23,12 +26,7 @@ $x86Directory = Join-Path $projectDirectory "nuget.package\runtimes\win-x86\nati
2326
$x64Directory = Join-Path $projectDirectory "nuget.package\runtimes\win-x64\native"
2427
$hashFile = Join-Path $projectDirectory "nuget.package\libgit2\libgit2_hash.txt"
2528
$sha = Get-Content $hashFile
26-
27-
if (![string]::IsNullOrEmpty($libgit2Name)) {
28-
$binaryFilename = $libgit2Name
29-
} else {
30-
$binaryFilename = "git2-" + $sha.Substring(0,7)
31-
}
29+
$binaryFilename = "git2-" + $sha.Substring(0,7)
3230

3331
$build_clar = 'OFF'
3432
if ($test.IsPresent) { $build_clar = 'ON' }

0 commit comments

Comments
 (0)