rendered paste bodyIndex: SimiasApp/Makefile.am
===================================================================
--- SimiasApp/Makefile.am (revision 6590)
+++ SimiasApp/Makefile.am (working copy)
@@ -7,7 +7,7 @@
SYSTEM_INSTALLER_LIB =
endif
-MONO_WEBSERVER_PATH = ../../external/Mono.WebServer
+MONO_WEBSERVER_PATH = ../../../external/Mono.WebServer
Simias_CSFILES = $(srcdir)/AssemblyInfo.cs \
$(srcdir)/Simias.cs \
Index: SimiasApp/Simias.cs
===================================================================
--- SimiasApp/Simias.cs (revision 6590)
+++ SimiasApp/Simias.cs (working copy)
@@ -1106,7 +1106,6 @@
{
Console.Error.WriteLine( "Ping exception: {0}", ex.Message );
}
- pingStatus = true;
}
return pingStatus;
@@ -1657,7 +1656,7 @@
MyEnvironment.DotNet ? String.Empty : ApplicationPath + " ",
port,
ipcPort,
- runAsServer ? "--runasserver" : "--runasclient ",
+ runAsServer ? "--runasserver " : "--runasclient ",
simiasDataPath,
verbose ? " --verbose" : String.Empty,
( altAppPath != null ) ? " --addpath " + altAppPath : String.Empty );
@@ -1759,8 +1758,8 @@
string cmdLine =
ub.Port.ToString() +
":/simias10:" +
- rootPath +
- Path.DirectorySeparatorChar.ToString() +
+ rootPath +
+ (rootPath.Length != 0 ? Path.DirectorySeparatorChar.ToString() : "") +
"web";
if ( verbose == true )
Index: SimiasClient/LocalService.cs
===================================================================
--- SimiasClient/LocalService.cs (revision 6590)
+++ SimiasClient/LocalService.cs (working copy)
@@ -123,7 +123,7 @@
webService.PingSimias();
}
catch
- {
+ {
pingSuccessful = false;
}