IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-06 21:25:42 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update MPN00BS

Browse source
This commit is contained in:
Li 2022-07-25 21:45:21 +12:00
parent f12e930538
commit 9294ec11a7
6 changed files with 34 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
HorseIsleServer/HISPd/Resources/DEBIAN/control
View file

@ -1,5 +1,5 @@
Package: hisp Package: hisp
Version: 1.7.120 Version: 1.7.121
Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev
Maintainer: Li Maintainer: Li
Homepage: https://islehorse.com Homepage: https://islehorse.com

4
HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs
View file

@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.7.120.0")] [assembly: AssemblyVersion("1.7.121.0")]
[assembly: AssemblyFileVersion("1.7.120.0")] [assembly: AssemblyFileVersion("1.7.121.0")]

11
HorseIsleServer/MPN00BS/App.axaml.cs
View file

@ -1,13 +1,19 @@
using Avalonia; using Avalonia;
using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
using HISP.Server;
using MPN00BS.ViewModels; using MPN00BS.ViewModels;
using System.IO;
using System.Runtime.InteropServices;
namespace MPN00BS namespace MPN00BS
{ {
public partial class App : Application public partial class App : Application
{ {
#if OS_LINUX
[DllImport("libc", SetLastError = true)]
private static extern int chmod(string pathname, int mode);
#endif
public App() public App()
{ {
this.DataContext = new HispViewModel(); this.DataContext = new HispViewModel();
@ -16,6 +22,9 @@ namespace MPN00BS
public override void Initialize() public override void Initialize()
{ {
AvaloniaXamlLoader.Load(this); AvaloniaXamlLoader.Load(this);
#if OS_LINUX
chmod(Path.Combine(Directory.GetCurrentDirectory(), "flashplayer", "LINUX", "flash.elf"), 777);
#endif
} }
public override void OnFrameworkInitializationCompleted() public override void OnFrameworkInitializationCompleted()

4
HorseIsleServer/MPN00BS/Program.cs
View file

@ -2,11 +2,15 @@ using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Controls.ApplicationLifetimes;
using System; using System;
using System.Runtime.InteropServices;
namespace MPN00BS namespace MPN00BS
{ {
internal class Program internal class Program
{ {
// Initialization code. Don't use any Avalonia, third-party APIs or any // Initialization code. Don't use any Avalonia, third-party APIs or any
// SynchronizationContext-reliant code before AppMain is called: things aren't initialized // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
// yet and stuff might break. // yet and stuff might break.

4
HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs
View file

@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.7.120.0")] [assembly: AssemblyVersion("1.7.121.0")]
[assembly: AssemblyFileVersion("1.7.120.0")] [assembly: AssemblyFileVersion("1.7.121.0")]

28
HorseIsleServer/MPN00BS/ServerStarter.cs
View file

@ -10,7 +10,6 @@ using HTTP;
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Runtime.InteropServices;
using static MPN00BS.MessageBox; using static MPN00BS.MessageBox;
namespace MPN00BS namespace MPN00BS
@ -19,10 +18,6 @@ namespace MPN00BS
public class ServerStarter public class ServerStarter
{ {
#if OS_LINUX
[DllImport("libc", SetLastError = true)]
private static extern int chmod(string pathname, int mode);
#endif
public static bool HasServerStarted = false; public static bool HasServerStarted = false;
private static Process clientProcess = new Process(); private static Process clientProcess = new Process();
private static Action HorseIsleClientExitCallback; private static Action HorseIsleClientExitCallback;
@ -37,9 +32,9 @@ namespace MPN00BS
cs.Contents.Add(ci); cs.Contents.Add(ci);
} }
public static void ShutdownHTTPServer(){ public static void ShutdownHTTPServer(){
cs.Shutdown(); cs.Shutdown();
} }
public static void ShowCrash(bool error, string type, string text) public static void ShowCrash(bool error, string type, string text)
{ {
@ -63,16 +58,22 @@ namespace MPN00BS
{ {
HorseIsleClientExitCallback = callback; HorseIsleClientExitCallback = callback;
clientProcess = new Process(); clientProcess = new Process();
#if OS_WINDOWS #if OS_WINDOWS
clientProcess.StartInfo.FileName = Path.Combine(Directory.GetCurrentDirectory(), "flashplayer", "WINDOWS", "flash.exe"); string executable = Path.Combine(Directory.GetCurrentDirectory(), "flashplayer", "WINDOWS", "flash.exe");
#elif OS_LINUX #elif OS_LINUX
clientProcess.StartInfo.FileName = Path.Combine(Directory.GetCurrentDirectory(), "flashplayer", "LINUX", "flash.elf"); string executable = Path.Combine(Directory.GetCurrentDirectory(), "flashplayer", "LINUX", "flash.elf");
chmod(clientProcess.StartInfo.FileName, 777);
#else #else
MessageBox.Show(null,"ERROR: No path for flash projector specified on this platform", "Porting error", MessageBoxButtons.Ok); MessageBox.Show(null,"ERROR: No path for flash projector specified on this platform", "Porting error", MessageBoxButtons.Ok);
#endif #endif
if (!File.Exists(executable))
{
MessageBox.Show(null, "ERROR: Cannot find file: \"" + executable + "\"", "File not Found error", MessageBoxButtons.Ok);
}
clientProcess.StartInfo.FileName = executable;
#if OS_LINUX #if OS_LINUX
clientProcess.StartInfo.Arguments = "http://"+cs.ipaddr+":"+cs.portnum+"/horseisle_mapfix.swf?SERVER=" + serverIp + "&PORT=" + serverPort.ToString(); clientProcess.StartInfo.Arguments = "http://"+cs.ipaddr+":"+cs.portnum+"/horseisle_mapfix.swf?SERVER=" + serverIp + "&PORT=" + serverPort.ToString();
@ -81,10 +82,11 @@ namespace MPN00BS
#endif #endif
clientProcess.StartInfo.RedirectStandardOutput = true; clientProcess.StartInfo.RedirectStandardOutput = true;
clientProcess.StartInfo.RedirectStandardError = true; clientProcess.StartInfo.RedirectStandardError = true;
clientProcess.EnableRaisingEvents = true; clientProcess.EnableRaisingEvents = true;
clientProcess.Exited += HorseIsleClientExited; clientProcess.Exited += HorseIsleClientExited;
clientProcess.Start(); clientProcess.Start();
} }
public static void ReadServerProperties() public static void ReadServerProperties()