Merge pull request #1011 from aws-lumberyard-dev/ly-as-sdk/LYN-2948

Integration of the LY as an SDK work

Code/Framework/AzCore/AzCore/Component/ComponentApplication.cpp

@@ -1260,7 +1260,7 @@ namespace AZ
                 // So auto load is turned off if option "AutoLoad" key is bool that is false
                 if (valueName == "AutoLoad" && !value)
                 {
-                    // Strip off the AutoLoead entry from the path
+                    // Strip off the AutoLoad entry from the path
                     auto autoLoadKey = AZ::StringFunc::TokenizeLast(path, "/");
                     if (!autoLoadKey)
                     {
@@ -1330,7 +1330,7 @@ namespace AZ
                 {
                     auto CompareDynamicModuleDescriptor = [&dynamicLibraryPath](const DynamicModuleDescriptor& entry)
                     {
-                        return entry.m_dynamicLibraryPath.contains(dynamicLibraryPath);
+                        return AZ::IO::PathView(entry.m_dynamicLibraryPath).Stem() == AZ::IO::PathView(dynamicLibraryPath).Stem();
                     };
                     if (auto moduleIter = AZStd::find_if(gemModules.begin(), gemModules.end(), CompareDynamicModuleDescriptor);
                         moduleIter == gemModules.end())

Code/Framework/AzCore/AzCore/IO/Path/Path.h

@@ -95,6 +95,12 @@ namespace AZ::IO
         constexpr int Compare(AZStd::string_view pathString) const noexcept;
         constexpr int Compare(const value_type* pathString) const noexcept;
 
+        // Extension for fixed strings
+        //! extension: fixed string types with MaxPathLength capacity
+        //! Returns a new instance of an AZStd::fixed_string with capacity of MaxPathLength
+        //! made from the internal string
+        constexpr AZStd::fixed_string<MaxPathLength> FixedMaxPathString() const noexcept;
+
         // decomposition
         //! Given a windows path of "C:\O3DE\foo\bar\name.txt" and a posix path of
         //! "/O3DE/foo/bar/name.txt"

Code/Framework/AzCore/AzCore/IO/Path/Path.inl

@@ -915,6 +915,11 @@ namespace AZ::IO
         return compare_string_view(path);
     }
 
+    constexpr AZStd::fixed_string<MaxPathLength> PathView::FixedMaxPathString() const noexcept
+    {
+        return AZStd::fixed_string<MaxPathLength>(m_path.begin(), m_path.end());
+    }
+
     // decomposition
     constexpr auto PathView::RootName() const -> PathView
     {

Code/Framework/AzCore/AzCore/Module/ModuleManager.cpp

@@ -512,7 +512,7 @@ namespace AZ
         // Load DLLs specified in the application descriptor
         for (const auto& moduleDescriptor : modules)
         {
-           // For each module that is loaded, attempt to set the module's folder as a path for dependent module resolution
+            // For each module that is loaded, attempt to set the module's folder as a path for dependent module resolution
             moduleSearchPathHelper.SetModuleSearchPath(moduleDescriptor);
 
             LoadModuleOutcome result = LoadDynamicModule(moduleDescriptor.m_dynamicLibraryPath.c_str(), lastStepToPerform, maintainReferences);

Code/Framework/AzCore/AzCore/Settings/SettingsRegistryMergeUtils.cpp

@@ -88,6 +88,35 @@ namespace AZ::Internal
                     m_enginePaths.emplace_back(EngineInfo{AZ::IO::FixedMaxPath{value}.LexicallyNormal(), {}});
                 }
 
+                AZ::SettingsRegistryInterface::VisitResponse Traverse(
+                    [[maybe_unused]] AZStd::string_view path, AZStd::string_view valueName,
+                    AZ::SettingsRegistryInterface::VisitAction action, AZ::SettingsRegistryInterface::Type type) override
+                {
+                    auto response = AZ::SettingsRegistryInterface::VisitResponse::Continue;
+                    if (action == AZ::SettingsRegistryInterface::VisitAction::Begin)
+                    {
+                        if (type == AZ::SettingsRegistryInterface::Type::Array)
+                        {
+                            if (valueName.compare("engines") != 0)
+                            {
+                                response = AZ::SettingsRegistryInterface::VisitResponse::Skip;
+                            }
+                        }
+                    }
+                    else if (action == AZ::SettingsRegistryInterface::VisitAction::Value)
+                    {
+                        if (type == AZ::SettingsRegistryInterface::Type::String)
+                        {
+                            if (valueName.compare("path") != 0)
+                            {
+                                response = AZ::SettingsRegistryInterface::VisitResponse::Skip;
+                            }
+                        }
+                    }
+
+                    return response;
+                }
+
                 AZStd::vector<EngineInfo> m_enginePaths{};
             };
 

Code/Framework/AzFramework/Platform/Linux/AzFramework/Asset/AssetSystemComponentHelper_Linux.cpp

@@ -35,7 +35,8 @@ namespace AzFramework::AssetSystem::Platform
         if (!AZ::IO::SystemFile::Exists(assetProcessorPath.c_str()))
         {
             // Check for existence of one under a "bin" directory, i.e. engineRoot is an SDK structure.
-            assetProcessorPath = AZ::IO::FixedMaxPath{engineRoot} / "bin" / AZ_BUILD_CONFIGURATION_TYPE / "AssetProcessor";
+            assetProcessorPath =
+                AZ::IO::FixedMaxPath{engineRoot} / "bin" / AZ_TRAIT_OS_PLATFORM_NAME / AZ_BUILD_CONFIGURATION_TYPE / "AssetProcessor";
 
             if (!AZ::IO::SystemFile::Exists(assetProcessorPath.c_str()))
             {

Code/Framework/AzFramework/Platform/Mac/AzFramework/Asset/AssetSystemComponentHelper_Mac.cpp

@@ -34,7 +34,8 @@ namespace AzFramework::AssetSystem::Platform
         if (!AZ::IO::SystemFile::Exists(assetProcessorPath.c_str()))
         {
             // Check for existence of one under a "bin" directory, i.e. engineRoot is an SDK structure.
-            assetProcessorPath = AZ::IO::FixedMaxPath{engineRoot} / "bin" / AZ_BUILD_CONFIGURATION_TYPE / "AssetProcessor.app";
+            assetProcessorPath =
+                AZ::IO::FixedMaxPath{engineRoot} / "bin" / AZ_TRAIT_OS_PLATFORM_NAME / AZ_BUILD_CONFIGURATION_TYPE / "AssetProcessor.app";
 
             if (!AZ::IO::SystemFile::Exists(assetProcessorPath.c_str()))
             {

Code/Framework/AzFramework/Platform/Windows/AzFramework/Asset/AssetSystemComponentHelper_Windows.cpp

@@ -71,7 +71,8 @@ namespace AzFramework::AssetSystem::Platform
         if (!AZ::IO::SystemFile::Exists(assetProcessorPath.c_str()))
         {
             // Check for existence of one under a "bin" directory, i.e. engineRoot is an SDK structure.
-            assetProcessorPath = AZ::IO::FixedMaxPath{engineRoot} / "bin" / AZ_BUILD_CONFIGURATION_TYPE / "AssetProcessor.exe";
+            assetProcessorPath =
+                AZ::IO::FixedMaxPath{engineRoot} / "bin" / AZ_TRAIT_OS_PLATFORM_NAME / AZ_BUILD_CONFIGURATION_TYPE / "AssetProcessor.exe";
 
             if (!AZ::IO::SystemFile::Exists(assetProcessorPath.c_str()))
             {