Author: mhutch
Date: 2007-09-26 17:18:06 -0400 (Wed, 26 Sep 2007)
New Revision: 86445
Modified:
branches/monodevelop/0.16/Extras/AspNetAddIn/ChangeLog
branches/monodevelop/0.16/Extras/AspNetAddIn/Project/AspNetAppProject.cs
Log:
* Project/AspNetAppProject.cs: Check for XSP before running it.
Modified: branches/monodevelop/0.16/Extras/AspNetAddIn/ChangeLog
===================================================================
--- branches/monodevelop/0.16/Extras/AspNetAddIn/ChangeLog 2007-09-26
21:06:34 UTC (rev 86444)
+++ branches/monodevelop/0.16/Extras/AspNetAddIn/ChangeLog 2007-09-26
21:18:06 UTC (rev 86445)
@@ -1,3 +1,7 @@
+2007-09-26 Michael Hutchinson <[EMAIL PROTECTED]>
+
+ * Project/AspNetAppProject.cs: Check for XSP before running it.
+
2007-09-21 Michael Hutchinson <[EMAIL PROTECTED]>
* Project/AspNetAppProject.cs: Make write-safe by using TextFile API
rather
Modified:
branches/monodevelop/0.16/Extras/AspNetAddIn/Project/AspNetAppProject.cs
===================================================================
--- branches/monodevelop/0.16/Extras/AspNetAddIn/Project/AspNetAppProject.cs
2007-09-26 21:06:34 UTC (rev 86444)
+++ branches/monodevelop/0.16/Extras/AspNetAddIn/Project/AspNetAppProject.cs
2007-09-26 21:18:06 UTC (rev 86445)
@@ -174,6 +174,17 @@
#region build/prebuild/execute
+ static bool CheckXsp (string command)
+ {
+ try {
+ ProcessWrapper p =
Runtime.ProcessService.StartProcess (command, "--version", null, null);
+ p.WaitForOutput ();
+ return true;
+ } catch {
+ return false;
+ }
+ }
+
IProcessAsyncOperation StartXsp (IProgressMonitor monitor,
ExecutionContext context, IConsole console)
{
AspNetAppProjectConfiguration configuration =
(AspNetAppProjectConfiguration) ActiveConfiguration;
@@ -203,6 +214,14 @@
protected override void DoExecute (IProgressMonitor monitor,
ExecutionContext context)
{
+ //check XSP is available
+ ClrVersion clrVersion =
((AspNetAppProjectConfiguration) ActiveConfiguration).ClrVersion;
+ string xspVersion = (clrVersion == ClrVersion.Net_1_1)?
"xsp" : "xsp2";
+ if (!CheckXsp (xspVersion)) {
+ monitor.ReportError (string.Format ("The
\"{0}\" web server cannot be started. Please ensure that it is
installed.",xspVersion), null);
+ return;
+ }
+
CopyReferencesToOutputPath (true);
IConsole console = null;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches