Author: mhutch
Date: 2007-12-31 13:28:15 -0500 (Mon, 31 Dec 2007)
New Revision: 92068
Modified:
trunk/monodevelop/main/src/addins/VBNetBinding/ChangeLog
trunk/monodevelop/main/src/addins/VBNetBinding/Makefile.am
trunk/monodevelop/main/src/addins/VBNetBinding/VBBindingCompilerServices.cs
trunk/monodevelop/main/src/addins/VBNetBinding/VBLanguageBinding.cs
Log:
* VBBindingCompilerServices.cs: Use WaitForOutput instead of
WaitForExit to make sure we get all of the output, or the
output-collecting thread can sometimes try to write to the
StringWriter after it's disposed, and crash the IDE. Also tidy up
code.
* Makefile.am: Updated.
* VBLanguageBinding.cs: We don't support the 1.1 profile for VB, so
remove it.
Modified: trunk/monodevelop/main/src/addins/VBNetBinding/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/VBNetBinding/ChangeLog 2007-12-31
16:40:40 UTC (rev 92067)
+++ trunk/monodevelop/main/src/addins/VBNetBinding/ChangeLog 2007-12-31
18:28:15 UTC (rev 92068)
@@ -1,3 +1,13 @@
+2007-12-31 Michael Hutchinson <[EMAIL PROTECTED]>
+
+ * VBBindingCompilerServices.cs: Use WaitForOutput instead of
WaitForExit to
+ make sure we get all of the output, or the output-collecting thread
can
+ sometimes try to write to the StringWriter after it's disposed, and
+ crash the IDE. Also tidy up code.
+ * Makefile.am: Updated.
+ * VBLanguageBinding.cs: We don't support the 1.1 profile for VB, so
remove
+ it.
+
2007-12-26 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
* VBNetBinding.addin.xml: Remove Gtk# 1.0 template. Add the
Modified: trunk/monodevelop/main/src/addins/VBNetBinding/Makefile.am
===================================================================
--- trunk/monodevelop/main/src/addins/VBNetBinding/Makefile.am 2007-12-31
16:40:40 UTC (rev 92067)
+++ trunk/monodevelop/main/src/addins/VBNetBinding/Makefile.am 2007-12-31
18:28:15 UTC (rev 92068)
@@ -6,12 +6,12 @@
$(GLADE_SHARP_LIBS) \
$(GTK_SHARP_LIBS) \
$(MONO_ADDINS_LIBS) \
- -r:$(top_srcdir)/build/bin/MonoDevelop.Components.dll \
- -r:$(top_srcdir)/build/bin/MonoDevelop.Core.dll \
- -r:$(top_srcdir)/build/bin/MonoDevelop.Core.Gui.dll \
- -r:$(top_srcdir)/build/bin/MonoDevelop.Ide.dll \
- -r:$(top_srcdir)/build/bin/MonoDevelop.Projects.dll \
- -r:$(top_srcdir)/build/bin/NRefactory.dll \
+ -r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \
+ -r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
+ -r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
+ -r:$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
+ -r:$(top_builddir)/build/bin/MonoDevelop.Projects.dll \
+ -r:$(top_builddir)/build/bin/NRefactory.dll \
-r:System \
-r:System.Drawing \
-r:System.Xml
Modified:
trunk/monodevelop/main/src/addins/VBNetBinding/VBBindingCompilerServices.cs
===================================================================
--- trunk/monodevelop/main/src/addins/VBNetBinding/VBBindingCompilerServices.cs
2007-12-31 16:40:40 UTC (rev 92067)
+++ trunk/monodevelop/main/src/addins/VBNetBinding/VBBindingCompilerServices.cs
2007-12-31 18:28:15 UTC (rev 92068)
@@ -293,26 +293,18 @@
return error;
}
- private int DoCompilation(string outstr, TempFileCollection tf,
string working_dir, ref string output) {
- StringWriter outwr = null, errwr = null;
-
+ private int DoCompilation (string outstr, TempFileCollection
tf, string working_dir, ref string output)
+ {
+ StringWriter outwr = new StringWriter ();
+ string[] tokens = outstr.Split (' ');
try {
- outwr = new StringWriter ();
-
- string[] tokens = outstr.Split(' ');
-
- outstr = outstr.Substring(tokens[0].Length+1);
-
- ProcessService ps = (ProcessService)
ServiceManager.GetService (typeof(ProcessService));
- ProcessWrapper pw = ps.StartProcess(tokens[0],
"\"" + outstr + "\"", working_dir, outwr, outwr, delegate{});
- pw.WaitForExit ();
-
+ outstr = outstr.Substring (tokens[0].Length+1);
+ ProcessWrapper pw =
Runtime.ProcessService.StartProcess (tokens[0], "\"" + outstr + "\"",
working_dir, outwr, outwr, null);
+ pw.WaitForOutput ();
output = outwr.ToString ();
return pw.ExitCode;
} finally {
- if (errwr != null)
- errwr.Dispose ();
if (outwr != null)
outwr.Dispose ();
}
Modified: trunk/monodevelop/main/src/addins/VBNetBinding/VBLanguageBinding.cs
===================================================================
--- trunk/monodevelop/main/src/addins/VBNetBinding/VBLanguageBinding.cs
2007-12-31 16:40:40 UTC (rev 92067)
+++ trunk/monodevelop/main/src/addins/VBNetBinding/VBLanguageBinding.cs
2007-12-31 18:28:15 UTC (rev 92068)
@@ -92,7 +92,7 @@
public ClrVersion[] GetSupportedClrVersions ()
{
- return new ClrVersion[] { ClrVersion.Net_1_1,
ClrVersion.Net_2_0 };
+ return new ClrVersion[] { ClrVersion.Net_2_0 };
}
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
