Build System Tweaks

CHANGELOG.md

@@ -22,6 +22,7 @@
 - Updated the `MobileWorkerConnector` to use the KCP network protocol by default.
 - Changed the `mobile_launch.json` config to use the new Runtime.
 - Updated all the launch configs to use the new Runtime.
+- Changed the way builds are processed in the Unity Editor. If you don't have build support for a particular target, that specific build target will be skipped rather than the whole build process cancelled.
 
 ### Fixed
 

workers/unity/Packages/com.improbable.gdk.buildsystem/Util/BuildSupportChecker.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Improbable.Gdk.BuildSystem;
 using Improbable.Gdk.BuildSystem.Configuration;
 using UnityEditor;
 using UnityEngine;
@@ -52,6 +53,25 @@ public static BuildTarget[] GetBuildTargetsMissingBuildSupport(params BuildTarge
             .ToArray();
     }
 
+    public static string[] FilterWorkerTypes(BuildEnvironment environment, string[] desiredWorkerTypes)
+    {
+        return desiredWorkerTypes.Where(wantedWorkerType =>
+        {
+            var buildTargetsForWorker =
+                WorkerBuilder.GetBuildTargetsForWorkerForEnvironment(wantedWorkerType, environment);
+            var buildTargetsMissingBuildSupport = GetBuildTargetsMissingBuildSupport(buildTargetsForWorker);
+
+            if (buildTargetsMissingBuildSupport.Length > 0)
+            {
+                Debug.LogError(ConstructMissingSupportMessage(wantedWorkerType,
+                    environment, buildTargetsMissingBuildSupport));
+                return false;
+            }
+
+            return true;
+        }).ToArray();
+    }
+
     public static string ConstructMissingSupportMessage(string workerType, BuildEnvironment environment,
         BuildTarget[] buildTargetsMissingBuildSupport)
     {

workers/unity/Packages/com.improbable.gdk.buildsystem/WorkerBuilder.cs

@@ -53,20 +53,18 @@ public static void Build()
                     CommandLineUtility.GetCommandLineValue(commandLine, BuildWorkerTypes,
                         "UnityClient,UnityGameLogic");
 
-                var wantedWorkerTypes = workerTypesArg.Split(',');
-                foreach (var wantedWorkerType in wantedWorkerTypes)
-                {
-                    var buildTargetsForWorker = GetBuildTargetsForWorkerForEnvironment(wantedWorkerType, buildEnvironment);
-                    var buildTargetsMissingBuildSupport = BuildSupportChecker.GetBuildTargetsMissingBuildSupport(buildTargetsForWorker);
+                var desiredWorkerTypes = workerTypesArg.Split(',');
+                var filteredWorkerTypes = BuildSupportChecker.FilterWorkerTypes(buildEnvironment, desiredWorkerTypes);
 
-                    if (buildTargetsMissingBuildSupport.Length > 0)
-                    {
-                        throw new BuildFailedException(BuildSupportChecker.ConstructMissingSupportMessage(wantedWorkerType, buildEnvironment, buildTargetsMissingBuildSupport));
-                    }
+                if (desiredWorkerTypes.Length != filteredWorkerTypes.Length)
+                {
+                    throw new BuildFailedException(
+                        "Unable to complete build. Missing build support. Check logs for specific errors.");
                 }
 
                 ScriptingImplementation scriptingBackend;
-                var wantedScriptingBackend = CommandLineUtility.GetCommandLineValue(commandLine, "scriptingBackend", "mono");
+                var wantedScriptingBackend =
+                    CommandLineUtility.GetCommandLineValue(commandLine, "scriptingBackend", "mono");
                 switch (wantedScriptingBackend)
                 {
                     case "mono":
@@ -81,7 +79,7 @@ public static void Build()
 
                 LocalLaunch.BuildConfig();
 
-                foreach (var wantedWorkerType in wantedWorkerTypes)
+                foreach (var wantedWorkerType in filteredWorkerTypes)
                 {
                     BuildWorkerForEnvironment(wantedWorkerType, buildEnvironment, scriptingBackend);
                 }
@@ -98,9 +96,11 @@ public static void Build()
             }
         }
 
-        public static BuildTarget[] GetBuildTargetsForWorkerForEnvironment(string workerType, BuildEnvironment targetEnvironment)
+        public static BuildTarget[] GetBuildTargetsForWorkerForEnvironment(string workerType,
+            BuildEnvironment targetEnvironment)
         {
-            var environmentConfig = SpatialOSBuildConfiguration.GetInstance().GetEnvironmentConfigForWorker(workerType, targetEnvironment);
+            var environmentConfig = SpatialOSBuildConfiguration.GetInstance()
+                .GetEnvironmentConfigForWorker(workerType, targetEnvironment);
             if (environmentConfig == null)
             {
                 return new BuildTarget[0];
@@ -109,10 +109,12 @@ public static BuildTarget[] GetBuildTargetsForWorkerForEnvironment(string worker
             return GetUnityBuildTargets(environmentConfig.BuildPlatforms);
         }
 
-        public static void BuildWorkerForEnvironment(string workerType, BuildEnvironment targetEnvironment, ScriptingImplementation? scriptingBackend = null)
+        public static void BuildWorkerForEnvironment(string workerType, BuildEnvironment targetEnvironment,
+            ScriptingImplementation? scriptingBackend = null)
         {
             var spatialOSBuildConfiguration = SpatialOSBuildConfiguration.GetInstance();
-            var environmentConfig = spatialOSBuildConfiguration.GetEnvironmentConfigForWorker(workerType, targetEnvironment);
+            var environmentConfig =
+                spatialOSBuildConfiguration.GetEnvironmentConfigForWorker(workerType, targetEnvironment);
             if (environmentConfig == null)
             {
                 Debug.LogWarning($"Skipping build for {workerType}.");
@@ -149,7 +151,6 @@ public static void BuildWorkerForEnvironment(string workerType, BuildEnvironment
                 {
                     PlayerSettings.SetScriptingBackend(buildTargetGroup, activeScriptingBackend);
                 }
-
             }
         }
 
@@ -222,7 +223,8 @@ internal static SpatialBuildPlatforms GetCurrentBuildPlatform()
         private static void BuildWorkerForTarget(string workerType, BuildTarget buildTarget,
             BuildOptions buildOptions, BuildEnvironment targetEnvironment)
         {
-            Debug.Log($"Building \"{buildTarget}\" for worker platform: \"{workerType}\", environment: \"{targetEnvironment}\"");
+            Debug.Log(
+                $"Building \"{buildTarget}\" for worker platform: \"{workerType}\", environment: \"{targetEnvironment}\"");
 
             var spatialOSBuildConfiguration = SpatialOSBuildConfiguration.GetInstance();
             var workerBuildData = new WorkerBuildData(workerType, buildTarget);

workers/unity/Packages/com.improbable.gdk.tools/.CodeGenerator/GdkCodeGenerator/Templates/UnityWorkerMenuGenerator.tt

@@ -6,6 +6,7 @@
 #>
 <#= generatedHeader #>
 
+using System.Linq;
 using Improbable.Gdk.BuildSystem;
 using Improbable.Gdk.BuildSystem.Configuration;
 using Improbable.Gdk.Tools;
@@ -90,23 +91,30 @@ var workerType = workerTypeList[i];
             // Delaying build by a frame to ensure the editor has re-rendered the UI to avoid odd glitches.
             EditorApplication.delayCall += () =>
             {
-                if (!CheckWorkersCanBuildForEnvironment(environment, workerTypes))
-                {
-                    DisplayBuildFailureDialog();
-
-                    return;
-                }
+                var filteredWorkerTypes = BuildSupportChecker.FilterWorkerTypes(environment, workerTypes);
 
                 try
                 {
                     LocalLaunch.BuildConfig();
 
-                    foreach (var workerType in workerTypes)
+                    foreach (var workerType in filteredWorkerTypes)
                     {
                         WorkerBuilder.BuildWorkerForEnvironment(workerType, environment);
                     }
 
-                    Debug.LogFormat("Completed build for {0} target", environment);
+                    if (workerTypes.Length == filteredWorkerTypes.Length)
+                    {
+                        Debug.Log($"Completed build for {environment} target.");
+                    }
+                    else
+                    {
+                        var missingWorkerTypes = string.Join(" ", workerTypes.Except(filteredWorkerTypes));
+                        var completedWorkerTypes = string.Join(" ", workerTypes.Intersect(filteredWorkerTypes));
+                        Debug.LogWarning(
+                            $"Completed build for {environment} target.\n"
+                            + $"Completed builds for: {completedWorkerTypes}\n"
+                            + $"Skipped builds for: {missingWorkerTypes}. See above for more information.");
+                    }
                 }
                 catch (System.Exception)
                 {