Move Platform.cs to OpenRA.FileFormats, fix #765.

OpenRA.Game/Game.cs

@@ -45,7 +45,7 @@ namespace OpenRA
 
 		public static Renderer Renderer;
 		public static bool HasInputFocus = false;
-		
+
 		public static void MoveViewport(float2 loc)
 		{
 			viewport.Center(loc);
@@ -54,7 +54,7 @@ namespace OpenRA
 		public static void JoinServer(string host, int port)
 		{
 			var replayFilename = ChooseReplayFilename();
-			string path = Path.Combine( Game.SupportDir, "Replays" );
+			string path = Path.Combine( Platform.SupportDir, "Replays" );
 			if( !Directory.Exists( path ) ) Directory.CreateDirectory( path );
 			var replayFile = File.Create( Path.Combine( path, replayFilename ) );
 
@@ -223,18 +223,12 @@ namespace OpenRA
 
 			AppDomain.CurrentDomain.AssemblyResolve += FileSystem.ResolveAssembly;
 
-			var defaultSupport = Environment.GetFolderPath(Environment.SpecialFolder.Personal)
-												+ Path.DirectorySeparatorChar + "OpenRA";
-
-			SupportDir = args.GetValue("SupportDir", defaultSupport);
-			FileSystem.SupportDir = SupportDir;
-			
 			Utilities = new Utilities(args.GetValue("UtilityPath", "OpenRA.Utility.exe"));
 			
-			Settings = new Settings(SupportDir + "settings.yaml", args);
+			Settings = new Settings(Platform.SupportDir + "settings.yaml", args);
 			Settings.Save();
 
-			Log.LogPath = SupportDir + "Logs" + Path.DirectorySeparatorChar;
+			Log.LogPath = Platform.SupportDir + "Logs" + Path.DirectorySeparatorChar;
 			Log.AddChannel("perf", "perf.log");
 			Log.AddChannel("debug", "debug.log");
 			Log.AddChannel("sync", "syncreport.log");
@@ -340,25 +334,6 @@ namespace OpenRA
 			Widget.OpenWindow("MAINMENU_BG");
 		}
 
-		static string baseSupportDir = null;
-		public static string SupportDir
-		{
-			set
-			{
-				var dir = value;
-
-				// Expand paths relative to the personal directory
-				if (dir.ElementAt(0) == '~')
-					dir = Environment.GetFolderPath(Environment.SpecialFolder.Personal) + dir.Substring(1);
-
-				if (!Directory.Exists(dir))
-					Directory.CreateDirectory(dir);
-
-				baseSupportDir = dir + Path.DirectorySeparatorChar;
-			}
-			get { return baseSupportDir; }
-		}
-
 		public static T CreateObject<T>( string name )
 		{
 			return modData.ObjectCreator.CreateObject<T>( name );

OpenRA.Game/ModData.cs

@@ -102,7 +102,7 @@ namespace OpenRA
 		Dictionary<string, Map> FindMaps(string[] mods)
 		{
             var paths = mods.SelectMany(p => FindMapsIn("mods{0}{1}{0}maps{0}".F(Path.DirectorySeparatorChar, p)))
-				.Concat(mods.SelectMany(p => FindMapsIn("{1}maps{0}{2}{0}".F(Path.DirectorySeparatorChar, Game.SupportDir, p))));
+				.Concat(mods.SelectMany(p => FindMapsIn("{1}maps{0}{2}{0}".F(Path.DirectorySeparatorChar, Platform.SupportDir, p))));
 			
 			Dictionary<string, Map> ret = new Dictionary<string, Map>();
 			foreach (var path in paths)

OpenRA.Game/OpenRA.Game.csproj

@@ -199,7 +199,6 @@
     <Compile Include="Network\Session.cs" />
     <Compile Include="ObjectCreator.cs" />
     <Compile Include="Network\SyncReport.cs" />
-    <Compile Include="Platform.cs" />
     <Compile Include="Traits\EditorAppearance.cs" />
     <Compile Include="Traits\SubcellInit.cs" />
     <Compile Include="Traits\Target.cs" />

OpenRA.Game/Platform.cs

@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Diagnostics;
-using OpenRA.FileFormats;
-
-namespace OpenRA
-{
-	enum PlatformType
-	{
-		Unknown,
-		Windows,
-		OSX,
-		Linux
-	}
-
-	static class Platform
-	{
-		public static PlatformType CurrentPlatform
-		{
-			get
-			{
-				return currentPlatform.Value;
-			}
-		}
-
-		static Lazy<PlatformType> currentPlatform = new Lazy<PlatformType>(GetCurrentPlatform);
-		
-		static PlatformType GetCurrentPlatform()
-		{
-				if (Environment.OSVersion.Platform == PlatformID.Win32NT) return PlatformType.Windows;
-				
-				try
-				{
-					var psi = new ProcessStartInfo("uname", "-s");
-					psi.UseShellExecute = false;
-					psi.RedirectStandardOutput = true;
-					var p = Process.Start(psi);
-					var kernelName = p.StandardOutput.ReadToEnd();
-					if (kernelName.Contains("Linux") || kernelName.Contains("BSD"))
-						return PlatformType.Linux;
-					if (kernelName.Contains("Darwin"))
-						return PlatformType.OSX;
-				}
-				catch {	}
-				
-				return PlatformType.Unknown;
-		}
-	}
-}

OpenRA.Game/Utilities.cs

@@ -34,7 +34,7 @@ namespace OpenRA
 			{
 				Process p = new Process();
 				p.StartInfo.FileName = Utility;
-				p.StartInfo.Arguments = "{0} --SupportDir \"{1}\"".F(args, Game.SupportDir);
+				p.StartInfo.Arguments = args;
 				p.StartInfo.UseShellExecute = false;
 				p.StartInfo.RedirectStandardOutput = true;
 				p.EnableRaisingEvents = true;