diff options
author | Michael Hutchinson <mhutchinson@novell.com> | 2010-12-13 06:01:45 +0300 |
---|---|---|
committer | Michael Hutchinson <mhutchinson@novell.com> | 2010-12-13 08:08:08 +0300 |
commit | d7316e5ef1aab655d7779b7d561a236d6680d414 (patch) | |
tree | f8e915b9d84f8bb01c92a9154f1bf375a95e7902 | |
parent | a11cf9abfd3479ba57f2935ce4719656c3928997 (diff) |
Include Mono.Debugger.Soft in the build
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | main/Main.sln | 13 | ||||
-rw-r--r-- | main/configure.in | 1 | ||||
-rw-r--r-- | main/contrib/Makefile.am | 2 | ||||
-rw-r--r-- | main/contrib/Mono.Debugger.Soft/Makefile.am | 93 | ||||
-rw-r--r-- | main/contrib/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj | 135 | ||||
-rw-r--r-- | main/contrib/Mono.Debugger.Soft/mono.snk | bin | 0 -> 596 bytes |
7 files changed, 243 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 2f368586c1..04d416be65 100644 --- a/.gitignore +++ b/.gitignore @@ -52,6 +52,7 @@ autom4te.cache/ /main/contrib/Mono.Cecil/Makefile /main/contrib/NRefactory/Makefile /main/contrib/GitSharp/Makefile +/main/contrib/Mono.Debugger.Soft/Makefile /main/po/Makefile /main/src/Makefile /main/src/addins/AspNet/Makefile diff --git a/main/Main.sln b/main/Main.sln index e5ac4a1e67..abdb532d34 100644 --- a/main/Main.sln +++ b/main/Main.sln @@ -168,7 +168,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSch", "contrib\NSch\NSch.c EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NGit", "contrib\NGit\NGit.csproj", "{E3BFF8B4-189C-496A-A817-7E8B31E22B91}"
EndProject
-Project("{9344bdbb-3e7f-41fc-a0dd-8665d75ee146}") = "po", "po\po.mdproj", "{AC7D119C-980B-4712-8811-5368C14412D7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Debugger.Soft", "contrib\Mono.Debugger.Soft\Mono.Debugger.Soft.csproj", "{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}"
+EndProject
+Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "po", "po\po.mdproj", "{AC7D119C-980B-4712-8811-5368C14412D7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{5D3F7E65-E55B-45CA-A83B-D1E10040281E}"
EndProject
@@ -335,6 +337,14 @@ Global {2C24D515-4A2C-445C-8419-C09231913CFA}.DebugWin32|x86.Build.0 = Debug|Any CPU
{2C24D515-4A2C-445C-8419-C09231913CFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2C24D515-4A2C-445C-8419-C09231913CFA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+ {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+ {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugWin32|x86.ActiveCfg = Debug|Any CPU
+ {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.DebugWin32|x86.Build.0 = Debug|Any CPU
+ {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {372E8E3E-29D5-4B4D-88A2-4711CD628C4E}.Release|Any CPU.Build.0 = Release|Any CPU
{376889B5-6504-46A1-9D18-A9E4B4A50F49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{376889B5-6504-46A1-9D18-A9E4B4A50F49}.Debug|Any CPU.Build.0 = Debug|Any CPU
{376889B5-6504-46A1-9D18-A9E4B4A50F49}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
@@ -825,6 +835,7 @@ Global {72944A6C-45FF-4EF8-B349-8C9CABF519D4} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
{A19E6F3F-A25B-4B01-8922-CF0CC35C781D} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
{E3BFF8B4-189C-496A-A817-7E8B31E22B91} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
+ {372E8E3E-29D5-4B4D-88A2-4711CD628C4E} = {F12939F1-D55A-4CE9-9F33-8D959BFC7D6C}
{BFE8691A-D323-4622-9021-7B8B27F81599} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}
{8A04FF99-5DFE-4E3D-A24F-72A621C8DDC6} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}
{D0B5AF2B-4BC1-4EB4-81D3-E5B85DDCE925} = {5D3F7E65-E55B-45CA-A83B-D1E10040281E}
diff --git a/main/configure.in b/main/configure.in index 54872b1a2b..ae79336d64 100644 --- a/main/configure.in +++ b/main/configure.in @@ -315,6 +315,7 @@ build/Makefile build/MacOSX/Makefile contrib/Makefile contrib/Mono.Cecil/Makefile +contrib/Mono.Debugger.Soft/Makefile contrib/NRefactory/Makefile contrib/Sharpen/Makefile contrib/NGit/Makefile diff --git a/main/contrib/Makefile.am b/main/contrib/Makefile.am index 4ca4d0eaf6..e7586f24cd 100644 --- a/main/contrib/Makefile.am +++ b/main/contrib/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = Mono.Cecil NRefactory Sharpen NSch NGit +SUBDIRS = Mono.Cecil Mono.Debugger.Soft NRefactory Sharpen NSch NGit EXTRA_DIST = $(srcdir)/extract_makefile_variable.sh diff --git a/main/contrib/Mono.Debugger.Soft/Makefile.am b/main/contrib/Mono.Debugger.Soft/Makefile.am new file mode 100644 index 0000000000..1e552085bf --- /dev/null +++ b/main/contrib/Mono.Debugger.Soft/Makefile.am @@ -0,0 +1,93 @@ + +ASSEMBLY = $(top_builddir)/build/Addins/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll + +REFS = \ + -r:System \ + -r:System.Core + +DEPS = ../../build/bin/Mono.Cecil.dll + +SIGNING_KEY=$(srcdir)/mono.snk + +FILES = \ + Mono.Debugger.Soft/AbsentInformationException.cs \ + Mono.Debugger.Soft/AppDomainCreateEvent.cs \ + Mono.Debugger.Soft/AppDomainMirror.cs \ + Mono.Debugger.Soft/AppDomainUnloadEvent.cs \ + Mono.Debugger.Soft/ArrayMirror.cs \ + Mono.Debugger.Soft/AssemblyLoadEvent.cs \ + Mono.Debugger.Soft/AssemblyMirror.cs \ + Mono.Debugger.Soft/AssemblyUnloadEvent.cs \ + Mono.Debugger.Soft/BreakpointEvent.cs \ + Mono.Debugger.Soft/BreakpointEventRequest.cs \ + Mono.Debugger.Soft/Connection.cs \ + Mono.Debugger.Soft/CustomAttributeDataMirror.cs \ + Mono.Debugger.Soft/CustomAttributeNamedArgumentMirror.cs \ + Mono.Debugger.Soft/CustomAttributeTypedArgumentMirror.cs \ + Mono.Debugger.Soft/DataConverter.cs \ + Mono.Debugger.Soft/EnumMirror.cs \ + Mono.Debugger.Soft/Event.cs \ + Mono.Debugger.Soft/EventQueueImpl.cs \ + Mono.Debugger.Soft/EventRequest.cs \ + Mono.Debugger.Soft/EventSet.cs \ + Mono.Debugger.Soft/EventType.cs \ + Mono.Debugger.Soft/ExceptionEvent.cs \ + Mono.Debugger.Soft/ExceptionEventRequest.cs \ + Mono.Debugger.Soft/FieldInfoMirror.cs \ + Mono.Debugger.Soft/IInvokeAsyncResult.cs \ + Mono.Debugger.Soft/ILInstruction.cs \ + Mono.Debugger.Soft/IMirror.cs \ + Mono.Debugger.Soft/InvalidStackFrameException.cs \ + Mono.Debugger.Soft/InvocationException.cs \ + Mono.Debugger.Soft/InvokeOptions.cs \ + Mono.Debugger.Soft/ITargetProcess.cs \ + Mono.Debugger.Soft/LocalVariable.cs \ + Mono.Debugger.Soft/Location.cs \ + Mono.Debugger.Soft/MethodBodyMirror.cs \ + Mono.Debugger.Soft/MethodEntryEvent.cs \ + Mono.Debugger.Soft/MethodEntryEventRequest.cs \ + Mono.Debugger.Soft/MethodExitEvent.cs \ + Mono.Debugger.Soft/MethodExitEventRequest.cs \ + Mono.Debugger.Soft/MethodMirror.cs \ + Mono.Debugger.Soft/Mirror.cs \ + Mono.Debugger.Soft/ModuleMirror.cs \ + Mono.Debugger.Soft/ObjectCollectedException.cs \ + Mono.Debugger.Soft/ObjectMirror.cs \ + Mono.Debugger.Soft/ParameterInfoMirror.cs \ + Mono.Debugger.Soft/PrimitiveValue.cs \ + Mono.Debugger.Soft/PropertyInfoMirror.cs \ + Mono.Debugger.Soft/StackFrame.cs \ + Mono.Debugger.Soft/StepEvent.cs \ + Mono.Debugger.Soft/StepEventRequest.cs \ + Mono.Debugger.Soft/StringMirror.cs \ + Mono.Debugger.Soft/StructMirror.cs \ + Mono.Debugger.Soft/SuspendPolicy.cs \ + Mono.Debugger.Soft/ThreadDeathEvent.cs \ + Mono.Debugger.Soft/ThreadMirror.cs \ + Mono.Debugger.Soft/ThreadStartEvent.cs \ + Mono.Debugger.Soft/TypeLoadEvent.cs \ + Mono.Debugger.Soft/TypeMirror.cs \ + Mono.Debugger.Soft/Value.cs \ + Mono.Debugger.Soft/VirtualMachine.cs \ + Mono.Debugger.Soft/VirtualMachineManager.cs \ + Mono.Debugger.Soft/VMDeathEvent.cs \ + Mono.Debugger.Soft/VMDisconnectedException.cs \ + Mono.Debugger.Soft/VMDisconnectEvent.cs \ + Mono.Debugger.Soft/VMMismatchException.cs \ + Mono.Debugger.Soft/VMStartEvent.cs + +all: $(ASSEMBLY) $(ASSEMBLY).mdb + +$(ASSEMBLY): $(build_sources) $(DEPS) + $(CSC) $(CSC_FLAGS) /keyfile:"$(SIGNING_KEY)" /define:MONO_DATACONVERTER_STATIC_METHODS /debug /unsafe /out:$@ /target:library $(REFS) $(build_deps) $(build_sources) + +$(ASSEMBLY).mdb: $(ASSEMBLY) + +assemblydir = $(MD_ASSEMBLY_DIR) +assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb + +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb + +EXTRA_DIST = $(FILES) $(SIGNING_KEY) mono-git-revision + +include $(top_srcdir)/Makefile.include diff --git a/main/contrib/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj b/main/contrib/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj new file mode 100644 index 0000000000..784af5c849 --- /dev/null +++ b/main/contrib/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj @@ -0,0 +1,135 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>9.0.21022</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{372E8E3E-29D5-4B4D-88A2-4711CD628C4E}</ProjectGuid> + <OutputType>Library</OutputType> + <RootNamespace>Mono.Debugger.Soft</RootNamespace> + <AssemblyName>Mono.Debugger.Soft</AssemblyName> + <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <SignAssembly>true</SignAssembly> + <AssemblyOriginatorKeyFile>mono.snk</AssemblyOriginatorKeyFile> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>..\..\build\AddIns\MonoDevelop.Debugger.Soft</OutputPath> + <DefineConstants>MONO_DATACONVERTER_STATIC_METHODS</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <ConsolePause>false</ConsolePause> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>none</DebugType> + <Optimize>false</Optimize> + <OutputPath>..\..\build\AddIns\MonoDevelop.Debugger.Soft</OutputPath> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <ConsolePause>false</ConsolePause> + <DefineConstants>MONO_DATACONVERTER_STATIC_METHODS</DefineConstants> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + </PropertyGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> + <ItemGroup> + <Compile Include="Mono.Debugger.Soft\AbsentInformationException.cs" /> + <Compile Include="Mono.Debugger.Soft\AppDomainCreateEvent.cs" /> + <Compile Include="Mono.Debugger.Soft\AppDomainMirror.cs" /> + <Compile Include="Mono.Debugger.Soft\AppDomainUnloadEvent.cs" /> + <Compile Include="Mono.Debugger.Soft\ArrayMirror.cs" /> + <Compile Include="Mono.Debugger.Soft\AssemblyLoadEvent.cs" /> + <Compile Include="Mono.Debugger.Soft\AssemblyMirror.cs" /> + <Compile Include="Mono.Debugger.Soft\AssemblyUnloadEvent.cs" /> + <Compile Include="Mono.Debugger.Soft\BreakpointEvent.cs" /> + <Compile Include="Mono.Debugger.Soft\BreakpointEventRequest.cs" /> + <Compile Include="Mono.Debugger.Soft\Connection.cs" /> + <Compile Include="Mono.Debugger.Soft\CustomAttributeDataMirror.cs" /> + <Compile Include="Mono.Debugger.Soft\CustomAttributeNamedArgumentMirror.cs" /> + <Compile Include="Mono.Debugger.Soft\CustomAttributeTypedArgumentMirror.cs" /> + <Compile Include="Mono.Debugger.Soft\DataConverter.cs" /> + <Compile Include="Mono.Debugger.Soft\EnumMirror.cs" /> + <Compile Include="Mono.Debugger.Soft\Event.cs" /> + <Compile Include="Mono.Debugger.Soft\EventQueueImpl.cs" /> + <Compile Include="Mono.Debugger.Soft\EventRequest.cs" /> + <Compile Include="Mono.Debugger.Soft\EventSet.cs" /> + <Compile Include="Mono.Debugger.Soft\EventType.cs" /> + <Compile Include="Mono.Debugger.Soft\ExceptionEvent.cs" /> + <Compile Include="Mono.Debugger.Soft\ExceptionEventRequest.cs" /> + <Compile Include="Mono.Debugger.Soft\FieldInfoMirror.cs" /> + <Compile Include="Mono.Debugger.Soft\IInvokeAsyncResult.cs" /> + <Compile Include="Mono.Debugger.Soft\ILInstruction.cs" /> + <Compile Include="Mono.Debugger.Soft\IMirror.cs" /> + <Compile Include="Mono.Debugger.Soft\InvalidStackFrameException.cs" /> + <Compile Include="Mono.Debugger.Soft\InvocationException.cs" /> + <Compile Include="Mono.Debugger.Soft\InvokeOptions.cs" /> + <Compile Include="Mono.Debugger.Soft\ITargetProcess.cs" /> + <Compile Include="Mono.Debugger.Soft\LocalVariable.cs" /> + <Compile Include="Mono.Debugger.Soft\Location.cs" /> + <Compile Include="Mono.Debugger.Soft\MethodBodyMirror.cs" /> + <Compile Include="Mono.Debugger.Soft\MethodEntryEvent.cs" /> + <Compile Include="Mono.Debugger.Soft\MethodEntryEventRequest.cs" /> + <Compile Include="Mono.Debugger.Soft\MethodExitEvent.cs" /> + <Compile Include="Mono.Debugger.Soft\MethodExitEventRequest.cs" /> + <Compile Include="Mono.Debugger.Soft\MethodMirror.cs" /> + <Compile Include="Mono.Debugger.Soft\Mirror.cs" /> + <Compile Include="Mono.Debugger.Soft\ModuleMirror.cs" /> + <Compile Include="Mono.Debugger.Soft\ObjectCollectedException.cs" /> + <Compile Include="Mono.Debugger.Soft\ObjectMirror.cs" /> + <Compile Include="Mono.Debugger.Soft\ParameterInfoMirror.cs" /> + <Compile Include="Mono.Debugger.Soft\PrimitiveValue.cs" /> + <Compile Include="Mono.Debugger.Soft\PropertyInfoMirror.cs" /> + <Compile Include="Mono.Debugger.Soft\StackFrame.cs" /> + <Compile Include="Mono.Debugger.Soft\StepEvent.cs" /> + <Compile Include="Mono.Debugger.Soft\StepEventRequest.cs" /> + <Compile Include="Mono.Debugger.Soft\StringMirror.cs" /> + <Compile Include="Mono.Debugger.Soft\StructMirror.cs" /> + <Compile Include="Mono.Debugger.Soft\SuspendPolicy.cs" /> + <Compile Include="Mono.Debugger.Soft\ThreadDeathEvent.cs" /> + <Compile Include="Mono.Debugger.Soft\ThreadMirror.cs" /> + <Compile Include="Mono.Debugger.Soft\ThreadStartEvent.cs" /> + <Compile Include="Mono.Debugger.Soft\TypeLoadEvent.cs" /> + <Compile Include="Mono.Debugger.Soft\TypeMirror.cs" /> + <Compile Include="Mono.Debugger.Soft\Value.cs" /> + <Compile Include="Mono.Debugger.Soft\VirtualMachine.cs" /> + <Compile Include="Mono.Debugger.Soft\VirtualMachineManager.cs" /> + <Compile Include="Mono.Debugger.Soft\VMDeathEvent.cs" /> + <Compile Include="Mono.Debugger.Soft\VMDisconnectedException.cs" /> + <Compile Include="Mono.Debugger.Soft\VMDisconnectEvent.cs" /> + <Compile Include="Mono.Debugger.Soft\VMMismatchException.cs" /> + <Compile Include="Mono.Debugger.Soft\VMStartEvent.cs" /> + </ItemGroup> + <ItemGroup> + <None Include="Mono.Debugger.Soft\ChangeLog" /> + <None Include="Makefile.am" /> + <None Include="mono-git-revision" /> + </ItemGroup> + <ItemGroup> + <Reference Include="System.Core" /> + <Reference Include="System" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\Mono.Cecil\Mono.Cecil.csproj"> + <Project>{3EC06433-F168-4C5B-A885-99CE4AB617E1}</Project> + <Name>Mono.Cecil</Name> + </ProjectReference> + </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>
\ No newline at end of file diff --git a/main/contrib/Mono.Debugger.Soft/mono.snk b/main/contrib/Mono.Debugger.Soft/mono.snk Binary files differnew file mode 100644 index 0000000000..380116c18f --- /dev/null +++ b/main/contrib/Mono.Debugger.Soft/mono.snk |