diff options
| author | Alan McGovern <alan.mcgovern@gmail.com> | 2012-04-20 05:43:33 +0400 |
|---|---|---|
| committer | Alan McGovern <alan.mcgovern@gmail.com> | 2012-04-20 14:33:31 +0400 |
| commit | 211708666af8f1fd4f3dc3b001b4dc36fd66cf8b (patch) | |
| tree | b74fa6d03f50a661acce75f24fa8402179314ce4 /main/src/addins/VersionControl/MonoDevelop.VersionControl.Git | |
| parent | 84e6e7db828da8322aa915e66a8d921d92ce6065 (diff) | |
[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.
Diffstat (limited to 'main/src/addins/VersionControl/MonoDevelop.VersionControl.Git')
| -rw-r--r-- | main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/Makefile.am | 21 | ||||
| -rw-r--r-- | main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj | 24 |
2 files changed, 24 insertions, 21 deletions
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"> |