Skip to content

Commit 42e58c3

Browse files
committed
Cleanup build script menu items
1 parent 21aa89a commit 42e58c3

File tree

2 files changed

+20
-49
lines changed

2 files changed

+20
-49
lines changed

Assets/Scripts/Editor/BuildScript.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
using UnityEngine.Rendering;
2222
#if UNITY_6000_1_OR_NEWER
2323
using Unity.Web.Stripping.Editor;
24+
using UnityEngine.Assertions;
2425
#endif
2526

2627
namespace UnityBuilderAction
@@ -395,7 +396,9 @@ private static void Build(BuildTarget buildTarget, string filePath)
395396
var webBuild = WebBuildReportList.Instance.GetBuild(buildSummary.outputPath);
396397

397398
var settings = StrippingProjectSettings.ActiveSettings;
399+
Assert.IsNotNull(settings, "Could not find active stripping settings for WebGL build.");
398400
Log($"Using stripping settings {settings.name} with modules to strip: {string.Join(", ", settings.SubmodulesToStrip)}");
401+
399402
var successfulStripping = WebBuildProcessor.StripBuild(webBuild, settings);
400403
if (successfulStripping)
401404
{

Assets/Scripts/Editor/BuildScriptMenu.cs

Lines changed: 17 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -33,89 +33,57 @@ public class BuildScriptMenu
3333
[MenuItem("Tools/Build WebGL/webgl1")]
3434
public static void BuildWebGL1()
3535
{
36-
var parameters = new List<string>(baseParameters);
37-
string tag = $"{Application.unityVersion}-webgl1-manualBuild";
38-
SetBuildTarget(BuildTarget.WebGL, ref parameters);
39-
SetParameterValue("-autorunplayer", "true", ref parameters);
40-
SetParameterValue("-tag", tag, ref parameters);
41-
SetParameterValue("-customBuildPath", $"Builds/WebGL/{tag}", ref parameters);
42-
SetParameterValue("-customBuildName", tag, ref parameters);
43-
BuildWithParameters(parameters);
36+
BuildWebGL($"{Application.unityVersion}-webgl1-manualBuild");
4437
}
4538

4639
[MenuItem("Tools/Build WebGL/minsize-webgl1")]
4740
public static void BuildWebGL1MinSize()
4841
{
49-
var parameters = new List<string>(baseParameters);
50-
string tag = $"{Application.unityVersion}-minsize-webgl1-manualBuild";
51-
SetBuildTarget(BuildTarget.WebGL, ref parameters);
52-
SetParameterValue("-autorunplayer", "true", ref parameters);
53-
SetParameterValue("-tag", tag, ref parameters);
54-
SetParameterValue("-customBuildPath", $"Builds/WebGL/{tag}", ref parameters);
55-
SetParameterValue("-customBuildName", tag, ref parameters);
56-
BuildWithParameters(parameters);
42+
BuildWebGL($"{Application.unityVersion}-minsize-webgl1-manualBuild");
5743
}
5844
#endif
5945

6046
[MenuItem("Tools/Build WebGL/webgl2")]
6147
public static void BuildWebGL2()
6248
{
63-
var parameters = new List<string>(baseParameters);
64-
string tag = $"{Application.unityVersion}-webgl2-manualBuild";
65-
SetBuildTarget(BuildTarget.WebGL, ref parameters);
66-
SetParameterValue("-autorunplayer", "true", ref parameters);
67-
SetParameterValue("-tag", tag, ref parameters);
68-
SetParameterValue("-customBuildPath", $"Builds/WebGL/{tag}", ref parameters);
69-
SetParameterValue("-customBuildName", tag, ref parameters);
70-
BuildWithParameters(parameters);
49+
BuildWebGL($"{Application.unityVersion}-webgl2-manualBuild");
7150
}
7251

7352
[MenuItem("Tools/Build WebGL/minsize-webgl2")]
7453
public static void BuildWebGL2MinSize()
7554
{
76-
var parameters = new List<string>(baseParameters);
77-
string tag = $"{Application.unityVersion}-minsize-webgl2-manualBuild";
78-
SetBuildTarget(BuildTarget.WebGL, ref parameters);
79-
SetParameterValue("-autorunplayer", "true", ref parameters);
80-
SetParameterValue("-tag", tag, ref parameters);
81-
SetParameterValue("-customBuildPath", $"Builds/WebGL/{tag}", ref parameters);
82-
SetParameterValue("-customBuildName", tag, ref parameters);
83-
BuildWithParameters(parameters);
55+
BuildWebGL($"{Application.unityVersion}-minsize-webgl2-manualBuild");
56+
}
57+
58+
[MenuItem("Tools/Build WebGL/minsize-stripped-webgl2")]
59+
public static void BuildWebGL2MinSizeStripped()
60+
{
61+
BuildWebGL($"{Application.unityVersion}-minsize-stripped-webgl2-manualBuild");
8462
}
8563

8664
#if UNITY_2023_2_OR_NEWER
8765
[MenuItem("Tools/Build WebGL/webgpu")]
8866
public static void BuildWebGpu()
8967
{
90-
var parameters = new List<string>(baseParameters);
91-
string tag = $"{Application.unityVersion}-webgpu-manualBuild";
92-
SetBuildTarget(BuildTarget.WebGL, ref parameters);
93-
SetParameterValue("-autorunplayer", "true", ref parameters);
94-
SetParameterValue("-tag", tag, ref parameters);
95-
SetParameterValue("-customBuildPath", $"Builds/WebGL/{tag}", ref parameters);
96-
SetParameterValue("-customBuildName", tag, ref parameters);
97-
BuildWithParameters(parameters);
68+
BuildWebGL($"{Application.unityVersion}-webgpu-manualBuild");
9869
}
9970

10071
[MenuItem("Tools/Build WebGL/minsize-webgpu")]
10172
public static void BuildWebGpuMinSize()
10273
{
103-
var parameters = new List<string>(baseParameters);
104-
string tag = $"{Application.unityVersion}-minsize-webgpu-manualBuild";
105-
SetBuildTarget(BuildTarget.WebGL, ref parameters);
106-
SetParameterValue("-autorunplayer", "true", ref parameters);
107-
SetParameterValue("-tag", tag, ref parameters);
108-
SetParameterValue("-customBuildPath", $"Builds/WebGL/{tag}", ref parameters);
109-
SetParameterValue("-customBuildName", tag, ref parameters);
110-
BuildWithParameters(parameters);
74+
BuildWebGL($"{Application.unityVersion}-minsize-webgpu-manualBuild");
11175
}
11276
#endif
11377

11478
[MenuItem("Tools/Build WebGL/debug")]
11579
public static void BuildWebGLDebug()
80+
{
81+
BuildWebGL($"{Application.unityVersion}-debug-manualBuild");
82+
}
83+
84+
private static void BuildWebGL(string tag)
11685
{
11786
var parameters = new List<string>(baseParameters);
118-
string tag = $"{Application.unityVersion}-debug-manualBuild";
11987
SetBuildTarget(BuildTarget.WebGL, ref parameters);
12088
SetParameterValue("-autorunplayer", "true", ref parameters);
12189
SetParameterValue("-tag", tag, ref parameters);

0 commit comments

Comments
 (0)