epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove VERSION file, and version / motd display from the ingame menu. Write git-version into the individual mod versions.

Browse Source
This commit is contained in:
Paul Chote
2010-12-23 11:22:05 +13:00
parent 275dfc43be
commit dc3bf2515a
8 changed files with 15 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
OpenRA.Game/Server/MasterServerQuery.cs
View File

@@ -51,36 +51,6 @@ namespace OpenRA.Server
}).Start(); }).Start();
} }
public static void GetMOTD(string masterServerUrl)
{
var motd = Widget.RootWidget.GetWidget<ScrollingTextWidget>("MOTD_SCROLLER");
// Runs in a separate thread to prevent dns lookup hitches
new Thread(() =>
{
if (motd != null)
{
try
{
string motdText = GetData(new Uri(masterServerUrl + "motd.php?v=" + ClientVersion));
string[] p = motdText.Split('|');
if (p.Length == 2 && p[1].Length == int.Parse(p[0]))
{
motd.SetText(p[1]);
motd.ResetScroll();
}
}
catch
{
motd.SetText("Welcome to OpenRA. MOTD unable to be loaded from server.");
motd.ResetScroll();
}
}
ev.Set();
}).Start();
}
public static void Tick() public static void Tick()
{ {
if (ev.WaitOne(TimeSpan.FromMilliseconds(0))) if (ev.WaitOne(TimeSpan.FromMilliseconds(0)))
@@ -95,23 +65,6 @@ namespace OpenRA.Server
var data = wc.DownloadData(uri); var data = wc.DownloadData(uri);
return Encoding.UTF8.GetString(data); return Encoding.UTF8.GetString(data);
} }
public static void GetCurrentVersion(string masterServerUrl)
{
new Thread(() =>
{
try
{
ServerVersion = GetData(new Uri(masterServerUrl + "VERSION"));
}
catch
{
ServerVersion = "";
}
ev2.Set();
}).Start();
}
} }
public class GameServer public class GameServer

24
OpenRA.Mods.RA/Widgets/Delegates/MainMenuButtonsDelegate.cs
View File

@@ -31,30 +31,6 @@ namespace OpenRA.Mods.RA.Widgets.Delegates
widget.GetWidget("MAINMENU_BUTTON_REPLAY_VIEWER").OnMouseUp = mi => { Widget.OpenWindow("REPLAYBROWSER_BG"); return true; }; widget.GetWidget("MAINMENU_BUTTON_REPLAY_VIEWER").OnMouseUp = mi => { Widget.OpenWindow("REPLAYBROWSER_BG"); return true; };
widget.GetWidget("MAINMENU_BUTTON_QUIT").OnMouseUp = mi => { Game.Exit(); return true; }; widget.GetWidget("MAINMENU_BUTTON_QUIT").OnMouseUp = mi => { Game.Exit(); return true; };
var version = widget.GetWidget<LabelWidget>("VERSION_STRING");
if (FileSystem.Exists("VERSION"))
{
var s = FileSystem.Open("VERSION");
var versionFileContent = s.ReadAllText();
version.Text = versionFileContent;
s.Close();
MasterServerQuery.OnVersion += v =>
{
if (!string.IsNullOrEmpty(v))
version.Text = versionFileContent + "\nLatest: " + v;
};
MasterServerQuery.GetCurrentVersion(Game.Settings.Server.MasterServer);
}
else
{
version.Text = "Dev Build";
}
MasterServerQuery.ClientVersion = version.Text;
MasterServerQuery.GetMOTD(Game.Settings.Server.MasterServer);
if (FirstInit) if (FirstInit)
{ {
FirstInit = false; FirstInit = false;

42
mods/cnc/chrome/mainmenu.yaml
View File

@@ -6,39 +6,6 @@ Background@MAINMENU_BG:
Height:330 Height:330
Delegate:MainMenuButtonsDelegate Delegate:MainMenuButtonsDelegate
Children: Children:
Background@MOTD_BG:
Id:MOTD_BG
X:0 - PARENT_LEFT + WINDOW_RIGHT/3
Y:0 - PARENT_TOP + 44
Width:WINDOW_RIGHT/3
Height:30
Background:dialog4
Children:
ScrollingText@MOTD_SCROLLER:
Id:MOTD_SCROLLER
X:15
Y:2
Width:PARENT_RIGHT - 30
Height:25
ScrollRate:8
Text:Welcome to OpenRA. Enjoy your stay.
Background@MOTD_LABEL_BG
Id:MOTD_LABEL_BG
X:0 - PARENT_LEFT + (WINDOW_RIGHT/16)*7
Y:0 - PARENT_TOP + 15
Width:(WINDOW_RIGHT/16)*2
Height:30
Background:dialog4
Children:
Label@MOTD_LABEL
Id:MOTD_LABEL
X:0
Y:2
Width:(WINDOW_RIGHT/16)*2
Height:25
Text:Message of the Day
Align:Center
Bold:True
Label@MAINMENU_LABEL_TITLE: Label@MAINMENU_LABEL_TITLE:
Id:MAINMENU_LABEL_TITLE Id:MAINMENU_LABEL_TITLE
X:0 X:0
@@ -105,15 +72,6 @@ Background@MAINMENU_BG:
Height:25 Height:25
Text:Video Player Text:Video Player
Bold:True Bold:True
Label@VERSION_STRING:
Id:VERSION_STRING
X:WINDOW_RIGHT - PARENT_LEFT - WIDTH - 15
Y:WINDOW_BOTTOM - PARENT_TOP - 65
Width:400
Height:70
Text:
Align:Right
Bold:True
Background@PERF_BG: Background@PERF_BG:
ClickThrough:true ClickThrough:true
Id:PERF_BG Id:PERF_BG

2
mods/cnc/mod.yaml
View File

@@ -1,7 +1,7 @@
Metadata: Metadata:
Title: C&C Title: C&C
Description: OpenRA Reimagining of the classic game Description: OpenRA Reimagining of the classic game
Version: a0001 Version: {DEV_VERSION}
Author: The OpenRA Developers Author: The OpenRA Developers
Standalone: true Standalone: true
Folders: Folders:

42
mods/ra/chrome/mainmenu.yaml
View File

@@ -6,39 +6,6 @@ Background@MAINMENU_BG:
Height:330 Height:330
Delegate:MainMenuButtonsDelegate Delegate:MainMenuButtonsDelegate
Children: Children:
Background@MOTD_BG:
Id:MOTD_BG
X:0 - PARENT_LEFT + WINDOW_RIGHT/3
Y:0 - PARENT_TOP + 44
Width:WINDOW_RIGHT/3
Height:30
Background:dialog4
Children:
ScrollingText@MOTD_SCROLLER:
Id:MOTD_SCROLLER
X:15
Y:2
Width:PARENT_RIGHT - 30
Height:25
ScrollRate:8
Text:Welcome to OpenRA. Enjoy your stay.
Background@MOTD_LABEL_BG
Id:MOTD_LABEL_BG
X:0 - PARENT_LEFT + (WINDOW_RIGHT/16)*7
Y:0 - PARENT_TOP + 15
Width:(WINDOW_RIGHT/16)*2
Height:30
Background:dialog4
Children:
Label@MOTD_LABEL
Id:MOTD_LABEL
X:0
Y:2
Width:(WINDOW_RIGHT/16)*2
Height:25
Text:Message of the Day
Align:Center
Bold:True
Label@MAINMENU_LABEL_TITLE: Label@MAINMENU_LABEL_TITLE:
Id:MAINMENU_LABEL_TITLE Id:MAINMENU_LABEL_TITLE
X:0 X:0
@@ -105,15 +72,6 @@ Background@MAINMENU_BG:
Height:25 Height:25
Text:Video Player Text:Video Player
Bold:True Bold:True
Label@VERSION_STRING:
Id:VERSION_STRING
X:WINDOW_RIGHT - PARENT_LEFT - WIDTH - 15
Y:WINDOW_BOTTOM - PARENT_TOP - 65
Width:400
Height:70
Text:
Align:Right
Bold:True
Background@PERF_BG: Background@PERF_BG:
ClickThrough:true ClickThrough:true
Id:PERF_BG Id:PERF_BG

2
mods/ra/mod.yaml
View File

@@ -1,7 +1,7 @@
Metadata: Metadata:
Title: Red Alert Title: Red Alert
Description: OpenRA Reimagining of the classic game Description: OpenRA Reimagining of the classic game
Version: a0001 Version: {DEV_VERSION}
Author: The OpenRA Developers Author: The OpenRA Developers
Standalone: true Standalone: true

8
packaging/package-all.sh
View File

@@ -18,7 +18,6 @@ OUTPUTDIR=$(readlink -f $2)
cd "$SRCDIR" cd "$SRCDIR"
mkdir packaging/built mkdir packaging/built
mkdir packaging/built/mods mkdir packaging/built/mods
echo $1 > VERSION
make package make package
# Remove the mdb files that are created during `make` # Remove the mdb files that are created during `make`
@@ -29,7 +28,7 @@ find . -path "*.mdb" -delete
# they are now installed to the game directory instead of placed in the gac # they are now installed to the game directory instead of placed in the gac
FILES="OpenRA.Launcher.exe OpenRA.Game.exe OpenRA.Editor.exe OpenRA.Utility.exe OpenRA.Renderer.Cg.dll \ FILES="OpenRA.Launcher.exe OpenRA.Game.exe OpenRA.Editor.exe OpenRA.Utility.exe OpenRA.Renderer.Cg.dll \
OpenRA.Renderer.Gl.dll OpenRA.Renderer.Null.dll OpenRA.FileFormats.dll FreeSans.ttf FreeSansBold.ttf titles.ttf \ OpenRA.Renderer.Gl.dll OpenRA.Renderer.Null.dll OpenRA.FileFormats.dll FreeSans.ttf FreeSansBold.ttf titles.ttf \
cg glsl mods/ra mods/cnc VERSION COPYING HACKING INSTALL" cg glsl mods/ra mods/cnc COPYING HACKING INSTALL"
echo "Copying files..." echo "Copying files..."
for i in $FILES; do for i in $FILES; do
@@ -45,6 +44,11 @@ cp thirdparty/ICSharpCode.SharpZipLib.dll packaging/built
# Copy game icon for windows package # Copy game icon for windows package
cp OpenRA.Game/OpenRA.ico packaging/built cp OpenRA.Game/OpenRA.ico packaging/built
# Update mod versions
sed -i "" "s/{DEV_VERSION}/$VERSION/" ./packaging/built/mods/ra/mod.yaml
sed -i "" "s/{DEV_VERSION}/$VERSION/" ./packaging/built/mods/cnc/mod.yaml
# #
# Change into packaging directory and run the # Change into packaging directory and run the
# platform-dependant packaging in parallel # platform-dependant packaging in parallel

2
packaging/windows/OpenRA.nsi
View File

@@ -87,7 +87,6 @@ Section "Client" Client
File "${SRCDIR}\HACKING" File "${SRCDIR}\HACKING"
File "${SRCDIR}\INSTALL" File "${SRCDIR}\INSTALL"
File "${SRCDIR}\*.ttf" File "${SRCDIR}\*.ttf"
File "${SRCDIR}\VERSION"
File "${SRCDIR}\OpenRA.ico" File "${SRCDIR}\OpenRA.ico"
File "${SRCDIR}\Tao.*.dll" File "${SRCDIR}\Tao.*.dll"
@@ -293,7 +292,6 @@ Function ${UN}Clean
Delete $INSTDIR\COPYING Delete $INSTDIR\COPYING
Delete $INSTDIR\HACKING Delete $INSTDIR\HACKING
Delete $INSTDIR\INSTALL Delete $INSTDIR\INSTALL
Delete $INSTDIR\VERSION
Delete $INSTDIR\OpenRA.ico Delete $INSTDIR\OpenRA.ico
Delete $INSTDIR\*.ttf Delete $INSTDIR\*.ttf
Delete $INSTDIR\settings-netplay-*.ini Delete $INSTDIR\settings-netplay-*.ini