diff options
author | Alan McGovern <alan.mcgovern@gmail.com> | 2012-04-02 14:45:14 +0400 |
---|---|---|
committer | Alan McGovern <alan.mcgovern@gmail.com> | 2012-04-02 18:16:00 +0400 |
commit | 6535b911aa4b81c8fab4b22a6822fa9778f723cf (patch) | |
tree | a4bd3752b898fe54b551c3c26cef29601208c7fa /main/src/core/MonoDevelop.Startup | |
parent | f2ea3136862aa4712e6a4c56e71281aa7cba186f (diff) |
[Build] Change the build system to use xbuild instead of makefiles
The actual compilation process now happens with xbuild. The root makefile
just issues an "xbuild Main.sln" call. If you type 'make' in a subdirectory
you will issue an 'xbuild foo.csproj' for that dir and every subdir. This is
slightly slower than building Main.sln directly if many subdirs are being built.
'make dist' is now implemented with a call to 'git archive' which means our tarball
really does contain everything we need to build monodevelop (yay!).
Makefile integration is now disabled (it's unnecessary).
We now put test assemblies in build/test too to avoid polluting build/bin and build/Addins
Diffstat (limited to 'main/src/core/MonoDevelop.Startup')
-rw-r--r-- | main/src/core/MonoDevelop.Startup/Makefile.am | 39 | ||||
-rw-r--r-- | main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.csproj | 15 |
2 files changed, 1 insertions, 53 deletions
diff --git a/main/src/core/MonoDevelop.Startup/Makefile.am b/main/src/core/MonoDevelop.Startup/Makefile.am index b52b1719fd..deb0ebdaf3 100644 --- a/main/src/core/MonoDevelop.Startup/Makefile.am +++ b/main/src/core/MonoDevelop.Startup/Makefile.am @@ -1,38 +1 @@ - -ASSEMBLY = $(top_builddir)/build/bin/MonoDevelop.exe - -FILES = \ - AssemblyInfo.cs \ - MonoDevelop.Startup/MonoDevelopMain.cs - -RES = - -all: $(ASSEMBLY) $(ASSEMBLY).mdb $(ASSEMBLY).config - -DEPS = \ - $(top_builddir)/build/bin/MonoDevelop.Core.dll \ - $(top_builddir)/build/bin/MonoDevelop.Ide.dll - -REFS = $(MONO_ADDINS_LIBS) - -ICON = $(top_builddir)/theme-icons/Windows/monodevelop.ico - -$(ASSEMBLY): $(build_sources) $(build_resources) $(DEPS) - $(CSC) $(CSC_FLAGS) -win32icon:$(ICON) -out:$@ $(REFS) $(build_deps) $(build_resources:%=/resource:%) $(build_sources) - -$(ASSEMBLY).config: $(ASSEMBLY) $(srcdir)/app.config - cp $(srcdir)/app.config $(ASSEMBLY).config - -$(ASSEMBLY).addins: $(ASSEMBLY) $(srcdir)/MonoDevelop.exe.addins - cp $(srcdir)/MonoDevelop.exe.addins $(ASSEMBLY).addins - -$(ASSEMBLY).mdb: $(ASSEMBLY) - -assemblydir = $(MD_ASSEMBLY_DIR) -assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb $(ASSEMBLY).config $(ASSEMBLY).addins - -CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb - -EXTRA_DIST = $(FILES) $(RES) app.config MonoDevelop.exe.addins - -include $(top_srcdir)/Makefile.include +include $(top_srcdir)/xbuild.include
\ No newline at end of file diff --git a/main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.csproj b/main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.csproj index efe2e823d0..d02e750d3d 100644 --- a/main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.csproj +++ b/main/src/core/MonoDevelop.Startup/MonoDevelop.Startup.csproj @@ -96,19 +96,4 @@ </Content> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> - <ProjectExtensions> - <MonoDevelop> - <Properties> - <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="true" IsAutotoolsProject="true" RelativeConfigureInPath="../../../"> - <BuildFilesVar Sync="true" Name="FILES" /> - <DeployFilesVar /> - <ResourcesVar Sync="true" Name="RES" /> - <OthersVar /> - <GacRefVar Sync="true" Name="REFS" Prefix="-r:" /> - <AsmRefVar Sync="true" Name="REFS" Prefix="-r:" /> - <ProjectRefVar Sync="true" Name="DEPS" /> - </MonoDevelop.Autotools.MakefileInfo> - </Properties> - </MonoDevelop> - </ProjectExtensions> </Project> |