From 1b96bffcf1067ef13af53355e69019f515454b18 Mon Sep 17 00:00:00 2001 From: Mirco Bauer Date: Sun, 23 Feb 2014 13:01:18 +0100 Subject: [PATCH] Made libgit2sharp an optional build requirement --- .gitmodules | 3 --- lib/libgit2sharp | 1 - src/Engine-Tests/GitMessageBufferTests.cs | 2 ++ src/Engine/Engine.csproj | 4 ---- src/Engine/MessageBuffers/GitMessageBuffer.cs | 2 ++ src/smuxi.sln | 22 +++++++------------ 6 files changed, 12 insertions(+), 22 deletions(-) delete mode 160000 lib/libgit2sharp diff --git a/.gitmodules b/.gitmodules index 9dbc624a0..8790c0888 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,6 +31,3 @@ [submodule "lib/StarkSoftProxy"] path = lib/StarkSoftProxy url = https://github.com/meebey/starksoftproxy.git -[submodule "lib/libgit2sharp"] - path = lib/libgit2sharp - url = git://git.qnetp.net/libgit2sharp.git diff --git a/lib/libgit2sharp b/lib/libgit2sharp deleted file mode 160000 index 0c90ce15c..000000000 --- a/lib/libgit2sharp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0c90ce15cbff34d64f32b0a0507d9399c8a02c61 diff --git a/src/Engine-Tests/GitMessageBufferTests.cs b/src/Engine-Tests/GitMessageBufferTests.cs index 366acfef2..1434b64b4 100644 --- a/src/Engine-Tests/GitMessageBufferTests.cs +++ b/src/Engine-Tests/GitMessageBufferTests.cs @@ -17,6 +17,7 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +#if LIBGIT2SHARP using System; using System.IO; using NUnit.Framework; @@ -47,3 +48,4 @@ protected override IMessageBuffer OpenBuffer() } } +#endif diff --git a/src/Engine/Engine.csproj b/src/Engine/Engine.csproj index cba4d9c7d..2c74ef373 100644 --- a/src/Engine/Engine.csproj +++ b/src/Engine/Engine.csproj @@ -157,10 +157,6 @@ {600CD3BF-2ED2-4183-87F7-ADD78A968AE0} Db4objects.Db4o-2010 - - {EE6ED99F-CB12-4683-B055-D28FC7357A34} - LibGit2Sharp - {579B3FDB-CDAD-44E1-8417-885C38E49A0E} ServiceStack.Text diff --git a/src/Engine/MessageBuffers/GitMessageBuffer.cs b/src/Engine/MessageBuffers/GitMessageBuffer.cs index 3f59c6fc2..05fa6dc49 100644 --- a/src/Engine/MessageBuffers/GitMessageBuffer.cs +++ b/src/Engine/MessageBuffers/GitMessageBuffer.cs @@ -17,6 +17,7 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +#if LIBGIT2SHARP using System; using System.IO; using System.Text; @@ -263,3 +264,4 @@ public override void Flush() } } } +#endif diff --git a/src/smuxi.sln b/src/smuxi.sln index 7c98469f2..271c10db1 100644 --- a/src/smuxi.sln +++ b/src/smuxi.sln @@ -67,8 +67,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StarkSoftProxy", "..\lib\St EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Frontend-GNOME-Twitter", "Frontend-GNOME-Twitter\Frontend-GNOME-Twitter.csproj", "{298A5895-D8C8-45EB-AC57-1B6AAD05D6AD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibGit2Sharp", "..\lib\libgit2sharp\LibGit2Sharp\LibGit2Sharp.csproj", "{EE6ED99F-CB12-4683-B055-D28FC7357A34}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Release|Any CPU = Release|Any CPU @@ -191,18 +189,14 @@ Global {52C5C937-774E-4279-82E1-890EDE4F4759}.Release-Win32|x86.Build.0 = Release|Any CPU {579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug-Win32|Any CPU.ActiveCfg = Debug|Any CPU + {579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug-Win32|Any CPU.Build.0 = Debug|Any CPU {579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug-Win32|x86.ActiveCfg = Debug|Any CPU {579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug-Win32|x86.Build.0 = Debug|Any CPU {579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU {579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Release|Any CPU.Build.0 = Release|Any CPU {579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Release-Win32|x86.ActiveCfg = Release|Any CPU {579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Release-Win32|x86.Build.0 = Release|Any CPU - {579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug-Win32|Any CPU.ActiveCfg = Debug|Any CPU - {579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug-Win32|Any CPU.Build.0 = Debug|Any CPU - {579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Release|Any CPU.Build.0 = Release|Any CPU {5C3F617A-3811-49DE-A6ED-4F726BAAAE4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5C3F617A-3811-49DE-A6ED-4F726BAAAE4D}.Debug|Any CPU.Build.0 = Debug|Any CPU {5C3F617A-3811-49DE-A6ED-4F726BAAAE4D}.Debug-Win32|x86.ActiveCfg = Debug|Any CPU @@ -235,12 +229,6 @@ Global {7B1E3AB2-FB8C-4439-A2B4-2129EDBD79F8}.Release|Any CPU.Build.0 = Release|Any CPU {7B1E3AB2-FB8C-4439-A2B4-2129EDBD79F8}.Release-Win32|x86.ActiveCfg = Release|Any CPU {7B1E3AB2-FB8C-4439-A2B4-2129EDBD79F8}.Release-Win32|x86.Build.0 = Release|Any CPU - {8DD96596-38AC-46DD-80C1-75D9EBE585EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DD96596-38AC-46DD-80C1-75D9EBE585EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DD96596-38AC-46DD-80C1-75D9EBE585EA}.Debug-Win32|Any CPU.ActiveCfg = Debug|Any CPU - {8DD96596-38AC-46DD-80C1-75D9EBE585EA}.Debug-Win32|Any CPU.Build.0 = Debug|Any CPU - {8DD96596-38AC-46DD-80C1-75D9EBE585EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DD96596-38AC-46DD-80C1-75D9EBE585EA}.Release|Any CPU.Build.0 = Release|Any CPU {91D3003B-7E65-4EAF-8EE1-DA43832E7A9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {91D3003B-7E65-4EAF-8EE1-DA43832E7A9C}.Debug|Any CPU.Build.0 = Debug|Any CPU {91D3003B-7E65-4EAF-8EE1-DA43832E7A9C}.Debug-Win32|x86.ActiveCfg = Debug|Any CPU @@ -349,6 +337,12 @@ Global {EB46B9C6-EE37-48F9-835E-E49580E40E0A}.Release|Any CPU.Build.0 = Release|Any CPU {EB46B9C6-EE37-48F9-835E-E49580E40E0A}.Release-Win32|x86.ActiveCfg = Release|Any CPU {EB46B9C6-EE37-48F9-835E-E49580E40E0A}.Release-Win32|x86.Build.0 = Release|Any CPU + {8DD96596-38AC-46DD-80C1-75D9EBE585EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8DD96596-38AC-46DD-80C1-75D9EBE585EA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8DD96596-38AC-46DD-80C1-75D9EBE585EA}.Debug-Win32|Any CPU.ActiveCfg = Debug|Any CPU + {8DD96596-38AC-46DD-80C1-75D9EBE585EA}.Debug-Win32|Any CPU.Build.0 = Debug|Any CPU + {8DD96596-38AC-46DD-80C1-75D9EBE585EA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8DD96596-38AC-46DD-80C1-75D9EBE585EA}.Release|Any CPU.Build.0 = Release|Any CPU {40AC7A7C-D3E5-46DF-B740-06BD9D2A00E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {40AC7A7C-D3E5-46DF-B740-06BD9D2A00E1}.Debug|Any CPU.Build.0 = Debug|Any CPU {40AC7A7C-D3E5-46DF-B740-06BD9D2A00E1}.Debug-Win32|x86.ActiveCfg = Debug|Any CPU