Merge pull request #3739 from Mailaender/legacy-mono-eos

Dropped support for ancient Mono versions
This commit is contained in:
Chris Forbes
2013-08-29 13:29:50 -07:00
5 changed files with 9 additions and 16 deletions

View File

@@ -1,4 +1,4 @@
Copyright 2007-2011 The OpenRA Developers (see AUTHORS) Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
This file is part of OpenRA, which is free software. It is made This file is part of OpenRA, which is free software. It is made
available to you under the terms of the GNU General Public License available to you under the terms of the GNU General Public License
as published by the Free Software Foundation. For more information, as published by the Free Software Foundation. For more information,
@@ -29,8 +29,8 @@ Run the game with `OpenRA.Game.exe Game.Mods=ra` for Red Alert
or `OpenRA.Game.exe Game.Mods=cnc` for Command & Conquer or `OpenRA.Game.exe Game.Mods=cnc` for Command & Conquer
UBUNTU (substitute comparable packages for other linux distros): UBUNTU (substitute comparable packages for other Linux distros):
* mono-runtime (>= 2.6.7), * mono-runtime (>= 2.10)
* mono-gmcs * mono-gmcs
* freetype * freetype
* libmono-corlib1.0-cil * libmono-corlib1.0-cil
@@ -39,8 +39,6 @@ UBUNTU (substitute comparable packages for other linux distros):
* libsdl1.2-dev * libsdl1.2-dev
* nvidia-cg-toolkit (for Cg renderer) * nvidia-cg-toolkit (for Cg renderer)
OpenRA does not work with some older versions of Compiz. On affected systems, disable desktop effects before playing. This is fixed in Ubuntu Natty and later.
The following dlls can also be installed into your system GAC. This is not The following dlls can also be installed into your system GAC. This is not
recommended because we ship a custom Tao.FreeType that can conflict with recommended because we ship a custom Tao.FreeType that can conflict with
other applications that use Tao: other applications that use Tao:

View File

@@ -441,14 +441,11 @@ namespace OpenRA
var settings = new ServerSettings() var settings = new ServerSettings()
{ {
Name = "Skirmish Game", Name = "Skirmish Game",
Map = map Map = map,
AdvertiseOnline = false,
AllowPortForward = false
}; };
// Work around a miscompile in mono 2.6.7:
// booleans that default to true cannot be set false by an initializer
settings.AdvertiseOnline = false;
settings.AllowPortForward = false;
server = new Server.Server(new IPEndPoint(IPAddress.Loopback, 0), server = new Server.Server(new IPEndPoint(IPAddress.Loopback, 0),
Game.Settings.Game.Mods, settings, modData); Game.Settings.Game.Mods, settings, modData);

View File

@@ -28,7 +28,7 @@ extern char **environ;
defaultButton:@"Download Mono" defaultButton:@"Download Mono"
alternateButton:@"Quit" alternateButton:@"Quit"
otherButton:nil otherButton:nil
informativeTextWithFormat:@"OpenRA requires the Mono Framework version 2.6.7 or later."]; informativeTextWithFormat:@"OpenRA requires the Mono Framework version 2.10 or later."];
if ([alert runModal] == NSAlertDefaultReturn) if ([alert runModal] == NSAlertDefaultReturn)
[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.go-mono.com/mono-downloads/download.html"]]; [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.go-mono.com/mono-downloads/download.html"]];
@@ -153,9 +153,7 @@ extern char **environ;
sscanf([ret UTF8String], "Mono JIT compiler version %d.%d.%d", &major, &minor, &point); sscanf([ret UTF8String], "Mono JIT compiler version %d.%d.%d", &major, &minor, &point);
[ret release]; [ret release];
return (major > 2 || return (major > 2 || (major == 2 && minor >= 10));
(major == 2 && minor > 6) ||
(major == 2 && minor == 6 && point >= 7));
} }
- (void)dealloc - (void)dealloc

View File

@@ -3,7 +3,7 @@ Version: {VERSION}
Architecture: all Architecture: all
Maintainer: Chris Forbes <chrisf@ijw.co.nz> Maintainer: Chris Forbes <chrisf@ijw.co.nz>
Installed-Size: {SIZE} Installed-Size: {SIZE}
Depends: libopenal1, mono-runtime (>= 2.6.7), libmono-winforms2.0-cil, libfreetype6, libsdl1.2debian, libgl1-mesa-glx, libgl1-mesa-dri, libmono-i18n2.0-cil Depends: libopenal1, mono-runtime (>= 2.10), libmono-winforms2.0-cil, libfreetype6, libsdl1.2debian, libgl1-mesa-glx, libgl1-mesa-dri, libmono-i18n2.0-cil
Section: games Section: games
Priority: extra Priority: extra
Homepage: http://www.open-ra.org/ Homepage: http://www.open-ra.org/