SJ
44b053df58
* 1. Initial support for loading dylibs outside the bundle. 2. Child processes inherit parent's environment if no environment is explicitly specified(should change to append the parent's environment even if environment variables are explicitly specified). 3. Update some time functions to use system uptime instead of wall clock time when computing elapsed time. This fixes false timeouts when the OS goes to sleep. 4. Increase wait times for AssetBuilders and some Atom tools to connect to the AssetProcessor. This is needed because GateKeeper slows down first time bootup which results in asset processing failures. With this change we'll be able to run Editor and AssetProcessor from an install on Mac and we will also be able to build and run projects using the installed engine as an SDK. Signed-off-by: amzn-sj <srikkant@amazon.com> * 1. Remove debug messages. 2. Fix license 3. Pass parent's environment variables to child processes by default(on Mac). Signed-off-by: amzn-sj <srikkant@amazon.com> * 1. Add more detailed comments.2. Use a custom ly_copy for Mac and leave the default as is. Signed-off-by: amzn-sj <srikkant@amazon.com> * Address some feedback from review Signed-off-by: amzn-sj <srikkant@amazon.com>
76 lines
2.9 KiB
C++
76 lines
2.9 KiB
C++
/*
|
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
|
*
|
|
*/
|
|
|
|
#include <AzCore/Component/ComponentApplication.h>
|
|
#include <AzCore/Memory/SystemAllocator.h>
|
|
#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
|
|
#include <AzCore/Utils/Utils.h>
|
|
#include <AzFramework/Process/ProcessWatcher.h>
|
|
|
|
#include <cstdlib>
|
|
|
|
int main(int argc, char* argv[])
|
|
{
|
|
// Create a ComponentApplication to initialize the AZ::SystemAllocator and initialize the SettingsRegistry
|
|
AZ::ComponentApplication::Descriptor desc;
|
|
AZ::ComponentApplication application;
|
|
application.Create(desc);
|
|
|
|
AZStd::vector<AZStd::string> envVars;
|
|
|
|
const char* homePath = std::getenv("HOME");
|
|
envVars.push_back(AZStd::string::format("HOME=%s", homePath));
|
|
|
|
if (auto settingsRegistry = AZ::SettingsRegistry::Get(); settingsRegistry != nullptr)
|
|
{
|
|
const char* dyldLibPathOrig = std::getenv("DYLD_LIBRARY_PATH");
|
|
AZStd::string dyldSearchPath = AZStd::string::format("DYLD_LIBRARY_PATH=%s", dyldLibPathOrig);
|
|
if (AZ::IO::FixedMaxPath projectModulePath;
|
|
settingsRegistry->Get(projectModulePath.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_ProjectConfigurationBinPath))
|
|
{
|
|
dyldSearchPath.append(":");
|
|
dyldSearchPath.append(projectModulePath.c_str());
|
|
}
|
|
|
|
if (AZ::IO::FixedMaxPath installedBinariesFolder;
|
|
settingsRegistry->Get(installedBinariesFolder.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_InstalledBinaryFolder))
|
|
{
|
|
if (AZ::IO::FixedMaxPath engineRootFolder;
|
|
settingsRegistry->Get(engineRootFolder.Native(), AZ::SettingsRegistryMergeUtils::FilePathKey_EngineRootFolder))
|
|
{
|
|
installedBinariesFolder = engineRootFolder / installedBinariesFolder;
|
|
dyldSearchPath.append(":");
|
|
dyldSearchPath.append(installedBinariesFolder.c_str());
|
|
}
|
|
}
|
|
envVars.push_back(dyldSearchPath);
|
|
}
|
|
|
|
AZStd::string commandArgs;
|
|
for (int i = 1; i < argc; i++)
|
|
{
|
|
commandArgs.append(argv[i]);
|
|
commandArgs.append(" ");
|
|
}
|
|
|
|
AzFramework::ProcessLauncher::ProcessLaunchInfo processLaunchInfo;
|
|
AZ::IO::Path processPath{ AZ::IO::PathView(AZ::Utils::GetExecutableDirectory()) };
|
|
processPath /= "AssetProcessor";
|
|
processLaunchInfo.m_processExecutableString = AZStd::move(processPath.Native());
|
|
processLaunchInfo.m_commandlineParameters = commandArgs;
|
|
processLaunchInfo.m_environmentVariables = &envVars;
|
|
processLaunchInfo.m_showWindow = true;
|
|
|
|
AzFramework::ProcessWatcher* processWatcher = AzFramework::ProcessWatcher::LaunchProcess(processLaunchInfo, AzFramework::ProcessCommunicationType::COMMUNICATOR_TYPE_NONE);
|
|
|
|
application.Destroy();
|
|
|
|
return 0;
|
|
}
|
|
|