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

also use binary name for NameBuilds option

Browse source
This commit is contained in:
Ell 2021-10-17 16:25:33 +02:00
parent 31539cf533
commit 5b682ee223
2 changed files with 61 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GameBundle/Options.cs
View file

@ -43,7 +43,7 @@ namespace GameBundle {
public string BuildConfig { get; set; } public string BuildConfig { get; set; }
[Option('a', "build-args", HelpText = "Additional arguments that should be passed to the dotnet publish command")] [Option('a', "build-args", HelpText = "Additional arguments that should be passed to the dotnet publish command")]
public string BuildArgs { get; set; } public string BuildArgs { get; set; }
[Option('n', "name-builds", HelpText = "Name the build output directories by the project's name")] [Option('n', "name-builds", HelpText = "Name the build output directories by the name of the executable")]
public bool NameBuilds { get; set; } public bool NameBuilds { get; set; }
} }

103
GameBundle/Program.cs
View file

@ -19,12 +19,14 @@ namespace GameBundle {
private static int Run(Options options) { private static int Run(Options options) {
// make sure all of the required tools are installed // make sure all of the required tools are installed
if (RunProcess(options, "dotnet", "tool restore", AppDomain.CurrentDomain.BaseDirectory) != 0) if (RunProcess(options, "dotnet", "tool restore", AppDomain.CurrentDomain.BaseDirectory) != 0) {
Console.WriteLine("dotnet tool restore failed, aborting");
return -1; return -1;
}
var proj = GetProjectFile(options); var proj = GetProjectFile(options);
if (proj == null || !proj.Exists) { if (proj == null || !proj.Exists) {
Console.WriteLine("Project file not found"); Console.WriteLine("Project file not found, aborting");
return -1; return -1;
} }
Console.WriteLine("Bundling project " + proj.FullName); Console.WriteLine("Bundling project " + proj.FullName);
@ -32,25 +34,23 @@ namespace GameBundle {
var builtAnything = false; var builtAnything = false;
if (options.BuildWindows) { if (options.BuildWindows) {
Console.WriteLine("Bundling for windows"); Console.WriteLine("Bundling for windows");
var res = Publish(options, proj, GetBuildDir(options, proj, "win"), options.Publish32Bit ? "win-x86" : "win-x64"); var res = Publish(options, proj, GetBuildDir(options, "win"), options.Publish32Bit ? "win-x86" : "win-x64");
if (res != 0) if (res != 0)
return res; return res;
builtAnything = true; builtAnything = true;
} }
if (options.BuildLinux) { if (options.BuildLinux) {
Console.WriteLine("Bundling for linux"); Console.WriteLine("Bundling for linux");
var res = Publish(options, proj, GetBuildDir(options, proj, "linux"), "linux-x64"); var res = Publish(options, proj, GetBuildDir(options, "linux"), "linux-x64");
if (res != 0) if (res != 0)
return res; return res;
builtAnything = true; builtAnything = true;
} }
if (options.BuildMac) { if (options.BuildMac) {
Console.WriteLine("Bundling for mac"); Console.WriteLine("Bundling for mac");
var dir = GetBuildDir(options, proj, "mac"); var dir = GetBuildDir(options, "mac");
var res = Publish(options, proj, dir, "osx-x64", () => { var res = Publish(options, proj, dir, "osx-x64",
if (options.MacBundle) () => options.MacBundle ? CreateMacBundle(options, dir, proj) : 0);
CreateMacBundle(options, new DirectoryInfo(dir), proj);
});
if (res != 0) if (res != 0)
return res; return res;
builtAnything = true; builtAnything = true;
@ -62,8 +62,8 @@ namespace GameBundle {
return 0; return 0;
} }
private static int Publish(Options options, FileInfo proj, string path, string rid, Action additionalAction = null) { private static int Publish(Options options, FileInfo proj, DirectoryInfo buildDir, string rid, Func<int> additionalAction = null) {
var publishResult = RunProcess(options, "dotnet", $"publish \"{proj.FullName}\" -o \"{path}\" -r {rid} -c {options.BuildConfig} /p:PublishTrimmed={options.Trim} {options.BuildArgs}"); var publishResult = RunProcess(options, "dotnet", $"publish \"{proj.FullName}\" -o \"{buildDir.FullName}\" -r {rid} -c {options.BuildConfig} /p:PublishTrimmed={options.Trim} {options.BuildArgs}");
if (publishResult != 0) if (publishResult != 0)
return publishResult; return publishResult;
@ -71,25 +71,43 @@ namespace GameBundle {
if (!options.SkipLib) { if (!options.SkipLib) {
var excludes = $"\"{string.Join(";", options.ExcludedFiles)}\""; var excludes = $"\"{string.Join(";", options.ExcludedFiles)}\"";
var log = options.Verbose ? "Detail" : "Error"; var log = options.Verbose ? "Detail" : "Error";
var beautyResult = RunProcess(options, "dotnet", $"ncbeauty --loglevel={log} --force=True \"{path}\" \"{options.LibFolder}\" {excludes}", AppDomain.CurrentDomain.BaseDirectory); var beautyResult = RunProcess(options, "dotnet", $"ncbeauty --loglevel={log} --force=True \"{buildDir.FullName}\" \"{options.LibFolder}\" {excludes}", AppDomain.CurrentDomain.BaseDirectory);
if (beautyResult != 0) if (beautyResult != 0)
return beautyResult; return beautyResult;
// Remove the beauty file since it's just a marker // Remove the beauty file since it's just a marker
var beautyFile = new FileInfo(Path.Combine(path, "NetCoreBeauty")); var beautyFile = new FileInfo(Path.Combine(buildDir.FullName, "NetCoreBeauty"));
if (beautyFile.Exists) if (beautyFile.Exists)
beautyFile.Delete(); beautyFile.Delete();
} }
// Rename build folder if named builds are enabled
if (options.NameBuilds) {
var name = GetBuildName(options, buildDir);
if (name == null) {
Console.WriteLine("Couldn't determine build name, aborting");
return -1;
}
buildDir.MoveTo(Path.Combine(buildDir.Parent.FullName, $"{name}-{buildDir.Name}"));
if (options.Verbose)
Console.WriteLine($"Moved build directory to {buildDir.FullName}");
}
// Run any additional actions like creating the mac bundle // Run any additional actions like creating the mac bundle
additionalAction?.Invoke(); if (additionalAction != null) {
var result = additionalAction();
if (result != 0)
return result;
}
// Zip the output if required // Zip the output if required
if (options.Zip) { if (options.Zip) {
var zipLocation = Path.Combine(Directory.GetParent(path).FullName, Path.GetFileName(path) + ".zip"); var zipLocation = Path.Combine(buildDir.Parent.FullName, buildDir.Name + ".zip");
File.Delete(zipLocation); File.Delete(zipLocation);
ZipFile.CreateFromDirectory(path, zipLocation, CompressionLevel.Optimal, true); ZipFile.CreateFromDirectory(buildDir.FullName, zipLocation, CompressionLevel.Optimal, true);
Directory.Delete(path, true); buildDir.Delete(true);
if (options.Verbose)
Console.WriteLine($"Zipped build to {zipLocation}");
} }
return 0; return 0;
} }
@ -118,31 +136,16 @@ namespace GameBundle {
return null; return null;
} }
private static void CreateMacBundle(Options options, DirectoryInfo dir, FileInfo proj) { private static int CreateMacBundle(Options options, DirectoryInfo buildDir, FileInfo proj) {
var files = dir.GetFiles(); var buildName = GetBuildName(options, buildDir);
var dirs = dir.GetDirectories(); var app = buildDir.CreateSubdirectory($"{buildName}.app");
// figure out the app name, which should match the binary (and dll) name
var appName = Path.GetFileNameWithoutExtension(proj.Name);
foreach (var file in files) {
if (!string.IsNullOrEmpty(file.Extension))
continue;
if (files.Any(f => f.Extension == ".dll" && Path.GetFileNameWithoutExtension(f.Name) == file.Name)) {
if (options.Verbose)
Console.WriteLine($"Choosing app name {file.Name} from binary");
appName = file.Name;
break;
}
}
var app = dir.CreateSubdirectory($"{appName}.app");
var contents = app.CreateSubdirectory("Contents"); var contents = app.CreateSubdirectory("Contents");
var resources = contents.CreateSubdirectory("Resources"); var resources = contents.CreateSubdirectory("Resources");
var macOs = contents.CreateSubdirectory("MacOS"); var macOs = contents.CreateSubdirectory("MacOS");
var resRegex = options.MacBundleResources.Select(GlobRegex).ToArray(); var resRegex = options.MacBundleResources.Select(GlobRegex).ToArray();
var ignoreRegex = options.MacBundleIgnore.Select(GlobRegex).ToArray(); var ignoreRegex = options.MacBundleIgnore.Select(GlobRegex).ToArray();
foreach (var file in files) { foreach (var file in buildDir.GetFiles()) {
if (ignoreRegex.Any(r => r.IsMatch(file.Name))) if (ignoreRegex.Any(r => r.IsMatch(file.Name)))
continue; continue;
var destDir = resRegex.Any(r => r.IsMatch(file.Name)) ? resources : macOs; var destDir = resRegex.Any(r => r.IsMatch(file.Name)) ? resources : macOs;
@ -150,8 +153,8 @@ namespace GameBundle {
destDir = contents; destDir = contents;
file.MoveTo(Path.Combine(destDir.FullName, file.Name), true); file.MoveTo(Path.Combine(destDir.FullName, file.Name), true);
} }
foreach (var sub in dirs) { foreach (var sub in buildDir.GetDirectories()) {
if (ignoreRegex.Any(r => r.IsMatch(sub.Name))) if (sub.Name == app.Name || ignoreRegex.Any(r => r.IsMatch(sub.Name)))
continue; continue;
var destDir = resRegex.Any(r => r.IsMatch(sub.Name)) ? resources : macOs; var destDir = resRegex.Any(r => r.IsMatch(sub.Name)) ? resources : macOs;
var dest = new DirectoryInfo(Path.Combine(destDir.FullName, sub.Name)); var dest = new DirectoryInfo(Path.Combine(destDir.FullName, sub.Name));
@ -160,17 +163,31 @@ namespace GameBundle {
sub.MoveTo(dest.FullName); sub.MoveTo(dest.FullName);
} }
File.WriteAllText(Path.Combine(contents.FullName, "PkgInfo"), "APPL????"); File.WriteAllText(Path.Combine(contents.FullName, "PkgInfo"), "APPL????");
return 0;
} }
private static Regex GlobRegex(string s) { private static Regex GlobRegex(string s) {
return new Regex(s.Replace(".", "[.]").Replace("*", ".*").Replace("?", ".")); return new Regex(s.Replace(".", "[.]").Replace("*", ".*").Replace("?", "."));
} }
private static string GetBuildDir(Options options, FileInfo proj, string osName) { private static DirectoryInfo GetBuildDir(Options options, string osName) {
var dir = Path.GetFullPath(options.OutputDirectory); return new DirectoryInfo(Path.Combine(Path.GetFullPath(options.OutputDirectory), osName));
if (options.NameBuilds) }
return $"{dir}/{Path.GetFileNameWithoutExtension(proj.Name)}-{osName}";
return $"{dir}/{osName}"; private static string GetBuildName(Options options, DirectoryInfo buildDir) {
// determine build name based on the names of the exe or binary that have a matching dll file
var files = buildDir.GetFiles();
foreach (var file in files) {
if (file.Extension != ".exe" && file.Extension != string.Empty)
continue;
var name = Path.GetFileNameWithoutExtension(file.Name);
if (files.Any(f => f.Extension == ".dll" && Path.GetFileNameWithoutExtension(f.Name) == name)) {
if (options.Verbose)
Console.WriteLine($"Choosing name {name} from executable");
return name;
}
}
return null;
} }
} }