[Build] Change the build system to use xbuild instead of makefiles (again)

The build 'regression' was a problem in some makefiles. It was fixed in
aea26c16d94490c95f4e61329c137b82a4abfe77

10 files changed, 7 insertions, 354 deletions

diff --git a/main/src/tools/Makefile.am b/main/src/tools/Makefile.am
index b3a7f7907d..d25ea39a9d 100644
--- a/main/src/tools/Makefile.am
+++ b/main/src/tools/Makefile.am
@@ -1,3 +1 @@
-SUBDIRS = SharpCoco mdhost mdtool mdmonitor mdcrashlog
-
-include $(top_srcdir)/Makefile.include
+SUBDIRS = SharpCoco mdhost mdtool mdmonitor
diff --git a/main/src/tools/mdcrashlog/AssemblyInfo.cs b/main/src/tools/mdcrashlog/AssemblyInfo.cs
deleted file mode 100644
index b53c3e9db6..0000000000
--- a/main/src/tools/mdcrashlog/AssemblyInfo.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes. 
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle("MonoDevelop.CrashLog")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("Xamarin Inc.")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly, 
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/main/src/tools/mdcrashlog/CrashLogOptions.cs b/main/src/tools/mdcrashlog/CrashLogOptions.cs
deleted file mode 100644
index f75f791b56..0000000000
--- a/main/src/tools/mdcrashlog/CrashLogOptions.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-// 
-// OptionsParser.cs
-//  
-// Author:
-//       Alan McGovern <alan@xamarin.com>
-// 
-// Copyright 2011, Xamarin Inc.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-
-namespace MonoDevelop.CrashLog
-{
-	public static class CrashLogOptions
-	{
-		public static string LogPath {
-			get; private set;
-		}
-
-		public static int Pid {
-			get; private set;
-		}
-		
-		public static string SessionUuid {
-			get; private set;
-		}
-		
-		public static bool TryParse (string[] args, out string error)
-		{
-			error = null;
-			Pid = -1;
-			
-			for (int i = 0; i < args.Length; i ++) {
-				if (args [i] == "-pid") {
-					Pid = int.Parse (args [++ i]);
-				}
-				if (args [i] == "-log") {
-					LogPath = args [++ i];
-				}
-				if (args[i] == "-session") {
-					SessionUuid = args [++ i];
-				}
-			}
-			
-			if (Pid == -1) {
-				error = "The pid of the MonoDevelop process being monitored must be supplied";
-			} else if (string.IsNullOrEmpty (LogPath)) {
-				error = "The path to write log files to must be supplied";
-			} else if (string.IsNullOrEmpty (SessionUuid)) {
-				error = "The session uuid must be supplied";
-			}
-			
-			
-			return error == null;
-		}
-	}
-}
-
diff --git a/main/src/tools/mdcrashlog/Makefile.am b/main/src/tools/mdcrashlog/Makefile.am
deleted file mode 100644
index ee8d92cd63..0000000000
--- a/main/src/tools/mdcrashlog/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-BINDIR=$(top_builddir)/build/bin
-
-ASSEMBLY=$(BINDIR)/MonoDevelop.CrashLog.dll
-PROJECT=MonoDevelop.CrashLog.csproj
-
-REFS =  \
-	/r:System \
-	/r:System.Web \
-	/r:System.Xml
-
-FILES =  \
-	AssemblyInfo.cs \
-	CrashLogOptions.cs \
-	MonoDevelop.SessionLogging/ISessionLogger.cs
-
-DEPS =  \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
-
-all: $(ASSEMBLY)
-
-$(ASSEMBLY): $(build_sources) $(DEPS) $(srcdir)/$(PROJECT)
-	mkdir -p $(BINDIR)
-	$(CSC) $(CSC_FLAGS) -target:library -debug $(build_sources) $(REFS) $(build_deps) /out:$(ASSEMBLY)
-
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
-
-EXTRA_DIST = \
-	$(FILES) \
-	$(PROJECT)
-
-include $(top_srcdir)/Makefile.include
\ No newline at end of file
diff --git a/main/src/tools/mdcrashlog/MonoDevelop.CrashLog.csproj b/main/src/tools/mdcrashlog/MonoDevelop.CrashLog.csproj
deleted file mode 100644
index 5fc0c0a690..0000000000
--- a/main/src/tools/mdcrashlog/MonoDevelop.CrashLog.csproj
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D90DF5C6-0ABE-4E13-930D-C3AE95FBE5C4}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>MonoDevelop.CrashLog</RootNamespace>
-    <AssemblyName>MonoDevelop.CrashLog</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\build\bin</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-    <Externalconsole>True</Externalconsole>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <DebugType>none</DebugType>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\build\bin\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-    <Externalconsole>True</Externalconsole>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Web" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="MonoDevelop.SessionLogging\ISessionLogger.cs" />
-    <Compile Include="CrashLogOptions.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Folder Include="MonoDevelop.SessionLogging\" />
-    <Folder Include="MonoDevelop.Monitoring\" />
-    <Folder Include="MonoDevelop.CrashReporting\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile.am" />
-  </ItemGroup>
-  <ProjectExtensions>
-    <MonoDevelop>
-      <Properties>
-        <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" SyncReferences="True">
-          <BuildFilesVar Sync="True" Name="FILES" />
-          <DeployFilesVar />
-          <ResourcesVar />
-          <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>
diff --git a/main/src/tools/mdcrashlog/MonoDevelop.SessionLogging/ISessionLogger.cs b/main/src/tools/mdcrashlog/MonoDevelop.SessionLogging/ISessionLogger.cs
deleted file mode 100644
index 4e267d007d..0000000000
--- a/main/src/tools/mdcrashlog/MonoDevelop.SessionLogging/ISessionLogger.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// 
-// ISessionLogger.cs
-//  
-// Author:
-//       Alan McGovern <alan@xamarin.com>
-// 
-// Copyright 2011, Xamarin Inc.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-
-namespace MonoDevelop.SessionLogging
-{
-	public interface ISessionLogger
-	{
-		void LogException (Exception ex);
-	}
-}
\ No newline at end of file
diff --git a/main/src/tools/mdhost/Makefile.am b/main/src/tools/mdhost/Makefile.am
index 152fbb3639..c9cc87438f 100644
--- a/main/src/tools/mdhost/Makefile.am
+++ b/main/src/tools/mdhost/Makefile.am
@@ -1,27 +1 @@
-
-ASSEMBLY = $(top_builddir)/build/bin/mdhost.exe
-
-FILES = src/AssemblyInfo.cs \
-src/mdhost.cs
-
-all: $(ASSEMBLY) $(ASSEMBLY).config
-
-REFS = -r:System.Runtime.Remoting \
-	$(MONO_ADDINS_LIBS) \
-	-r:Mono.Posix
-
-DEPS = $(top_builddir)/build/bin/MonoDevelop.Core.dll
-	
-$(ASSEMBLY): $(build_sources) $(DEPS)
-	$(CSC) $(CSC_FLAGS) $(build_sources) $(REFS) $(build_deps) -out:$(ASSEMBLY)
-
-$(ASSEMBLY).config: $(ASSEMBLY) $(srcdir)/app.config
-	cp $(srcdir)/app.config $(ASSEMBLY).config
-
-assemblydir = $(MD_ASSEMBLY_DIR)
-assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb $(ASSEMBLY).config
-
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(ASSEMBLY).config
-EXTRA_DIST = $(FILES) app.config
-
-include $(top_srcdir)/Makefile.include
+include $(top_srcdir)/xbuild.include
diff --git a/main/src/tools/mdmonitor/Makefile.am b/main/src/tools/mdmonitor/Makefile.am
index 1708e59e38..c9cc87438f 100644
--- a/main/src/tools/mdmonitor/Makefile.am
+++ b/main/src/tools/mdmonitor/Makefile.am
@@ -1,57 +1 @@
-
-ASSEMBLY = $(top_builddir)/build/bin/mdmonitor.exe
-
-FILES =  \
-	../../addins/MacPlatform/MacInterop/AppleEvent.cs \
-	../../addins/MacPlatform/MacInterop/ApplicationEvents.cs \
-	../../addins/MacPlatform/MacInterop/Carbon.cs \
-	../../addins/MacPlatform/MacInterop/CoreFoundation.cs \
-	AssemblyInfo.cs \
-	ChartSerieInfo.cs \
-	ChartView.cs \
-	CounterSelectorDialog.cs \
-	gtk-gui/generated.cs \
-	gtk-gui/Mono.Instrumentation.Monitor.CounterSelectorDialog.cs \
-	gtk-gui/Mono.Instrumentation.Monitor.InstrumenationChartView.cs \
-	gtk-gui/Mono.Instrumentation.Monitor.InstrumentationViewerDialog.cs \
-	gtk-gui/Mono.Instrumentation.Monitor.NewProfile.cs \
-	gtk-gui/Mono.Instrumentation.Monitor.TimeLineViewWindow.cs \
-	gtk-gui/Mono.Instrumentation.Monitor.TimeStatisticsView.cs \
-	InstrumenationChartView.cs \
-	InstrumentationViewerDialog.cs \
-	MacIntegration/MacIntegration.cs \
-	Main.cs \
-	NewProfile.cs \
-	TimeLineView.cs \
-	TimeLineViewWindow.cs \
-	TimeStatisticsView.cs
-
-RES = gtk-gui/gui.stetic 
-
-all: $(ASSEMBLY)
-
-REFS =  \
-	$(GLADE_SHARP_LIBS) \
-	$(GLIB_SHARP_LIBS) \
-	$(GTK_SHARP_LIBS) \
-	-r:Mono.Cairo \
-	-r:Mono.Posix \
-	-r:System \
-	-r:System.Core \
-	-r:System.Xml
-
-DEPS =  \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
-
-
-$(ASSEMBLY): $(build_sources) $(build_resources) $(DEPS)
-	$(CSC) /unsafe $(CSC_FLAGS) $(build_sources) $(REFS) $(build_deps) $(build_resources:%=/resource:%) -out:$(ASSEMBLY)
-
-assemblydir = $(MD_ASSEMBLY_DIR)
-assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb           
-
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
-EXTRA_DIST = $(FILES) $(RES)
-
-include $(top_srcdir)/Makefile.include
+include $(top_srcdir)/xbuild.include
diff --git a/main/src/tools/mdtool/Makefile.am b/main/src/tools/mdtool/Makefile.am
index 3abe707c4f..c9cc87438f 100644
--- a/main/src/tools/mdtool/Makefile.am
+++ b/main/src/tools/mdtool/Makefile.am
@@ -1,27 +1 @@
-
-ASSEMBLY = $(top_builddir)/build/bin/mdtool.exe
-
-FILES = src/AssemblyInfo.cs \
-src/mdtool.cs
-
-all: $(ASSEMBLY) $(ASSEMBLY).config
-
-REFS = $(MONO_ADDINS_LIBS) \
-	$(MONO_ADDINS_SETUP_LIBS) \
-	$(GTK_SHARP_LIBS)
-
-DEPS = $(top_builddir)/build/bin/MonoDevelop.Core.dll
-	
-$(ASSEMBLY): $(build_sources) $(DEPS)
-	$(CSC) $(CSC_FLAGS) $(build_sources) $(REFS) $(build_deps) /out:$(ASSEMBLY)
-
-$(ASSEMBLY).config: $(ASSEMBLY) $(srcdir)/app.config
-	cp $(srcdir)/app.config $(ASSEMBLY).config
-
-assemblydir = $(MD_ASSEMBLY_DIR)
-assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb $(ASSEMBLY).config
-
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(ASSEMBLY).config
-EXTRA_DIST = $(FILES) app.config
-
-include $(top_srcdir)/Makefile.include
+include $(top_srcdir)/xbuild.include
diff --git a/main/src/tools/mdtool/mdtool.csproj b/main/src/tools/mdtool/mdtool.csproj
index d2a6c3dd36..1cbf4f4d27 100644
--- a/main/src/tools/mdtool/mdtool.csproj
+++ b/main/src/tools/mdtool/mdtool.csproj
@@ -7,14 +7,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6}</ProjectGuid>
     <OutputType>Exe</OutputType>
+    <OutputPath>..\..\..\build\bin</OutputPath>
     <RootNamespace>mdtool</RootNamespace>
     <AssemblyName>mdtool</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>True</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\build\bin</OutputPath>
+    <Optimize>false</Optimize>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>
@@ -24,8 +24,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <DebugType>none</DebugType>
-    <Optimize>False</Optimize>
-    <OutputPath>..\..\..\build\bin</OutputPath>
+    <Optimize>false</Optimize>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>