From 6a7a86062e4335a90c702111ae1837134a145da9 Mon Sep 17 00:00:00 2001
From: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
Date: Thu, 13 May 2021 14:00:05 -0700
Subject: [PATCH] Updates AutomatedTesting project and adds atom support

---
 AutomatedTesting/Gem/Code/CMakeLists.txt      | 61 +++++++------------
 .../AtomBridge/Code/CMakeLists.txt            |  9 +++
 Gems/AudioSystem/Code/CMakeLists.txt          |  4 +-
 Gems/Multiplayer/Code/CMakeLists.txt          |  1 -
 4 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/AutomatedTesting/Gem/Code/CMakeLists.txt b/AutomatedTesting/Gem/Code/CMakeLists.txt
index e81156c3aa..9315bf8397 100644
--- a/AutomatedTesting/Gem/Code/CMakeLists.txt
+++ b/AutomatedTesting/Gem/Code/CMakeLists.txt
@@ -32,46 +32,31 @@ ly_add_target(
 # Gem dependencies
 ################################################################################
 
-# The GameLauncher uses "Client" gem variants:
+# The GameLauncher uses "Clients" gem variants:
 ly_enable_gems(PROJECT_NAME AutomatedTesting GEM_FILE enabled_gems.cmake
     TARGETS AutomatedTesting.GameLauncher
     VARIANTS Clients)
 
-# The Editor uses Tools gem variants:
-ly_enable_gems(
-    PROJECT_NAME AutomatedTesting GEM_FILE enabled_gems.cmake
-    TARGETS Editor
-    VARIANTS Tools)
-
-# The pipeline tools use Builders gem variants:
-ly_enable_gems(
-    PROJECT_NAME AutomatedTesting GEM_FILE enabled_gems.cmake
-    TARGETS AssetBuilder AssetProcessor AssetProcessorBatch
-    VARIANTS Builders)
-
-# old system (remove when all gems are ported to the new system above)
-
-ly_add_project_dependencies(
-    PROJECT_NAME
-        AutomatedTesting
-    TARGETS 
-        AutomatedTesting.GameLauncher
-    DEPENDENCIES_FILES
-        runtime_dependencies.cmake
-        ${pal_dir}/runtime_dependencies.cmake
-)
-
-if(PAL_TRAIT_BUILD_HOST_TOOLS)
-    ly_add_project_dependencies(
-        PROJECT_NAME
-            AutomatedTesting
-        TARGETS
-            AssetBuilder
-            AssetProcessor
-            AssetProcessorBatch
-            Editor
-        DEPENDENCIES_FILES
-            tool_dependencies.cmake
-            ${pal_dir}/tool_dependencies.cmake
-    )
+# If we build a server, then apply the gems to the server
+if(PAL_TRAIT_BUILD_SERVER_SUPPORTED)
+    # if we're making a server, then add the "Server" gem variants to it:
+    ly_enable_gems(PROJECT_NAME AutomatedTesting GEM_FILE enabled_gems.cmake
+        TARGETS AutomatedTesting.ServerLauncher
+        VARIANTS Servers)
+    
+    set_property(GLOBAL APPEND PROPERTY LY_LAUNCHER_SERVER_PROJECTS AutomatedTesting)
+endif()
+
+if (PAL_TRAIT_BUILD_HOST_TOOLS)
+    # The Editor uses "Tools" gem variants:
+    ly_enable_gems(
+        PROJECT_NAME AutomatedTesting GEM_FILE enabled_gems.cmake
+        TARGETS Editor
+        VARIANTS Tools)
+
+    # The pipeline tools use "Builders" gem variants:
+    ly_enable_gems(
+        PROJECT_NAME AutomatedTesting GEM_FILE enabled_gems.cmake
+        TARGETS AssetBuilder AssetProcessor AssetProcessorBatch
+        VARIANTS Builders)
 endif()
diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt b/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt
index c431746b40..85d84a5dc0 100644
--- a/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt
+++ b/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt
@@ -66,6 +66,10 @@ ly_add_target(
         Gem::AtomViewportDisplayInfo
 )
 
+# Any 'runtime-like' applications should use Gem::Atom_AtomBridge:
+ly_create_alias(NAME Atom_AtomBridge.Clients NAMESPACE Gem TARGETS Gem::Atom_AtomBridge)
+ly_create_alias(NAME Atom_AtomBridge.Servers NAMESPACE Gem TARGETS Gem::Atom_AtomBridge)
+
 if(PAL_TRAIT_BUILD_HOST_TOOLS)
     ly_add_target(
         NAME Atom_AtomBridge.Editor ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
@@ -107,4 +111,9 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
             Gem::AtomToolsFramework.Editor
             Gem::AtomViewportDisplayInfo
     )
+
+
+    # Any 'tool' and 'builder' type applications should use Gem::Atom_AtomBridge.Editor:
+    ly_create_alias(NAME Atom_AtomBridge.Builders NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Editor)
+    ly_create_alias(NAME Atom_AtomBridge.Tools    NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Editor)
 endif()
diff --git a/Gems/AudioSystem/Code/CMakeLists.txt b/Gems/AudioSystem/Code/CMakeLists.txt
index dfb80a15d5..a0a8328147 100644
--- a/Gems/AudioSystem/Code/CMakeLists.txt
+++ b/Gems/AudioSystem/Code/CMakeLists.txt
@@ -217,8 +217,8 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
     )
 
     # use the above "Editor" target in tools and builders:
-    ly_create_alias(NAME AssetMemoryAnalyzer.Tools    NAMESPACE Gem TARGETS Gem::AudioSystem.Editor)
-    ly_create_alias(NAME AssetMemoryAnalyzer.Builders NAMESPACE Gem TARGETS Gem::AudioSystem.Editor)
+    ly_create_alias(NAME AudioSystem.Tools    NAMESPACE Gem TARGETS Gem::AudioSystem.Editor)
+    ly_create_alias(NAME AudioSystem.Builders NAMESPACE Gem TARGETS Gem::AudioSystem.Editor)
 
     if (PAL_TRAIT_BUILD_TESTS_SUPPORTED)
         ly_add_target(
diff --git a/Gems/Multiplayer/Code/CMakeLists.txt b/Gems/Multiplayer/Code/CMakeLists.txt
index 84a1cf7546..800670ff92 100644
--- a/Gems/Multiplayer/Code/CMakeLists.txt
+++ b/Gems/Multiplayer/Code/CMakeLists.txt
@@ -154,7 +154,6 @@ if (PAL_TRAIT_BUILD_HOST_TOOLS)
     # use the Multiplayer.Editor module in tools and builders.  Tools also get the visual debug view
     ly_create_alias(NAME Multiplayer.Tools     NAMESPACE Gem TARGETS Gem::Multiplayer.Editor Gem::Multiplayer.Debug Gem::Multiplayer.PrefabProcessor)
     ly_create_alias(NAME Multiplayer.Builders  NAMESPACE Gem TARGETS Gem::Multiplayer.Editor Gem::Multiplayer.PrefabProcessor)
-
 endif()
 
 if (PAL_TRAIT_BUILD_TESTS_SUPPORTED)