Updated Launching of Lua Editor to supply the project-path (#7706)
* Updated Launching of Lua Editor to supply the project-path The Lua Launch logic also uses the AzFramework ProcessLauncher instead of Qt. This has the benefit of being able to pass arguments as an array instead of in a single string. Therefore paths with spaces in them also work. Tweak the Settings Registry logic to locate the project-path/engine-path by scanning upwards for a project.json/engine.json respectively to inject the found paths to the front of the command line parameters instead of the back. This has the effect of making sure that command line parameters for the project-path/engine-path always takes precedence over scanning upwards for a project.json/engine.json. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Removed prepend of EngineRoot in CheckProjectPathProvided The Editor would attempt to validate that the project path supplied via the command line contained a valid project.json file before contining the Editor startup flow. This was taking the engine root path and appending the project path to it, which works when the project path is absolute But when the project path is relative it is treated as relative to the current working directory by the SettingsRegistry, but the logic in the CheckProjectPathProvided was treating it has relative to the engine root. Therefore supplying a relative path as part of the Editor.exe launch command would fail. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Fixed resolving of relative paths to absolute paths in the Editor The Editor was changing the current working directory to the nearest ancestor directory containing an `engine.json` file. This resulted in the ConvertToAbsolutePath function resolving relative paths to that directory instead of the launch directory of the Editor. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
This commit is contained in:
lumberyard-employee-dm
committed by
GitHub
GitHub
parent
606b4e9ec3
commit
669caca9cc
@@ -85,6 +85,16 @@ namespace AZ::Internal
|
||||
[[maybe_unused]] AZ::SettingsRegistryInterface::Type type, AZStd::string_view value) override
|
||||
{
|
||||
m_enginePaths.emplace_back(EngineInfo{ AZ::IO::FixedMaxPath{value}.LexicallyNormal(), FixedValueString{valueName} });
|
||||
// Make sure any engine paths read from the manifest are absolute
|
||||
AZ::IO::FixedMaxPath& recentEnginePath = m_enginePaths.back().m_path;
|
||||
if (recentEnginePath.IsRelative())
|
||||
{
|
||||
if (auto engineRootAbsPath = AZ::Utils::ConvertToAbsolutePath(recentEnginePath.Native());
|
||||
engineRootAbsPath.has_value())
|
||||
{
|
||||
recentEnginePath = AZStd::move(*engineRootAbsPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
AZStd::vector<EngineInfo> m_enginePaths{};
|
||||
@@ -209,8 +219,15 @@ namespace AZ::Internal
|
||||
return {};
|
||||
}
|
||||
|
||||
void InjectSettingToCommandLineBack(AZ::SettingsRegistryInterface& settingsRegistry,
|
||||
AZStd::string_view path, AZStd::string_view value)
|
||||
enum class InjectLocation : bool
|
||||
{
|
||||
Front,
|
||||
Back
|
||||
};
|
||||
|
||||
void InjectSettingToCommandLine(AZ::SettingsRegistryInterface& settingsRegistry,
|
||||
AZStd::string_view path, AZStd::string_view value,
|
||||
InjectLocation injectLocation = InjectLocation::Front)
|
||||
{
|
||||
AZ::CommandLine commandLine;
|
||||
AZ::SettingsRegistryMergeUtils::GetCommandLineFromRegistry(settingsRegistry, commandLine);
|
||||
@@ -219,7 +236,8 @@ namespace AZ::Internal
|
||||
|
||||
auto projectPathOverride = AZStd::string::format(R"(--regset="%.*s=%.*s")",
|
||||
aznumeric_cast<int>(path.size()), path.data(), aznumeric_cast<int>(value.size()), value.data());
|
||||
paramContainer.emplace(paramContainer.end(), AZStd::move(projectPathOverride));
|
||||
auto emplaceIter = injectLocation == InjectLocation::Front ? paramContainer.begin() : paramContainer.end();
|
||||
paramContainer.emplace(emplaceIter, AZStd::move(projectPathOverride));
|
||||
commandLine.Parse(paramContainer);
|
||||
AZ::SettingsRegistryMergeUtils::StoreCommandLineToRegistry(settingsRegistry, commandLine);
|
||||
}
|
||||
@@ -244,13 +262,26 @@ namespace AZ::SettingsRegistryMergeUtils
|
||||
{
|
||||
// We can scan up from exe directory to find engine.json, use that for engine root if it exists.
|
||||
engineRoot = Internal::ScanUpRootLocator("engine.json");
|
||||
// The Internal ScanUp Engine Root Key will be set as an absolute path
|
||||
if (!engineRoot.empty())
|
||||
{
|
||||
if (engineRoot.IsRelative())
|
||||
{
|
||||
if (auto engineRootAbsPath = AZ::Utils::ConvertToAbsolutePath(engineRoot.Native());
|
||||
engineRootAbsPath.has_value())
|
||||
{
|
||||
engineRoot = AZStd::move(*engineRootAbsPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Set the {InternalScanUpEngineRootKey} to make sure this code path isn't called again for this settings registry
|
||||
settingsRegistry.Set(InternalScanUpEngineRootKey, engineRoot.Native());
|
||||
if (!engineRoot.empty())
|
||||
{
|
||||
settingsRegistry.Set(engineRootKey, engineRoot.Native());
|
||||
// Inject the engine root at the end of the command line settings
|
||||
Internal::InjectSettingToCommandLineBack(settingsRegistry, engineRootKey, engineRoot.Native());
|
||||
// Inject the engine root to the front of the command line settings
|
||||
Internal::InjectSettingToCommandLine(settingsRegistry, engineRootKey, engineRoot.Native());
|
||||
return engineRoot;
|
||||
}
|
||||
}
|
||||
@@ -258,6 +289,14 @@ namespace AZ::SettingsRegistryMergeUtils
|
||||
// Step 2 check if the engine_path key has been supplied
|
||||
if (settingsRegistry.Get(engineRoot.Native(), engineRootKey); !engineRoot.empty())
|
||||
{
|
||||
if (engineRoot.IsRelative())
|
||||
{
|
||||
if (auto engineRootAbsPath = AZ::Utils::ConvertToAbsolutePath(engineRoot.Native());
|
||||
engineRootAbsPath.has_value())
|
||||
{
|
||||
engineRoot = AZStd::move(*engineRootAbsPath);
|
||||
}
|
||||
}
|
||||
return engineRoot;
|
||||
}
|
||||
|
||||
@@ -298,13 +337,28 @@ namespace AZ::SettingsRegistryMergeUtils
|
||||
if (settingsRegistry.GetType(InternalScanUpProjectRootKey) == Type::NoType)
|
||||
{
|
||||
projectRoot = Internal::ScanUpRootLocator("project.json");
|
||||
// Convert the path to an absolute path before adding it as a setting to the
|
||||
// InternalScanUpProjectRootKey
|
||||
if (!projectRoot.empty())
|
||||
{
|
||||
if (projectRoot.IsRelative())
|
||||
{
|
||||
if (auto projectAbsPath = AZ::Utils::ConvertToAbsolutePath(projectRoot.Native());
|
||||
projectAbsPath.has_value())
|
||||
{
|
||||
projectRoot = AZStd::move(*projectAbsPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Set the {InternalScanUpProjectRootKey} to make sure this code path isn't called again for this settings registry
|
||||
settingsRegistry.Set(InternalScanUpProjectRootKey, projectRoot.Native());
|
||||
if (!projectRoot.empty())
|
||||
{
|
||||
settingsRegistry.Set(projectRootKey, projectRoot.c_str());
|
||||
// Inject the project root at the end of the command line settings
|
||||
Internal::InjectSettingToCommandLineBack(settingsRegistry, projectRootKey, projectRoot.Native());
|
||||
// Inject the project root at to the front of the command line settings
|
||||
Internal::InjectSettingToCommandLine(settingsRegistry, projectRootKey, projectRoot.Native());
|
||||
|
||||
return projectRoot;
|
||||
}
|
||||
}
|
||||
@@ -312,6 +366,18 @@ namespace AZ::SettingsRegistryMergeUtils
|
||||
// Step 2 Check the project-path key
|
||||
// This is the project path root key, as passed from command-line or *.setreg files.
|
||||
settingsRegistry.Get(projectRoot.Native(), projectRootKey);
|
||||
if (!projectRoot.empty())
|
||||
{
|
||||
if (projectRoot.IsRelative())
|
||||
{
|
||||
if (auto projectAbsPath = AZ::Utils::ConvertToAbsolutePath(projectRoot.Native());
|
||||
projectAbsPath.has_value())
|
||||
{
|
||||
projectRoot = AZStd::move(*projectAbsPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return projectRoot;
|
||||
}
|
||||
|
||||
@@ -325,13 +391,22 @@ namespace AZ::SettingsRegistryMergeUtils
|
||||
constexpr auto projectCachePathKey = FixedValueString(BootstrapSettingsRootKey) + "/project_cache_path";
|
||||
|
||||
// Step 1 Check the project-cache-path key
|
||||
if (AZ::IO::FixedMaxPath projectCachePath; settingsRegistry.Get(projectCachePath.Native(), projectCachePathKey))
|
||||
AZ::IO::FixedMaxPath projectCachePath;
|
||||
if (!settingsRegistry.Get(projectCachePath.Native(), projectCachePathKey))
|
||||
{
|
||||
return projectCachePath;
|
||||
// Step 2 Append the "Cache" directory to the project-path
|
||||
projectCachePath = projectPath / Internal::ProductCacheDirectoryName;
|
||||
}
|
||||
|
||||
// Step 2 Append the "Cache" directory to the project-path
|
||||
return projectPath / Internal::ProductCacheDirectoryName;
|
||||
if (projectCachePath.IsRelative())
|
||||
{
|
||||
if (auto projectCacheAbsPath = AZ::Utils::ConvertToAbsolutePath(projectCachePath.Native());
|
||||
projectCacheAbsPath.has_value())
|
||||
{
|
||||
projectCachePath = AZStd::move(*projectCacheAbsPath);
|
||||
}
|
||||
}
|
||||
return projectCachePath;
|
||||
}
|
||||
|
||||
//! Set the user directory with the provided path or using <project-path>/user as default
|
||||
@@ -344,13 +419,22 @@ namespace AZ::SettingsRegistryMergeUtils
|
||||
constexpr auto projectUserPathKey = FixedValueString(BootstrapSettingsRootKey) + "/project_user_path";
|
||||
|
||||
// Step 1 Check the project-user-path key
|
||||
if (AZ::IO::FixedMaxPath projectUserPath; settingsRegistry.Get(projectUserPath.Native(), projectUserPathKey))
|
||||
AZ::IO::FixedMaxPath projectUserPath;
|
||||
if (!settingsRegistry.Get(projectUserPath.Native(), projectUserPathKey))
|
||||
{
|
||||
return projectUserPath;
|
||||
// Step 2 Append the "User" directory to the project-path
|
||||
projectUserPath = projectPath / "user";
|
||||
}
|
||||
|
||||
// Step 2 Append the "User" directory to the project-path
|
||||
return projectPath / "user";
|
||||
if (projectUserPath.IsRelative())
|
||||
{
|
||||
if (auto projectUserAbsPath = AZ::Utils::ConvertToAbsolutePath(projectUserPath.Native());
|
||||
projectUserAbsPath.has_value())
|
||||
{
|
||||
projectUserPath = AZStd::move(*projectUserAbsPath);
|
||||
}
|
||||
}
|
||||
return projectUserPath;
|
||||
}
|
||||
|
||||
//! Set the log directory using the settings registry path or using <project-user-path>/log as default
|
||||
@@ -363,20 +447,37 @@ namespace AZ::SettingsRegistryMergeUtils
|
||||
constexpr auto projectLogPathKey = FixedValueString(BootstrapSettingsRootKey) + "/project_log_path";
|
||||
|
||||
// Step 1 Check the project-user-path key
|
||||
if (AZ::IO::FixedMaxPath projectLogPath; settingsRegistry.Get(projectLogPath.Native(), projectLogPathKey))
|
||||
AZ::IO::FixedMaxPath projectLogPath;
|
||||
if (!settingsRegistry.Get(projectLogPath.Native(), projectLogPathKey))
|
||||
{
|
||||
return projectLogPath;
|
||||
// Step 2 Append the "Log" directory to the project-user-path
|
||||
projectLogPath = projectUserPath / "log";
|
||||
}
|
||||
|
||||
// Step 2 Append the "Log" directory to the project-user-path
|
||||
return projectUserPath / "log";
|
||||
if (projectLogPath.IsRelative())
|
||||
{
|
||||
if (auto projectLogAbsPath = AZ::Utils::ConvertToAbsolutePath(projectLogPath.Native()))
|
||||
{
|
||||
projectLogPath = AZStd::move(*projectLogAbsPath);
|
||||
}
|
||||
}
|
||||
|
||||
return projectLogPath;
|
||||
}
|
||||
|
||||
// check for a default write storage path, fall back to the <project-user-path> if not
|
||||
static AZ::IO::FixedMaxPath FindDevWriteStoragePath(const AZ::IO::FixedMaxPath& projectUserPath)
|
||||
{
|
||||
AZStd::optional<AZ::IO::FixedMaxPathString> devWriteStorage = Utils::GetDevWriteStoragePath();
|
||||
return devWriteStorage.has_value() ? *devWriteStorage : projectUserPath;
|
||||
AZ::IO::FixedMaxPath devWriteStoragePath = devWriteStorage.has_value() ? *devWriteStorage : projectUserPath;
|
||||
if (devWriteStoragePath.IsRelative())
|
||||
{
|
||||
if (auto devWriteStorageAbsPath = AZ::Utils::ConvertToAbsolutePath(devWriteStoragePath.Native()))
|
||||
{
|
||||
devWriteStoragePath = AZStd::move(*devWriteStorageAbsPath);
|
||||
}
|
||||
}
|
||||
return devWriteStoragePath;
|
||||
}
|
||||
|
||||
// check for the project build path, which is a relative path from the project root
|
||||
@@ -669,15 +770,6 @@ namespace AZ::SettingsRegistryMergeUtils
|
||||
if ([[maybe_unused]] constexpr auto projectPathKey = FixedValueString(BootstrapSettingsRootKey) + "/project_path";
|
||||
!projectPath.empty())
|
||||
{
|
||||
if (projectPath.IsRelative())
|
||||
{
|
||||
if (auto projectAbsPath = AZ::Utils::ConvertToAbsolutePath(projectPath.Native());
|
||||
projectAbsPath.has_value())
|
||||
{
|
||||
projectPath = AZStd::move(*projectAbsPath);
|
||||
}
|
||||
}
|
||||
|
||||
projectPath = projectPath.LexicallyNormal();
|
||||
AZ_Warning("SettingsRegistryMergeUtils", AZ::IO::SystemFile::Exists(projectPath.c_str()),
|
||||
R"(Project path "%s" does not exist. Is the "%.*s" registry setting set to a valid absolute path?)"
|
||||
@@ -699,15 +791,6 @@ namespace AZ::SettingsRegistryMergeUtils
|
||||
AZ::IO::FixedMaxPath engineRoot = FindEngineRoot(registry);
|
||||
if (!engineRoot.empty())
|
||||
{
|
||||
if (engineRoot.IsRelative())
|
||||
{
|
||||
if (auto engineRootAbsPath = AZ::Utils::ConvertToAbsolutePath(engineRoot.Native());
|
||||
engineRootAbsPath.has_value())
|
||||
{
|
||||
engineRoot = AZStd::move(*engineRootAbsPath);
|
||||
}
|
||||
}
|
||||
|
||||
engineRoot = engineRoot.LexicallyNormal();
|
||||
registry.Set(FilePathKey_EngineRootFolder, engineRoot.Native());
|
||||
}
|
||||
@@ -716,15 +799,6 @@ namespace AZ::SettingsRegistryMergeUtils
|
||||
AZ::IO::FixedMaxPath projectCachePath = FindProjectCachePath(registry, projectPath).LexicallyNormal();
|
||||
if (!projectCachePath.empty())
|
||||
{
|
||||
if (projectCachePath.IsRelative())
|
||||
{
|
||||
if (auto projectCacheAbsPath = AZ::Utils::ConvertToAbsolutePath(projectCachePath.Native());
|
||||
projectCacheAbsPath.has_value())
|
||||
{
|
||||
projectCachePath = AZStd::move(*projectCacheAbsPath);
|
||||
}
|
||||
}
|
||||
|
||||
projectCachePath = projectCachePath.LexicallyNormal();
|
||||
registry.Set(FilePathKey_CacheProjectRootFolder, projectCachePath.Native());
|
||||
|
||||
@@ -755,15 +829,6 @@ namespace AZ::SettingsRegistryMergeUtils
|
||||
AZ::IO::FixedMaxPath projectUserPath = FindProjectUserPath(registry, projectPath);
|
||||
if (!projectUserPath.empty())
|
||||
{
|
||||
if (projectUserPath.IsRelative())
|
||||
{
|
||||
if (auto projectUserAbsPath = AZ::Utils::ConvertToAbsolutePath(projectUserPath.Native());
|
||||
projectUserAbsPath.has_value())
|
||||
{
|
||||
projectUserPath = AZStd::move(*projectUserAbsPath);
|
||||
}
|
||||
}
|
||||
|
||||
projectUserPath = projectUserPath.LexicallyNormal();
|
||||
registry.Set(FilePathKey_ProjectUserPath, projectUserPath.Native());
|
||||
}
|
||||
@@ -771,14 +836,6 @@ namespace AZ::SettingsRegistryMergeUtils
|
||||
// Log folder
|
||||
if (AZ::IO::FixedMaxPath projectLogPath = FindProjectLogPath(registry, projectUserPath); !projectLogPath.empty())
|
||||
{
|
||||
if (projectLogPath.IsRelative())
|
||||
{
|
||||
if (auto projectLogAbsPath = AZ::Utils::ConvertToAbsolutePath(projectLogPath.Native()))
|
||||
{
|
||||
projectLogPath = AZStd::move(*projectLogAbsPath);
|
||||
}
|
||||
}
|
||||
|
||||
projectLogPath = projectLogPath.LexicallyNormal();
|
||||
registry.Set(FilePathKey_ProjectLogPath, projectLogPath.Native());
|
||||
}
|
||||
@@ -786,14 +843,6 @@ namespace AZ::SettingsRegistryMergeUtils
|
||||
// Developer Write Storage folder
|
||||
if (AZ::IO::FixedMaxPath devWriteStoragePath = FindDevWriteStoragePath(projectUserPath); !devWriteStoragePath.empty())
|
||||
{
|
||||
if (devWriteStoragePath.IsRelative())
|
||||
{
|
||||
if (auto devWriteStorageAbsPath = AZ::Utils::ConvertToAbsolutePath(devWriteStoragePath.Native()))
|
||||
{
|
||||
devWriteStoragePath = AZStd::move(*devWriteStorageAbsPath);
|
||||
}
|
||||
}
|
||||
|
||||
devWriteStoragePath = devWriteStoragePath.LexicallyNormal();
|
||||
registry.Set(FilePathKey_DevWriteStorage, devWriteStoragePath.Native());
|
||||
}
|
||||
|
||||
@@ -89,15 +89,14 @@ namespace AZ::SettingsRegistryMergeUtils
|
||||
//! The algorithm that is used to find the project root is as follows
|
||||
//! 1. The first time this function runs it performs an upward scan for a "project.json" file from
|
||||
//! the executable directory and stores that path into an internal key.
|
||||
//! In the same step it injects the path into the back of the command line parameters
|
||||
//! In the same step it injects the path into the front of the command line parameters
|
||||
//! using the --regset="{BootstrapSettingsRootKey}/project_path=<path>" value
|
||||
//! 2. Next the "{BootstrapSettingsRootKey}/project_path" is checked to see if it has a project path set
|
||||
//!
|
||||
//! The order in which the project path settings are overridden proceeds in the following order
|
||||
//! 1. project_path set in the <engine-root>/bootstrap.cfg file
|
||||
//! 2. project_path set in a *.setreg/*.setregpatch file
|
||||
//! 3. project_path found by scanning upwards from the executable directory to the project.json path
|
||||
//! 4. project_path set on the Command line via either --regset="{BootstrapSettingsRootKey}/project_path=<path>"
|
||||
//! 1. project_path set in a *.setreg/*.setregpatch file
|
||||
//! 2. project_path found by scanning upwards from the executable directory to the project.json path
|
||||
//! 3. project_path set on the Command line via either --regset="{BootstrapSettingsRootKey}/project_path=<path>"
|
||||
//! or --project_path=<path>
|
||||
AZ::IO::FixedMaxPath FindProjectRoot(SettingsRegistryInterface& settingsRegistry);
|
||||
|
||||
@@ -213,9 +212,15 @@ namespace AZ::SettingsRegistryMergeUtils
|
||||
const SettingsRegistryInterface::Specializations& specializations, AZStd::vector<char>* scratchBuffer = nullptr);
|
||||
|
||||
//! Adds the settings set through the command line to the Settings Registry. This will also execute any Settings
|
||||
//! Registry related arguments. Note that --regset and -regremove will run in the order in which they are parsed
|
||||
//! Registry related arguments. Note that --regset, --regset-file and -regremove will run in the order in which they are parsed
|
||||
//! --regset <arg> Sets a value in the registry. See MergeCommandLineArgument for options for <arg>
|
||||
//! example: --regset "/My/String/Value=String value set"
|
||||
//! --regset-file <path>[::anchor] Merges the specified file into the Settings registry
|
||||
//! If the extension is .setregpatch, then JSON Patch will be used to merge the file otherwise JSON Merge Patch will be used
|
||||
//! `anchor` is a JSON path used to optionally select where to merge the settings underneath, otherwise settings are merged
|
||||
//! under the root.
|
||||
//! example: --regset-file="C:/Users/testuser/custom.setreg"
|
||||
//! example: --regset-file="relative/path/other.setregpatch::/O3DE/settings"
|
||||
//! --regremove <arg> Removes a value in the registry
|
||||
//! example: --regremove "/My/String/Value"
|
||||
//! only when executeCommands is true are the following options supported:
|
||||
|
||||
@@ -64,7 +64,7 @@ namespace AzFramework::ProjectManager
|
||||
// If we were able to locate a path to a project, we're done
|
||||
if (!projectRootPath.empty())
|
||||
{
|
||||
AZ::IO::FixedMaxPath projectJsonPath = engineRootPath / projectRootPath / "project.json";
|
||||
AZ::IO::FixedMaxPath projectJsonPath = projectRootPath / "project.json";
|
||||
if (AZ::IO::SystemFile::Exists(projectJsonPath.c_str()))
|
||||
{
|
||||
return ProjectPathCheckResult::ProjectPathFound;
|
||||
|
||||
-4
@@ -208,10 +208,6 @@ namespace LegacyFramework
|
||||
*/
|
||||
virtual bool IsRunningInGUIMode() = 0;
|
||||
|
||||
/** Retrieve a Command Line Parser object that you can then use to check for values on the command line
|
||||
*/
|
||||
virtual const AzFramework::CommandLine* GetCommandLineParser() = 0;
|
||||
|
||||
/** (Windows) retrieves the main module of the executable.
|
||||
* This is always going to be the main executable except in the situation where the framework may be running as a DLL belonging to another process or program.
|
||||
*/
|
||||
|
||||
+5
-12
@@ -97,6 +97,10 @@ namespace LegacyFramework
|
||||
}
|
||||
|
||||
Application::Application()
|
||||
: Application(0, nullptr)
|
||||
{}
|
||||
Application::Application(int argc, char** argv)
|
||||
: ComponentApplication(argc, argv)
|
||||
{
|
||||
m_isPrimary = true;
|
||||
m_desiredExitCode = 0;
|
||||
@@ -191,9 +195,6 @@ namespace LegacyFramework
|
||||
::SetConsoleCtrlHandler(CTRL_BREAK_HandlerRoutine, true);
|
||||
#endif
|
||||
|
||||
m_ptrCommandLineParser = aznew AzFramework::CommandLine();
|
||||
m_ptrCommandLineParser->Parse(m_desc.m_argc, m_desc.m_argv);
|
||||
|
||||
// If we don't have one create a serialize context
|
||||
if (GetSerializeContext() == nullptr)
|
||||
{
|
||||
@@ -206,7 +207,7 @@ namespace LegacyFramework
|
||||
m_ptrSystemEntity->Activate();
|
||||
|
||||
// If we aren't the primary, RunAsAnotherInstance unless we are being forcestarted
|
||||
if (!m_isPrimary && !m_ptrCommandLineParser->HasSwitch("forcestart"))
|
||||
if (!m_isPrimary && !m_commandLine.HasSwitch("forcestart"))
|
||||
{
|
||||
// Required for the application component to handle RunAsAnotherInstance
|
||||
CreateApplicationComponent();
|
||||
@@ -246,9 +247,6 @@ namespace LegacyFramework
|
||||
::SetConsoleCtrlHandler(CTRL_BREAK_HandlerRoutine, false);
|
||||
#endif
|
||||
|
||||
delete m_ptrCommandLineParser;
|
||||
m_ptrCommandLineParser = nullptr;
|
||||
|
||||
CoreMessageBus::Handler::BusDisconnect();
|
||||
FrameworkApplicationMessages::Handler::BusDisconnect();
|
||||
|
||||
@@ -271,11 +269,6 @@ namespace LegacyFramework
|
||||
}
|
||||
}
|
||||
|
||||
const AzFramework::CommandLine* Application::GetCommandLineParser()
|
||||
{
|
||||
return m_ptrCommandLineParser;
|
||||
}
|
||||
|
||||
// returns TRUE if the component already existed, FALSE if it had to create one.
|
||||
bool Application::EnsureComponentCreated(AZ::Uuid componentCRC)
|
||||
{
|
||||
|
||||
+1
-2
@@ -56,6 +56,7 @@ namespace LegacyFramework
|
||||
using CoreMessageBus::Handler::Run;
|
||||
virtual int Run(const ApplicationDesc& desc);
|
||||
Application();
|
||||
Application(int argc, char** argv);
|
||||
|
||||
void CreateReflectionManager() override;
|
||||
|
||||
@@ -70,7 +71,6 @@ namespace LegacyFramework
|
||||
const char* GetApplicationName() override;
|
||||
const char* GetApplicationModule() override;
|
||||
const char* GetApplicationDirectory() override;
|
||||
const AzFramework::CommandLine* GetCommandLineParser() override;
|
||||
void TeardownApplicationComponent() override;
|
||||
void RunAssetProcessor() override;
|
||||
// ------------------------------------------------------------------
|
||||
@@ -138,7 +138,6 @@ namespace LegacyFramework
|
||||
volatile bool m_abortRequested; // if you CTRL+C in a console app, this becomes true. its up to you to check...
|
||||
char m_applicationFilePath[AZ_MAX_PATH_LEN];
|
||||
ApplicationDesc m_desc;
|
||||
AzFramework::CommandLine* m_ptrCommandLineParser;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
#include <AzCore/Serialization/SerializeContext.h>
|
||||
|
||||
#include <AzFramework/CommandLine/CommandLine.h>
|
||||
#include <AzCore/Settings/CommandLine.h>
|
||||
|
||||
#include <AzToolsFramework/UI/UICore/QWidgetSavedState.h>
|
||||
#include <AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkAPI.h>
|
||||
@@ -34,7 +34,6 @@ AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // '...' needs to have
|
||||
#include <QProxyStyle>
|
||||
AZ_POP_DISABLE_WARNING
|
||||
|
||||
#include <AzFramework/StringFunc/StringFunc.h>
|
||||
|
||||
#ifndef AZ_PLATFORM_WINDOWS
|
||||
int __argc = 0;
|
||||
@@ -201,8 +200,11 @@ namespace AzToolsFramework
|
||||
// enable the built-in stylesheet by default:
|
||||
bool enableStyleSheet = true;
|
||||
|
||||
const AzFramework::CommandLine* comp = nullptr;
|
||||
EBUS_EVENT_RESULT(comp, LegacyFramework::FrameworkApplicationMessages::Bus, GetCommandLineParser);
|
||||
const AZ::CommandLine* comp = nullptr;
|
||||
AZ::ComponentApplicationBus::Broadcast([&comp](AZ::ComponentApplicationRequests* requests)
|
||||
{
|
||||
comp = requests->GetAzCommandLine();
|
||||
});
|
||||
if (comp != nullptr)
|
||||
{
|
||||
if (comp->HasSwitch("nostyle"))
|
||||
|
||||
Reference in New Issue
Block a user