diff options
author | Lluis Sanchez <lluis@novell.com> | 2009-11-12 18:25:46 +0300 |
---|---|---|
committer | Lluis Sanchez <lluis@novell.com> | 2009-11-12 18:25:46 +0300 |
commit | 59a5b306daa99121079098431cdd7ea0b1f774d8 (patch) | |
tree | e0993066b3430e0500cca39d9fa3b373ee03f0e0 | |
parent | 392b71542b1369b68b3f561d94af14671ca94cf7 (diff) |
2009-11-12 Lluis Sanchez Gual <lluis@novell.com>
* GdbEvent.cs: Reason can be an array. Handle this case.
* MonoDevelop.Debugger.csproj: Flush.
* GdbSession.cs: If there is an error while initializing,
report that the process has exited.
svn path=/branches/monodevelop/extras/MonoDevelop.Debugger.Gdb/2.2/; revision=146042
-rw-r--r-- | extras/MonoDevelop.Debugger.Gdb/ChangeLog | 9 | ||||
-rw-r--r-- | extras/MonoDevelop.Debugger.Gdb/GdbEvent.cs | 4 | ||||
-rw-r--r-- | extras/MonoDevelop.Debugger.Gdb/GdbSession.cs | 8 | ||||
-rw-r--r-- | extras/MonoDevelop.Debugger.Gdb/MonoDevelop.Debugger.csproj | 5 |
4 files changed, 23 insertions, 3 deletions
diff --git a/extras/MonoDevelop.Debugger.Gdb/ChangeLog b/extras/MonoDevelop.Debugger.Gdb/ChangeLog index e314b4ed8e..c854a27501 100644 --- a/extras/MonoDevelop.Debugger.Gdb/ChangeLog +++ b/extras/MonoDevelop.Debugger.Gdb/ChangeLog @@ -1,3 +1,12 @@ +2009-11-12 Lluis Sanchez Gual <lluis@novell.com> + + * GdbEvent.cs: Reason can be an array. Handle this case. + + * MonoDevelop.Debugger.csproj: Flush. + + * GdbSession.cs: If there is an error while initializing, + report that the process has exited. + 2009-10-30 Lluis Sanchez Gual <lluis@novell.com> * configure: diff --git a/extras/MonoDevelop.Debugger.Gdb/GdbEvent.cs b/extras/MonoDevelop.Debugger.Gdb/GdbEvent.cs index 7225bb3e25..cf631cfb70 100644 --- a/extras/MonoDevelop.Debugger.Gdb/GdbEvent.cs +++ b/extras/MonoDevelop.Debugger.Gdb/GdbEvent.cs @@ -41,7 +41,9 @@ namespace MonoDevelop.Debugger.Gdb i = line.Length; Name = line.Substring (1, i - 1); ReadResults (line, i+1); - Reason = GetValue ("reason"); + object[] reasons = GetAllValues ("reason"); + if (reasons.Length > 0) + Reason = (string) reasons [0]; } } } diff --git a/extras/MonoDevelop.Debugger.Gdb/GdbSession.cs b/extras/MonoDevelop.Debugger.Gdb/GdbSession.cs index 833f44587a..c19910fb03 100644 --- a/extras/MonoDevelop.Debugger.Gdb/GdbSession.cs +++ b/extras/MonoDevelop.Debugger.Gdb/GdbSession.cs @@ -109,7 +109,13 @@ namespace MonoDevelop.Debugger.Gdb // Initialize the terminal RunCommand ("-inferior-tty-set", Escape (tty)); - RunCommand ("-file-exec-and-symbols", Escape (startInfo.Command)); + + try { + RunCommand ("-file-exec-and-symbols", Escape (startInfo.Command)); + } catch { + FireTargetEvent (TargetEventType.TargetExited, null); + throw; + } RunCommand ("-environment-directory", Escape (startInfo.WorkingDirectory)); diff --git a/extras/MonoDevelop.Debugger.Gdb/MonoDevelop.Debugger.csproj b/extras/MonoDevelop.Debugger.Gdb/MonoDevelop.Debugger.csproj index cc562008fd..afb80767d2 100644 --- a/extras/MonoDevelop.Debugger.Gdb/MonoDevelop.Debugger.csproj +++ b/extras/MonoDevelop.Debugger.Gdb/MonoDevelop.Debugger.csproj @@ -9,6 +9,7 @@ <OutputType>Library</OutputType> <AssemblyName>MonoDevelop.Debugger.Gdb</AssemblyName> <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <RootNamespace>MonoDevelop.Debugger</RootNamespace> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -133,7 +134,9 @@ <Compile Include="GdbCommandResult.cs" /> </ItemGroup> <ItemGroup> - <EmbeddedResource Include="Manifest.addin.xml" /> + <EmbeddedResource Include="Manifest.addin.xml"> + <LogicalName>Manifest.addin.xml</LogicalName> + </EmbeddedResource> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ProjectExtensions> |