Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere

2021-05-26 00:38:51 -05:00
parent 59934e6be1 e886dba77e
commit 4652d47fb3
106 changed files with 861 additions and 616 deletions
@@ -31,27 +31,32 @@ ly_add_target(
 ################################################################################
 # Gem dependencies
 ################################################################################
-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
-    )
+# The GameLauncher uses "Clients" gem variants:
+ly_enable_gems(PROJECT_NAME AutomatedTesting GEM_FILE enabled_gems.cmake
+    TARGETS AutomatedTesting.GameLauncher
+    VARIANTS Clients)
+
+# 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()
@@ -0,0 +1,57 @@
+#
+# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+# its licensors.
+#
+# For complete copyright and license terms please see the LICENSE at the root of this
+# distribution (the "License"). All use of this software is governed by the License,
+# or, if provided, by the license below or the license accompanying this file. Do not
+# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+
+set(ENABLED_GEMS
+    ImGui
+    ScriptEvents
+    ExpressionEvaluation
+    Gestures
+    CertificateManager
+    DebugDraw
+    SceneProcessing
+    GraphCanvas
+    InAppPurchases
+    AutomatedTesting
+    EditorPythonBindings
+    PythonAssetBuilder
+    Metastream
+    AudioSystem
+    Camera
+    EMotionFX
+    PhysX
+    CameraFramework
+    StartingPointMovement
+    StartingPointCamera
+    ScriptCanvas
+    ScriptCanvasPhysics
+    ScriptCanvasTesting
+    LyShineExamples
+    StartingPointInput
+    PhysXDebug
+    WhiteBox
+    FastNoise
+    SurfaceData
+    GradientSignal
+    Vegetation
+    GraphModel
+    LandscapeCanvas
+    NvCloth
+    Blast
+    Maestro
+    TextureAtlas
+    LmbrCentral
+    LyShine
+    HttpRequestor
+    Atom_AtomBridge
+    AWSCore
+    AWSClientAuth
+    AWSMetrics
+    )
@@ -1,48 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the License). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an AS IS BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-# Extracted from Game
-set(GEM_DEPENDENCIES
-    Gem::Maestro
-    Gem::TextureAtlas
-    Gem::LmbrCentral
-    Gem::LyShine
-    Gem::HttpRequestor
-    Gem::ScriptEvents
-    Gem::ExpressionEvaluation
-    Gem::Gestures
-    Gem::CertificateManager
-    Gem::DebugDraw
-    Gem::AudioSystem
-    Gem::InAppPurchases
-    Gem::AutomatedTesting
-    Gem::Metastream
-    Gem::Camera
-    Gem::EMotionFX
-    Gem::PhysX
-    Gem::CameraFramework
-    Gem::StartingPointMovement
-    Gem::StartingPointCamera
-    Gem::ScriptCanvas
-    Gem::ImGui
-    Gem::LyShineExamples
-    Gem::StartingPointInput
-    Gem::ScriptCanvasPhysics
-    Gem::PhysXDebug
-    Gem::WhiteBox
-    Gem::FastNoise
-    Gem::SurfaceData
-    Gem::GradientSignal
-    Gem::Vegetation
-    Gem::Atom_AtomBridge
-    Gem::NvCloth
-    Gem::Blast
-)
@@ -1,60 +0,0 @@
-#
-# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
-# its licensors.
-#
-# For complete copyright and license terms please see the LICENSE at the root of this
-# distribution (the License). All use of this software is governed by the License,
-# or, if provided, by the license below or the license accompanying this file. Do not
-# remove or modify any license notices. This file is distributed on an AS IS BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#
-
-# Extracted from Editor.xml
-set(GEM_DEPENDENCIES
-    Gem::Maestro.Editor
-    Gem::TextureAtlas.Editor
-    Gem::LmbrCentral.Editor
-    Gem::LyShine.Editor
-    Gem::HttpRequestor
-    Gem::ScriptEvents.Editor
-    Gem::ExpressionEvaluation
-    Gem::Gestures
-    Gem::CertificateManager
-    Gem::DebugDraw.Editor
-    Gem::SceneProcessing.Editor
-    Gem::GraphCanvas.Editor
-    Gem::InAppPurchases
-    Gem::AutomatedTesting
-    Gem::EditorPythonBindings.Editor
-    Gem::PythonAssetBuilder.Editor
-    Gem::Metastream
-    Gem::AudioSystem.Editor
-    Gem::Camera.Editor
-    Gem::EMotionFX.Editor
-    Gem::PhysX.Editor
-    Gem::CameraFramework
-    Gem::StartingPointMovement
-    Gem::StartingPointCamera
-    Gem::ScriptCanvas.Editor
-    Gem::ScriptEvents.Editor
-    Gem::ImGui.Editor
-    Gem::LyShineExamples
-    Gem::StartingPointInput.Editor
-    Gem::ScriptCanvasPhysics
-    Gem::ScriptCanvasTesting.Editor
-    Gem::PhysXDebug.Editor
-    Gem::WhiteBox.Editor
-    Gem::FastNoise.Editor
-    Gem::SurfaceData.Editor
-    Gem::GradientSignal.Editor
-    Gem::Vegetation.Editor
-    Gem::GraphModel.Editor
-    Gem::LandscapeCanvas.Editor
-    Gem::EMotionFX.Editor
-    Gem::ImGui.Editor
-    Gem::Atom_RHI.Private
-    Gem::Atom_Feature_Common.Editor
-    Gem::Atom_AtomBridge.Editor
-    Gem::NvCloth.Editor
-    Gem::Blast.Editor
-)