Merge pull request #93 from libgit2/add-alpine39

bording · web-flow · commit d7063ac6d59a · 2019-04-20T04:40:21.000+02:00
Add support for alpine 3.9
diff --git a/.travis.yml b/.travis.yml
@@ -29,6 +29,10 @@ matrix:
       dist: trusty
       sudo: required
       env: RID=alpine-x64
+    - os: linux
+      dist: trusty
+      sudo: required
+      env: RID=alpine.3.9-x64
     - os: osx
       env: RID=osx
 
diff --git a/Dockerfile.alpine.3.9-x64 b/Dockerfile.alpine.3.9-x64
@@ -0,0 +1,7 @@
+FROM alpine:3.9
+WORKDIR /nativebinaries
+COPY . /nativebinaries/
+
+RUN apk add --no-cache bash build-base cmake openssl-dev
+
+CMD ["/bin/bash", "-c", "./build.libgit2.sh"]
diff --git a/UpdateLibgit2ToSha.ps1 b/UpdateLibgit2ToSha.ps1
@@ -156,6 +156,10 @@ Push-Location $libgit2Directory
       <TargetPath>lib\alpine-x64\lib$binaryFilename.so</TargetPath>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </ContentWithTargetPath>
+    <ContentWithTargetPath Condition="Exists('`$(MSBuildThisFileDirectory)\..\..\runtimes\alpine.3.9-x64\native\lib$binaryFilename.so')" Include="`$(MSBuildThisFileDirectory)\..\..\runtimes\alpine.3.9-x64\native\lib$binaryFilename.so">
+      <TargetPath>lib\alpine.3.9-x64\lib$binaryFilename.so</TargetPath>
+      CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </ContentWithTargetPath>
     <ContentWithTargetPath Include="`$(MSBuildThisFileDirectory)\..\..\libgit2\LibGit2Sharp.dll.config">
       <TargetPath>LibGit2Sharp.dll.config</TargetPath>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/nuget.package/build/LibGit2Sharp.NativeBinaries.props b/nuget.package/build/LibGit2Sharp.NativeBinaries.props
@@ -1,4 +1,4 @@
-﻿<Project>
+<Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
     <libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
diff --git a/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props b/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props
@@ -1,4 +1,4 @@
-﻿<Project>
+<Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
     <libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
@@ -50,6 +50,10 @@
       <TargetPath>lib\alpine-x64\libgit2-572e4d8.so</TargetPath>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </ContentWithTargetPath>
+    <ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\alpine.3.9-x64\native\libgit2-572e4d8.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\alpine.3.9-x64\native\libgit2-572e4d8.so">
+      <TargetPath>lib\alpine.3.9-x64\libgit2-572e4d8.so</TargetPath>
+      CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </ContentWithTargetPath>
     <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)\..\..\libgit2\LibGit2Sharp.dll.config">
       <TargetPath>LibGit2Sharp.dll.config</TargetPath>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/nuget.package/libgit2/LibGit2Sharp.dll.config b/nuget.package/libgit2/LibGit2Sharp.dll.config
@@ -1,4 +1,4 @@
-﻿<configuration>
+<configuration>
     <dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-572e4d8" target="lib/linux-x64/libgit2-572e4d8.so" />
     <dllmap os="osx" cpu="x86,x86-64" dll="git2-572e4d8" target="lib/osx/libgit2-572e4d8.dylib" />
 </configuration>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Project>`
	`1`	`+<Project>`
`2`	`2`	`<PropertyGroup>`
`3`	`3`	`<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>`
`4`	`4`	`<libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>`