Skip to content

Commit 3fc3ce9

Browse files
author
Edward Thomson
committed
Merge pull request #37 from ethomson/libname
Change native path to 'lib'
2 parents 1fde566 + 86b804d commit 3fc3ce9

File tree

8 files changed

+33
-35
lines changed

8 files changed

+33
-35
lines changed

‎UpdateLibgit2ToSha.ps1

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -99,28 +99,28 @@ Push-Location $libgit2Directory
9999
<EmbeddedResource Include="`$(MSBuildThisFileDirectory)\..\libgit2\libgit2_filename.txt" />
100100
</ItemGroup>
101101
<ItemGroup>
102-
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\$binaryFilename.dll')" Include="`$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\$binaryFilename.dll">
103-
<Link>NativeBinaries\amd64\$binaryFilename.dll</Link>
102+
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\libgit2\win32\x64\$binaryFilename.dll')" Include="`$(MSBuildThisFileDirectory)\..\libgit2\win32\x64\$binaryFilename.dll">
103+
<Link>lib\win32\x64\$binaryFilename.dll</Link>
104104
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
105105
</None>
106-
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\$binaryFilename.pdb')" Include="`$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\$binaryFilename.pdb">
107-
<Link>NativeBinaries\amd64\$binaryFilename.pdb</Link>
106+
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\libgit2\win32\x64\$binaryFilename.pdb')" Include="`$(MSBuildThisFileDirectory)\..\libgit2\win32\x64\$binaryFilename.pdb">
107+
<Link>lib\win32\x64\$binaryFilename.pdb</Link>
108108
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
109109
</None>
110-
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\$binaryFilename.dll')" Include="`$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\$binaryFilename.dll">
111-
<Link>NativeBinaries\x86\$binaryFilename.dll</Link>
110+
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\libgit2\win32\x86\$binaryFilename.dll')" Include="`$(MSBuildThisFileDirectory)\..\libgit2\win32\x86\$binaryFilename.dll">
111+
<Link>lib\win32\x86\$binaryFilename.dll</Link>
112112
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
113113
</None>
114-
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\$binaryFilename.pdb')" Include="`$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\$binaryFilename.pdb">
115-
<Link>NativeBinaries\x86\$binaryFilename.pdb</Link>
114+
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\libgit2\win32\x86\$binaryFilename.pdb')" Include="`$(MSBuildThisFileDirectory)\..\libgit2\win32\x86\$binaryFilename.pdb">
115+
<Link>lib\win32\x86\$binaryFilename.pdb</Link>
116116
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
117117
</None>
118118
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\libgit2\osx\lib$binaryFilename.dylib')" Include="`$(MSBuildThisFileDirectory)\..\libgit2\osx\lib$binaryFilename.dylib">
119-
<Link>NativeBinaries\osx\lib$binaryFilename.dylib</Link>
119+
<Link>lib\osx\lib$binaryFilename.dylib</Link>
120120
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
121121
</None>
122-
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\libgit2\linux\amd64\lib$binaryFilename.so')" Include="`$(MSBuildThisFileDirectory)\..\libgit2\linux\amd64\lib$binaryFilename.so">
123-
<Link>NativeBinaries\linux\amd64\lib$binaryFilename.so</Link>
122+
<None Condition="Exists('`$(MSBuildThisFileDirectory)\..\libgit2\linux\x86_64\lib$binaryFilename.so')" Include="`$(MSBuildThisFileDirectory)\..\libgit2\linux\x86_64\lib$binaryFilename.so">
123+
<Link>lib\linux\x86_64\lib$binaryFilename.so</Link>
124124
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
125125
</None>
126126
<None Include="`$(MSBuildThisFileDirectory)\..\libgit2\LibGit2Sharp.dll.config">
@@ -135,8 +135,8 @@ Push-Location $libgit2Directory
135135

136136
$dllConfig = @"
137137
<configuration>
138-
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="$binaryFilename" target="NativeBinaries/linux/amd64/lib$binaryFilename.so" />
139-
<dllmap os="osx" cpu="x86,x86-64" dll="$binaryFilename" target="NativeBinaries/osx/lib$binaryFilename.dylib" />
138+
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="$binaryFilename" target="lib/linux/x86_64/lib$binaryFilename.so" />
139+
<dllmap os="osx" cpu="x86,x86-64" dll="$binaryFilename" target="lib/osx/lib$binaryFilename.dylib" />
140140
</configuration>
141141
"@
142142

‎build.libgit2.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ Set-StrictMode -Version Latest
2020

2121
$projectDirectory = Split-Path $MyInvocation.MyCommand.Path
2222
$libgit2Directory = Join-Path $projectDirectory "libgit2"
23-
$x86Directory = Join-Path $projectDirectory "nuget.package\libgit2\windows\x86"
24-
$x64Directory = Join-Path $projectDirectory "nuget.package\libgit2\windows\amd64"
23+
$x86Directory = Join-Path $projectDirectory "nuget.package\libgit2\win32\x86"
24+
$x64Directory = Join-Path $projectDirectory "nuget.package\libgit2\win32\x64"
2525
$hashFile = Join-Path $projectDirectory "nuget.package\libgit2\libgit2_hash.txt"
2626
$sha = Get-Content $hashFile
2727

‎build.libgit2.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ LIBEXT="so"
2828

2929
if [ $OS == "Linux" ]; then
3030
OSPATH="/linux"
31-
if [ $ARCH == "x86_64" ]; then
32-
ARCHPATH="/amd64"
33-
fi
31+
ARCHPATH="/${ARCH}"
3432
elif [ $OS == "Darwin" ]; then
3533
OSPATH="/osx"
3634
LIBEXT="dylib"

‎libgit2

Submodule libgit2 updated 292 files

‎nuget.package/build/LibGit2Sharp.NativeBinaries.props

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,28 @@
55
<EmbeddedResource Include="$(MSBuildThisFileDirectory)\..\libgit2\libgit2_filename.txt" />
66
</ItemGroup>
77
<ItemGroup>
8-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-de143ef.dll')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-de143ef.dll">
9-
<Link>NativeBinaries\amd64\git2-de143ef.dll</Link>
8+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\win32\x64\git2-36fc255.dll')" Include="$(MSBuildThisFileDirectory)\..\libgit2\win32\x64\git2-36fc255.dll">
9+
<Link>lib\win32\x64\git2-36fc255.dll</Link>
1010
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1111
</None>
12-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-de143ef.pdb')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\amd64\git2-de143ef.pdb">
13-
<Link>NativeBinaries\amd64\git2-de143ef.pdb</Link>
12+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\win32\x64\git2-36fc255.pdb')" Include="$(MSBuildThisFileDirectory)\..\libgit2\win32\x64\git2-36fc255.pdb">
13+
<Link>lib\win32\x64\git2-36fc255.pdb</Link>
1414
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1515
</None>
16-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-de143ef.dll')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-de143ef.dll">
17-
<Link>NativeBinaries\x86\git2-de143ef.dll</Link>
16+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\win32\x86\git2-36fc255.dll')" Include="$(MSBuildThisFileDirectory)\..\libgit2\win32\x86\git2-36fc255.dll">
17+
<Link>lib\win32\x86\git2-36fc255.dll</Link>
1818
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1919
</None>
20-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-de143ef.pdb')" Include="$(MSBuildThisFileDirectory)\..\libgit2\windows\x86\git2-de143ef.pdb">
21-
<Link>NativeBinaries\x86\git2-de143ef.pdb</Link>
20+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\win32\x86\git2-36fc255.pdb')" Include="$(MSBuildThisFileDirectory)\..\libgit2\win32\x86\git2-36fc255.pdb">
21+
<Link>lib\win32\x86\git2-36fc255.pdb</Link>
2222
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2323
</None>
24-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\osx\libgit2-de143ef.dylib')" Include="$(MSBuildThisFileDirectory)\..\libgit2\osx\libgit2-de143ef.dylib">
25-
<Link>NativeBinaries\osx\libgit2-de143ef.dylib</Link>
24+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\osx\libgit2-36fc255.dylib')" Include="$(MSBuildThisFileDirectory)\..\libgit2\osx\libgit2-36fc255.dylib">
25+
<Link>lib\osx\libgit2-36fc255.dylib</Link>
2626
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2727
</None>
28-
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\linux\amd64\libgit2-de143ef.so')" Include="$(MSBuildThisFileDirectory)\..\libgit2\linux\amd64\libgit2-de143ef.so">
29-
<Link>NativeBinaries\linux\amd64\libgit2-de143ef.so</Link>
28+
<None Condition="Exists('$(MSBuildThisFileDirectory)\..\libgit2\linux\x86_64\libgit2-36fc255.so')" Include="$(MSBuildThisFileDirectory)\..\libgit2\linux\x86_64\libgit2-36fc255.so">
29+
<Link>lib\linux\x86_64\libgit2-36fc255.so</Link>
3030
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3131
</None>
3232
<None Include="$(MSBuildThisFileDirectory)\..\libgit2\LibGit2Sharp.dll.config">

‎nuget.package/libgit2/LibGit2Sharp.dll.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<configuration>
2-
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-de143ef" target="NativeBinaries/linux/amd64/libgit2-de143ef.so" />
3-
<dllmap os="osx" cpu="x86,x86-64" dll="git2-de143ef" target="NativeBinaries/osx/libgit2-de143ef.dylib" />
2+
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-36fc255" target="lib/linux/x86_64/libgit2-36fc255.so" />
3+
<dllmap os="osx" cpu="x86,x86-64" dll="git2-36fc255" target="lib/osx/libgit2-36fc255.dylib" />
44
</configuration>

‎nuget.package/libgit2/libgit2_filename.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
git2-de143ef
1+
git2-36fc255

‎nuget.package/libgit2/libgit2_hash.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
de143efa88f6916af62cc5ed172e9cae4b194ae1
1+
36fc25572ca042372b1a58f07bc721b2b827e8be

0 commit comments

Comments
 (0)