Skip to content

Commit

Permalink
Mirror: Configuration argument for content packaging (#316)
Browse files Browse the repository at this point in the history 
## Mirror of PR #25569: [Configuration argument for content
packaging](space-wizards/space-station-14#25569)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `9e7b196ffbaa8c0a772d5d7544e51deaa2fe5a26`

PR opened by <img
src="https://avatars.githubusercontent.com/u/34938708?v=4"
width="16"/><a href="https://github.com/VasilisThePikachu">
VasilisThePikachu</a> at 2024-02-25 21:40:05 UTC

---

PR changed 4 files with 34 additions and 15 deletions.

The PR had the following labels:


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> Requires space-wizards/RobustToolbox#4992
> 
> ## About the PR
> <!-- What did you change in this PR? -->
> 
> Needed this for something so here we are. I think someone mentioned
they wanted this? Welp its here now
> 
> New argument is ``--configuration`` by default release but you can
pass in anything else. Probably debug or tools


</details>

Co-authored-by: SimpleStation14 <Unknown>
Co-authored-by: VMSolidus <[email protected]>
  • Loading branch information
@SimpleStation14 @VMSolidus
SimpleStation14 and VMSolidus authored Jul 9, 2024
1 parent 24f36c1 commit a8911da
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 15 deletions.
4 changes: 2 additions & 2 deletions Content.Packaging/ClientPackaging.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public static class ClientPackaging
/// <summary>
/// Be advised this can be called from server packaging during a HybridACZ build.
/// </summary>
public static async Task PackageClient(bool skipBuild, IPackageLogger logger)
public static async Task PackageClient(bool skipBuild, string configuration, IPackageLogger logger)
{
logger.Info("Building client...");

Expand All @@ -26,7 +26,7 @@ await ProcessHelpers.RunCheck(new ProcessStartInfo
{
"build",
Path.Combine("Content.Client", "Content.Client.csproj"),
"-c", "Release",
"-c", configuration,
"--nologo",
"/v:m",
"/t:Rebuild",
Expand Down
23 changes: 21 additions & 2 deletions Content.Packaging/CommandLineArgs.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ public sealed class CommandLineArgs
/// </summary>
public bool HybridAcz { get; set; }

/// <summary>
/// Configuration used for when packaging the server. (Release, Debug, Tools)
/// </summary>
public string Configuration { get; set; }

// CommandLineArgs, 3rd of her name.
public static bool TryParse(IReadOnlyList<string> args, [NotNullWhen(true)] out CommandLineArgs? parsed)
{
Expand All @@ -39,6 +44,7 @@ public static bool TryParse(IReadOnlyList<string> args, [NotNullWhen(true)] out
var skipBuild = false;
var wipeRelease = true;
var hybridAcz = false;
var configuration = "Release";
List<string>? platforms = null;

using var enumerator = args.GetEnumerator();
Expand Down Expand Up @@ -89,6 +95,16 @@ public static bool TryParse(IReadOnlyList<string> args, [NotNullWhen(true)] out
platforms ??= new List<string>();
platforms.Add(enumerator.Current);
}
else if (arg == "--configuration")
{
if (!enumerator.MoveNext())
{
Console.WriteLine("No configuration provided");
return false;
}

configuration = enumerator.Current;
}
else if (arg == "--help")
{
PrintHelp();
Expand All @@ -106,7 +122,7 @@ public static bool TryParse(IReadOnlyList<string> args, [NotNullWhen(true)] out
return false;
}

parsed = new CommandLineArgs(client.Value, skipBuild, wipeRelease, hybridAcz, platforms);
parsed = new CommandLineArgs(client.Value, skipBuild, wipeRelease, hybridAcz, platforms, configuration);
return true;
}

Expand All @@ -120,6 +136,7 @@ private static void PrintHelp()
--no-wipe-release Don't wipe the release folder before creating files.
--hybrid-acz Use HybridACZ for server builds.
--platform Platform for server builds. Default will output several x64 targets.
--configuration Configuration to use for building the server (Release, Debug, Tools). Default is Release.
");
}

Expand All @@ -128,12 +145,14 @@ private CommandLineArgs(
bool skipBuild,
bool wipeRelease,
bool hybridAcz,
List<string>? platforms)
List<string>? platforms,
string configuration)
{
Client = client;
SkipBuild = skipBuild;
WipeRelease = wipeRelease;
HybridAcz = hybridAcz;
Platforms = platforms;
Configuration = configuration;
}
}
4 changes: 2 additions & 2 deletions Content.Packaging/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

if (parsed.Client)
{
await ClientPackaging.PackageClient(parsed.SkipBuild, logger);
await ClientPackaging.PackageClient(parsed.SkipBuild, parsed.Configuration, logger);
}
else
{
await ServerPackaging.PackageServer(parsed.SkipBuild, parsed.HybridAcz, logger, parsed.Platforms);
await ServerPackaging.PackageServer(parsed.SkipBuild, parsed.HybridAcz, logger, parsed.Configuration, parsed.Platforms);
}

void WipeBin()
Expand Down
18 changes: 9 additions & 9 deletions Content.Packaging/ServerPackaging.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public static class ServerPackaging
"zh-Hant"
};

public static async Task PackageServer(bool skipBuild, bool hybridAcz, IPackageLogger logger, List<string>? platforms = null)
public static async Task PackageServer(bool skipBuild, bool hybridAcz, IPackageLogger logger, string configuration, List<string>? platforms = null)
{
if (platforms == null)
{
Expand All @@ -82,7 +82,7 @@ public static async Task PackageServer(bool skipBuild, bool hybridAcz, IPackageL
// Rather than hosting the client ZIP on the watchdog or on a separate server,
// Hybrid ACZ uses the ACZ hosting functionality to host it as part of the status host,
// which means that features such as automatic UPnP forwarding still work properly.
await ClientPackaging.PackageClient(skipBuild, logger);
await ClientPackaging.PackageClient(skipBuild, configuration, logger);
}

// Good variable naming right here.
Expand All @@ -91,13 +91,13 @@ public static async Task PackageServer(bool skipBuild, bool hybridAcz, IPackageL
if (!platforms.Contains(platform.Rid))
continue;

await BuildPlatform(platform, skipBuild, hybridAcz, logger);
await BuildPlatform(platform, skipBuild, hybridAcz, configuration, logger);
}
}

private static async Task BuildPlatform(PlatformReg platform, bool skipBuild, bool hybridAcz, IPackageLogger logger)
private static async Task BuildPlatform(PlatformReg platform, bool skipBuild, bool hybridAcz, string configuration, IPackageLogger logger)
{
logger.Info($"Building project for {platform}...");
logger.Info($"Building project for {platform.TargetOs}...");

if (!skipBuild)
{
Expand All @@ -108,7 +108,7 @@ await ProcessHelpers.RunCheck(new ProcessStartInfo
{
"build",
Path.Combine("Content.Server", "Content.Server.csproj"),
"-c", "Release",
"-c", configuration,
"--nologo",
"/v:m",
$"/p:TargetOs={platform.TargetOs}",
Expand All @@ -118,7 +118,7 @@ await ProcessHelpers.RunCheck(new ProcessStartInfo
}
});

await PublishClientServer(platform.Rid, platform.TargetOs);
await PublishClientServer(platform.Rid, platform.TargetOs, configuration);
}

logger.Info($"Packaging {platform.Rid} server...");
Expand All @@ -137,7 +137,7 @@ await ProcessHelpers.RunCheck(new ProcessStartInfo
logger.Info($"Finished packaging server in {sw.Elapsed}");
}

private static async Task PublishClientServer(string runtime, string targetOs)
private static async Task PublishClientServer(string runtime, string targetOs, string configuration)
{
await ProcessHelpers.RunCheck(new ProcessStartInfo
{
Expand All @@ -147,7 +147,7 @@ await ProcessHelpers.RunCheck(new ProcessStartInfo
"publish",
"--runtime", runtime,
"--no-self-contained",
"-c", "Release",
"-c", configuration,
$"/p:TargetOs={targetOs}",
"/p:FullRelease=True",
"/m",
Expand Down

0 comments on commit a8911da

Please sign in to comment.