Introduce SSH linking in the scripts.

libgit2 · Therzok · Oct 24, 2014 · Oct 24, 2014 · Oct 24, 2014 · Apr 6, 2015
commit 8000ec8155cfb6644a64a78c07bd316f2bb121ab
diff --git a/Lib/NativeBinaries/amd64/git2-9bbc8f3.dll b/Lib/NativeBinaries/amd64/git2-9bbc8f3.dll
diff --git a/Lib/NativeBinaries/amd64/git2-9bbc8f3.pdb b/Lib/NativeBinaries/amd64/git2-9bbc8f3.pdb
diff --git a/Lib/NativeBinaries/x86/git2-9bbc8f3.dll b/Lib/NativeBinaries/x86/git2-9bbc8f3.dll
diff --git a/Lib/NativeBinaries/x86/git2-9bbc8f3.pdb b/Lib/NativeBinaries/x86/git2-9bbc8f3.pdb
diff --git a/LibGit2Sharp.Tests/GlobalSettingsFixture.cs b/LibGit2Sharp.Tests/GlobalSettingsFixture.cs
@@ -1,6 +1,8 @@
 using System.Text.RegularExpressions;
 using LibGit2Sharp.Tests.TestHelpers;
 using Xunit;
+using System.Globalization;
+using System.IO;
 
 namespace LibGit2Sharp.Tests
 {
@@ -13,6 +15,14 @@ public void CanGetMinimumCompiledInFeatures()
 
             Assert.True(features.HasFlag(BuiltInFeatures.Threads));
             Assert.True(features.HasFlag(BuiltInFeatures.Https));
+
+            bool hasSsh;
+            using (var sr = new StreamReader(typeof(GlobalSettingsFixture).Assembly.GetManifestResourceStream("LibGit2Sharp.Tests.ssh_used.txt")))
+            {
+                if (!bool.TryParse(sr.ReadLine(), out hasSsh))
+                    hasSsh = false;
+            }
+            Assert.Equal(hasSsh, features.HasFlag(BuiltInFeatures.Ssh));
         }
 
         [Fact]

diff --git a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
@@ -157,4 +157,7 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <ItemGroup>
+    <EmbeddedResource Include="ssh_used.txt" />
+  </ItemGroup>
 </Project>
diff --git a/LibGit2Sharp.Tests/ssh_used.txt b/LibGit2Sharp.Tests/ssh_used.txt
@@ -0,0 +1 @@
+False
diff --git a/UpdateLibgit2ToSha.ps1 b/UpdateLibgit2ToSha.ps1
@@ -11,14 +11,17 @@
 	If set, run the libgit2 tests on the desired version.
 .PARAMETER debug
 	If set, build the "Debug" configuration of libgit2, rather than "RelWithDebInfo" (default).
+.PARAMETER ssh
+	If set embeds SSH at the path pointed to by the value.
 #>
 
 Param(
 	[string]$sha = 'HEAD',
 	[string]$vs = '10',
 	[string]$libgit2Name = '',
 	[switch]$test,
-	[switch]$debug
+	[switch]$debug,
+	[string]$ssh = ''
 )
 
 Set-StrictMode -Version Latest
@@ -28,12 +31,19 @@ $libgit2sharpDirectory = Split-Path $MyInvocation.MyCommand.Path
 $libgit2Directory = Join-Path $libgit2sharpDirectory "libgit2"
 $x86Directory = Join-Path $libgit2sharpDirectory "Lib\NativeBinaries\x86"
 $x64Directory = Join-Path $libgit2sharpDirectory "Lib\NativeBinaries\amd64"
+    $sshFile = Join-Path $libgit2sharpDirectory "LibGit2Sharp.Tests\ssh_used.txt"
 
 $build_clar = 'OFF'
 if ($test.IsPresent) { $build_clar = 'ON' }
 $configuration = "RelWithDebInfo"
 if ($debug.IsPresent) { $configuration = "Debug" }
 
+if (![string]::IsNullOrEmpty($libgit2Name)) {
+	$embed_ssh = '-DEMBED_SSH_PATH="$ssh"'
+} else {
+	$embed_ssh = ''
+}
+
 function Run-Command([scriptblock]$Command, [switch]$Fatal, [switch]$Quiet) {
     $output = ""
     if ($Quiet) {
@@ -144,7 +154,7 @@ function Assert-Consistent-Naming($expected, $path) {
 	Run-Command -Quiet { & remove-item build -recurse -force }
 	Run-Command -Quiet { & mkdir build }
 	cd build
-	Run-Command -Quiet -Fatal { & $cmake -G "Visual Studio $vs" -D ENABLE_TRACE=ON -D "BUILD_CLAR=$build_clar" -D "LIBGIT2_FILENAME=$binaryFilename" -DSTDCALL=ON .. }
+	Run-Command -Quiet -Fatal { & $cmake -G "Visual Studio $vs" -D THREADSAFE=ON -D ENABLE_TRACE=ON -D "BUILD_CLAR=$build_clar" -D "LIBGIT2_FILENAME=$binaryFilename" -DSTDCALL=ON $embed_ssh .. }
 	Run-Command -Quiet -Fatal { & $cmake --build . --config $configuration }
 	if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } }
 	cd $configuration
@@ -157,7 +167,7 @@ function Assert-Consistent-Naming($expected, $path) {
 	cd ..
 	Run-Command -Quiet { & mkdir build64 }
 	cd build64
-	Run-Command -Quiet -Fatal { & $cmake -G "Visual Studio $vs Win64" -D THREADSAFE=ON -D ENABLE_TRACE=ON -D "BUILD_CLAR=$build_clar" -D "LIBGIT2_FILENAME=$binaryFilename" -DSTDCALL=ON ../.. }
+	Run-Command -Quiet -Fatal { & $cmake -G "Visual Studio $vs Win64" -D THREADSAFE=ON -D ENABLE_TRACE=ON -D "BUILD_CLAR=$build_clar" -D "LIBGIT2_FILENAME=$binaryFilename" -DSTDCALL=ON $embed_ssh ../.. }
 	Run-Command -Quiet -Fatal { & $cmake --build . --config $configuration }
 	if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } }
 	cd $configuration
@@ -180,6 +190,7 @@ namespace LibGit2Sharp.Core
 
 	sc -Encoding ASCII (Join-Path $libgit2sharpDirectory "Libgit2sharp\Core\NativeDllName.cs") $dllNameClass
 	sc -Encoding ASCII (Join-Path $libgit2sharpDirectory "Libgit2sharp\libgit2_hash.txt") $sha
+	sc -Encoding ASCII (Join-Path $libgit2sharpDirectory "Libgit2sharp.Tests\ssh_used.txt") (![string]::IsNullOrEmpty($ssh))
 
 	$buildProperties = @"
 <?xml version="1.0" encoding="utf-8"?>

diff --git a/build.libgit2sharp.sh b/build.libgit2sharp.sh
@@ -3,6 +3,8 @@
 LIBGIT2SHA=`cat ./LibGit2Sharp/libgit2_hash.txt`
 SHORTSHA=${LIBGIT2SHA:0:7}
 EXTRADEFINE="$1"
+USESSH=${1-OFF}
+SSH_FILE="LibGit2Sharp.Tests/ssh_used.txt"
 
 rm -rf libgit2/build
 mkdir libgit2/build
@@ -11,13 +13,17 @@ export _BINPATH=`pwd`
 
 cmake -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
       -DBUILD_CLAR:BOOL=OFF \
-      -DUSE_SSH=OFF \
+      -DUSE_SSH=$USESSH \
       -DENABLE_TRACE=ON \
       -DLIBGIT2_FILENAME=git2-$SHORTSHA \
       -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" \
       ..
 cmake --build .
 
+shopt -s nocasematch
+[[ USESSH == "ON" ]] && echo "True" > $SSH_FILE || echo "False" > $SSH_FILE
+shopt -u nocasematch
+
 export LD_LIBRARY_PATH=$_BINPATH:$LD_LIBRARY_PATH
 export DYLD_LIBRARY_PATH=$_BINPATH:$DYLD_LIBRARY_PATH