[Build] Build NGit, NSch and Sharpen from their submodule location

We now do a simple xbuild of the NGit sln to build these projects
and their associated tests.

6 files changed, 29 insertions, 29 deletions

diff --git a/main/Main.sln b/main/Main.sln
index ff633fe087..06960c1152 100644
--- a/main/Main.sln
+++ b/main/Main.sln
@@ -162,11 +162,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "contrib", "contrib", "{F129
 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "contrib\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sharpen", "contrib\Sharpen\Sharpen.csproj", "{72944A6C-45FF-4EF8-B349-8C9CABF519D4}"

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sharpen", "..\external\ngit\Sharpen\Sharpen.csproj", "{72944A6C-45FF-4EF8-B349-8C9CABF519D4}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSch", "contrib\NSch\NSch.csproj", "{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}"

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSch", "..\external\ngit\NSch\NSch.csproj", "{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NGit", "contrib\NGit\NGit.csproj", "{E3BFF8B4-189C-496A-A817-7E8B31E22B91}"

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NGit", "..\external\ngit\NGit\NGit.csproj", "{E3BFF8B4-189C-496A-A817-7E8B31E22B91}"

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Debugger.Soft", "contrib\Mono.Debugger.Soft\Mono.Debugger.Soft.csproj", "{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}"

 EndProject

diff --git a/main/Makefile.am b/main/Makefile.am
index 11b83dc6f0..b4d698f36b 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = contrib src po man theme-icons build tests
+SUBDIRS = ../external contrib src po man theme-icons build tests
 
 #capture aclocal flags for autoreconf
 ACLOCAL_AMFLAGS=$(ACLOCAL_FLAGS)
diff --git a/main/configure.in b/main/configure.in
index 2a17665715..ee1a8c8d1e 100644
--- a/main/configure.in
+++ b/main/configure.in
@@ -269,9 +269,6 @@ contrib/Makefile
 contrib/Mono.Cecil/Makefile
 contrib/Mono.Debugger.Soft/Makefile
 contrib/NRefactory/Makefile
-contrib/Sharpen/Makefile
-contrib/NGit/Makefile
-contrib/NSch/Makefile
 contrib/ICSharpCode.NRefactory/Makefile
 contrib/ICSharpCode.NRefactory.CSharp/Makefile
 contrib/ICSharpCode.Decompiler/Makefile
diff --git a/main/contrib/Makefile.am b/main/contrib/Makefile.am
index 15d845968f..dd02071af4 100644
--- a/main/contrib/Makefile.am
+++ b/main/contrib/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = Mono.Cecil Mono.Debugger.Soft NRefactory Sharpen NSch NGit ICSharpCode.NRefactory ICSharpCode.NRefactory.CSharp ICSharpCode.Decompiler 
+SUBDIRS = Mono.Cecil Mono.Debugger.Soft NRefactory ICSharpCode.NRefactory ICSharpCode.NRefactory.CSharp ICSharpCode.Decompiler 
 
 EXTRA_DIST =  $(srcdir)/extract_makefile_variable.sh
 
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Makefile.am b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Makefile.am
index 1759861107..0aa1d85293 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Makefile.am
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Makefile.am
@@ -1,6 +1,9 @@
 
 ADDIN_BUILD = $(top_builddir)/build/AddIns/VersionControl
 ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.VersionControl.Git.dll
+NGIT=$(top_builddir)/../external/ngit/bin/NGit.dll
+NSCH=$(top_builddir)/../external/ngit/bin/NSch.dll
+SHARPEN=$(top_builddir)/../external/ngit/bin/Sharpen.dll
 
 DEPS =  \
 	$(top_builddir)/build/AddIns/VersionControl/MonoDevelop.VersionControl.dll \
@@ -9,9 +12,9 @@ DEPS =  \
 	$(top_builddir)/build/bin/Mono.TextEditor.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
 	$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
-	$(top_builddir)/contrib/bin/NGit.dll \
-	$(top_builddir)/contrib/bin/NSch.dll \
-	$(top_builddir)/contrib/bin/Sharpen.dll
+	$(top_builddir)/../external/ngit/bin/NGit.dll \
+	$(top_builddir)/../external/ngit/bin/NSch.dll \
+	$(top_builddir)/../external/ngit/bin/Sharpen.dll
 
 REFS =  \
 	$(GLIB_SHARP_LIBS) \
@@ -71,12 +74,12 @@ RES =  \
 
 $(ASSEMBLY): $(build_sources) $(build_resources) $(DEPS)
 	mkdir -p $(ADDIN_BUILD)
-	cp $(top_builddir)/contrib/bin/NGit.dll $(ADDIN_BUILD)
-	cp $(top_builddir)/contrib/bin/NGit.dll.mdb $(ADDIN_BUILD) || true 
-	cp $(top_builddir)/contrib/bin/NSch.dll $(ADDIN_BUILD)
-	cp $(top_builddir)/contrib/bin/NSch.dll.mdb $(ADDIN_BUILD) || true
-	cp $(top_builddir)/contrib/bin/Sharpen.dll $(ADDIN_BUILD)
-	cp $(top_builddir)/contrib/bin/Sharpen.dll.mdb $(ADDIN_BUILD) || true
+	cp $(NGIT) $(ADDIN_BUILD)
+	cp $(NGIT).mdb $(ADDIN_BUILD) || true 
+	cp $(NSCH) $(ADDIN_BUILD)
+	cp $(NSCH).mdb $(ADDIN_BUILD) || true
+	cp $(SHARPEN) $(ADDIN_BUILD)
+	cp $(SHARPEN).mdb $(ADDIN_BUILD) || true
 	$(CSC) $(CSC_FLAGS) $(build_sources) $(REFS) $(build_deps) $(build_resources:%=/resource:%) -out:$@ -target:library
 
 $(ASSEMBLY).mdb: $(ASSEMBLY)
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj
index b468a49557..962386397d 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj
@@ -111,18 +111,6 @@
       <Name>Mono.TextEditor</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\contrib\NSch\NSch.csproj">
-      <Project>{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}</Project>
-      <Name>NSch</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\contrib\NGit\NGit.csproj">
-      <Project>{E3BFF8B4-189C-496A-A817-7E8B31E22B91}</Project>
-      <Name>NGit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\contrib\Sharpen\Sharpen.csproj">
-      <Project>{72944A6C-45FF-4EF8-B349-8C9CABF519D4}</Project>
-      <Name>Sharpen</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\contrib\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
       <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project>
       <Name>ICSharpCode.NRefactory</Name>
@@ -133,6 +121,18 @@
       <Name>ICSharpCode.NRefactory.CSharp</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\external\ngit\NGit\NGit.csproj">
+      <Project>{E3BFF8B4-189C-496A-A817-7E8B31E22B91}</Project>
+      <Name>NGit</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\external\ngit\NSch\NSch.csproj">
+      <Project>{A19E6F3F-A25B-4B01-8922-CF0CC35C781D}</Project>
+      <Name>NSch</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\external\ngit\Sharpen\Sharpen.csproj">
+      <Project>{72944A6C-45FF-4EF8-B349-8C9CABF519D4}</Project>
+      <Name>Sharpen</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="MonoDevelop.VersionControl.Git.addin.xml">