Ellpeck/GameBundle
1
0
Fork 0
mirror of https://github.com/Ellpeck/GameBundle.git synced 2024-11-22 08:43:28 +01:00
Code Issues Projects Releases Wiki Activity

reformat & cleanup

Browse source
This commit is contained in:
Ell 2022-08-17 21:51:38 +02:00
parent b3218532e8
commit 1142252015
6 changed files with 287 additions and 287 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
GameBundle/Options.cs
View file

@ -2,8 +2,9 @@ using System;
using System.Collections.Generic;
using CommandLine;
namespace GameBundle {
public class Options {
namespace GameBundle;
public class Options {
[Option('s', "source", HelpText = "The location of the .csproj file that should be built and bundled. By default, the current directory is scanned for one")]
public string SourceFile { get; set; }
@ -65,5 +66,4 @@ namespace GameBundle {
[Option('N', "name-addition", HelpText = "An additional string of text that should be included in the names of the output directories")]
public string NameAddition { get; set; }
}
}

32
GameBundle/Program.cs
View file

@ -7,24 +7,25 @@ using System.Linq;
using System.Text.RegularExpressions;
using CommandLine;
namespace GameBundle {
internal static class Program {
namespace GameBundle;
internal static class Program {
private static int Main(string[] args) {
return new Parser(c => {
c.HelpWriter = Console.Error;
c.EnableDashDash = true;
}).ParseArguments<Options>(args).MapResult(Run, _ => -1);
}).ParseArguments<Options>(args).MapResult(Program.Run, _ => -1);
}
private static int Run(Options options) {
// make sure all of the required tools are installed
if (RunProcess(options, "dotnet", "tool restore", AppDomain.CurrentDomain.BaseDirectory) != 0) {
if (Program.RunProcess(options, "dotnet", "tool restore", AppDomain.CurrentDomain.BaseDirectory) != 0) {
Console.WriteLine("dotnet tool restore failed, aborting");
return -1;
}
var proj = GetProjectFile(options);
var proj = Program.GetProjectFile(options);
if (proj == null || !proj.Exists) {
Console.WriteLine("Project file not found, aborting");
return -1;
@ -36,16 +37,16 @@ namespace GameBundle {
// regular builds
new("windows", "win", options.WindowsRid, options.BuildWindows),
new("linux", "linux", options.LinuxRid, options.BuildLinux),
new("mac", "mac", options.MacRid, options.BuildMac, false, d => options.MacBundle ? CreateMacBundle(options, d) : 0),
new("mac", "mac", options.MacRid, options.BuildMac, false, d => options.MacBundle ? Program.CreateMacBundle(options, d) : 0),
// arm builds
new("windows arm", "win-arm", options.WindowsArmRid, options.BuildWindowsArm, true),
new("linux arm", "linux-arm", options.LinuxArmRid, options.BuildLinuxArm, true),
new("mac arm", "mac-arm", options.MacArmRid, options.BuildMacArm, true, d => options.MacBundle ? CreateMacBundle(options, d) : 0)
new("mac arm", "mac-arm", options.MacArmRid, options.BuildMacArm, true, d => options.MacBundle ? Program.CreateMacBundle(options, d) : 0)
};
foreach (var config in toBuild) {
if (config.ShouldBuild) {
Console.WriteLine($"Bundling for {config.DisplayName}");
var res = Publish(options, proj, config);
var res = Program.Publish(options, proj, config);
if (res != 0)
return res;
builtAnything = true;
@ -59,8 +60,8 @@ namespace GameBundle {
}
private static int Publish(Options options, FileInfo proj, BuildConfig config) {
var buildDir = GetBuildDir(options, config.DirectoryName);
var publishResult = RunProcess(options, "dotnet", $"publish \"{proj.FullName}\" -o \"{buildDir.FullName}\" -r {config.Rid} --self-contained -c {options.BuildConfig} /p:PublishTrimmed={options.Trim} {options.BuildArgs}");
var buildDir = Program.GetBuildDir(options, config.DirectoryName);
var publishResult = Program.RunProcess(options, "dotnet", $"publish \"{proj.FullName}\" -o \"{buildDir.FullName}\" -r {config.Rid} --self-contained -c {options.BuildConfig} /p:PublishTrimmed={options.Trim} {options.BuildArgs}");
if (publishResult != 0)
return publishResult;
@ -68,14 +69,14 @@ namespace GameBundle {
if (!options.SkipLib && !config.SkipLib) {
var excludes = $"\"{string.Join(";", options.ExcludedFiles)}\"";
var log = options.Verbose ? "Detail" : "Error";
var beautyResult = RunProcess(options, "dotnet", $"ncbeauty --loglevel={log} --force=True --noflag=True \"{buildDir.FullName}\" \"{options.LibFolder}\" {excludes}", AppDomain.CurrentDomain.BaseDirectory);
var beautyResult = Program.RunProcess(options, "dotnet", $"ncbeauty --loglevel={log} --force=True --noflag=True \"{buildDir.FullName}\" \"{options.LibFolder}\" {excludes}", AppDomain.CurrentDomain.BaseDirectory);
if (beautyResult != 0)
return beautyResult;
}
// Rename build folder if named builds are enabled
if (options.NameBuilds) {
var name = GetBuildName(options, buildDir);
var name = Program.GetBuildName(options, buildDir);
if (name == null) {
Console.WriteLine("Couldn't determine build name, aborting");
return -1;
@ -133,13 +134,13 @@ namespace GameBundle {
}
private static int CreateMacBundle(Options options, DirectoryInfo buildDir) {
var buildName = GetBuildName(options, buildDir);
var buildName = Program.GetBuildName(options, buildDir);
var app = buildDir.CreateSubdirectory($"{buildName}.app");
var contents = app.CreateSubdirectory("Contents");
var resources = contents.CreateSubdirectory("Resources");
var macOs = contents.CreateSubdirectory("MacOS");
var resRegex = options.MacBundleResources.Select(GlobRegex).ToArray();
var ignoreRegex = options.MacBundleIgnore.Select(GlobRegex).ToArray();
var resRegex = options.MacBundleResources.Select(Program.GlobRegex).ToArray();
var ignoreRegex = options.MacBundleIgnore.Select(Program.GlobRegex).ToArray();
if (options.Verbose)
Console.WriteLine($"Creating app bundle {app}");
@ -215,5 +216,4 @@ namespace GameBundle {
}
}
}

10
Test/GameImpl.cs
View file

@ -2,19 +2,20 @@ using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using MLEM.Startup;
namespace Test {
public class GameImpl : MlemGame {
namespace Test;
public class GameImpl : MlemGame {
public static GameImpl Instance { get; private set; }
private Texture2D texture;
public GameImpl() {
Instance = this;
GameImpl.Instance = this;
}
protected override void LoadContent() {
base.LoadContent();
this.texture = LoadContent<Texture2D>("Textures/Test");
this.texture = MlemGame.LoadContent<Texture2D>("Textures/Test");
}
protected override void DoDraw(GameTime gameTime) {
@ -25,5 +26,4 @@ namespace Test {
this.SpriteBatch.End();
}
}
}

6
Test/Program.cs
View file

@ -1,8 +1,9 @@
using Microsoft.Xna.Framework;
using MLEM.Misc;
namespace Test {
public static class Program {
namespace Test;
public static class Program {
public static void Main() {
TextInputWrapper.Current = new TextInputWrapper.DesktopGl<TextInputEventArgs>((w, c) => w.TextInput += c);
@ -10,5 +11,4 @@ namespace Test {
game.Run();
}
}
}

2
Test/Test.csproj
View file

@ -18,6 +18,6 @@
<ItemGroup>
<MonoGameContentReference Include="Content\Content.mgcb" />
<Content Include="Content\*\**" />
<Content Include="macmain.txt" CopyToOutputDirectory="Always"/>
<Content Include="macmain.txt" CopyToOutputDirectory="Always" />
</ItemGroup>
</Project>