Merge pull request #656 from mono/svnBinaries-5.5monodevelop-5.5.2.3

Updated subversion binaries for Mac. 5.5

5 files changed, 26 insertions, 7 deletions

diff --git a/.gitmodules b/.gitmodules
index 65c2704f1e..5885cf157c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -39,9 +39,9 @@
 	path = main/external/fsharpbinding
 	url = git://github.com/fsharp/fsharpbinding.git
 	branch = master
-[submodule "main/external/sharpsvn-binary"]
-	path = main/external/sharpsvn-binary
-	url = git://github.com/mono/sharpsvn-binary.git
 [submodule "main/external/nuget-binary"]
 	path = main/external/nuget-binary
 	url = git://github.com/mono/nuget-binary.git
+[submodule "main/external/sharpsvn-binary"]
+	path = main/external/sharpsvn-binary
+	url = git://github.com/mono/sharpsvn-binary.git
diff --git a/main/Main.sln b/main/Main.sln
index 5e2cb1ee3e..213ca4c55f 100644
--- a/main/Main.sln
+++ b/main/Main.sln
@@ -1704,8 +1704,8 @@ Global
 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

-		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

-		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU

+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU

 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Release|Any CPU.Build.0 = Release|Any CPU

diff --git a/main/external/sharpsvn-binary b/main/external/sharpsvn-binary
-Subproject d2ab5e8af4b8e88635abd61daef9d3d1035f79f
+Subproject 83e626a9624f97baec346d0ccb946bb9709cce5
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj
index dc8a9d9041..cf5ebd1d33 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj
@@ -35,6 +35,19 @@
     <NoWarn>1591;1573</NoWarn>
     <DocumentationFile>..\..\..\..\build\AddIns\VersionControl\MonoDevelop.VersionControl.Subversion.Unix.xml</DocumentationFile>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' ">
+    <DebugSymbols>True</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\..\..\build\AddIns\VersionControl</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>False</ConsolePause>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <NoWarn>1591;1573</NoWarn>
+    <DocumentationFile>..\..\..\..\build\AddIns\VersionControl\MonoDevelop.VersionControl.Subversion.Unix.xml</DocumentationFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
   </ItemGroup>
@@ -83,4 +96,10 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup Condition=" '$(Configuration)' == 'DebugMac' ">
+    <NativeBinaries Include="..\..\..\..\external\sharpsvn-binary\mac\*.dylib" />
+  </ItemGroup>
+  <Target Name="AfterBuild">
+    <Copy SourceFiles="@(NativeBinaries)" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.dll.config b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.dll.config
index 1e3a4be805..f1ba0f2b37 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.dll.config
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.dll.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
-	<dllmap os="osx" dll="libsvn_client-1.so.0" target="libsvn_client-1.dylib" />
-	<dllmap os="osx" dll="libsvn_client-1.so.1" target="libsvn_client-1.dylib" />
+	<dllmap os="osx" dll="libsvn_client-1.so.0" target="libsvn_client-1.0.dylib" />
+	<dllmap os="osx" dll="libsvn_client-1.so.1" target="libsvn_client-1.0.dylib" />
 	<dllmap os="osx" dll="libapr-0.so.0" target="libapr-1.0.dylib" />
 	<dllmap os="osx" dll="libapr-1.so.0" target="libapr-1.0.dylib" />
 	<dllmap os="freebsd" dll="libapr-0.so.0" target="libapr-1.so" />