birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating latest from github/staging

Browse Source 
Integrating up through commit 5e1bdae
This commit is contained in:
alexpete
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LmbrCentral/Code/Source/Builders/TranslationBuilder/TranslationBuilderComponent.cpp
+7 -7
View File
@@ -22,8 +22,8 @@
#include <AzCore/Serialization/EditContextConstants.inl>
#include <AzFramework/StringFunc/StringFunc.h>
#include <AzToolsFramework/Process/ProcessCommunicator.h>
#include <AzToolsFramework/Process/ProcessWatcher.h>
#include <AzFramework/Process/ProcessCommunicator.h>
#include <AzFramework/Process/ProcessWatcher.h>
namespace TranslationBuilder
{
@@ -124,7 +124,7 @@ namespace TranslationBuilder
}
else
{
AzToolsFramework::ProcessLauncher::ProcessLaunchInfo processLaunchInfo;
AzFramework::ProcessLauncher::ProcessLaunchInfo processLaunchInfo;
AZStd::string command( AZStd::string::format("\"%s\" \"%s\" -qm \"%s\"", lRelease.c_str(), request.m_fullPath.c_str(), destPath.c_str()) );
AZ_TracePrintf(AssetBuilderSDK::InfoWindow, "Issuing command:%s", command.c_str());
@@ -132,9 +132,9 @@ namespace TranslationBuilder
processLaunchInfo.m_commandlineParameters = command;
processLaunchInfo.m_showWindow = false;
processLaunchInfo.m_workingDirectory = request.m_tempDirPath;
processLaunchInfo.m_processPriority = AzToolsFramework::PROCESSPRIORITY_IDLE;
processLaunchInfo.m_processPriority = AzFramework::ProcessPriority::PROCESSPRIORITY_IDLE;
AzToolsFramework::ProcessWatcher* watcher = AzToolsFramework::ProcessWatcher::LaunchProcess(processLaunchInfo, AzToolsFramework::ProcessCommunicationType::COMMUNICATOR_TYPE_STDINOUT);
AzFramework::ProcessWatcher* watcher = AzFramework::ProcessWatcher::LaunchProcess(processLaunchInfo, AzFramework::ProcessCommunicationType::COMMUNICATOR_TYPE_STDINOUT);
if (!watcher)
{
@@ -147,10 +147,10 @@ namespace TranslationBuilder
if (result)
{
// grab output and append to logs, will help with any debugging down the road.
AzToolsFramework::ProcessCommunicator* processCommunicator = watcher->GetCommunicator();
AzFramework::ProcessCommunicator* processCommunicator = watcher->GetCommunicator();
if ( processCommunicator && processCommunicator->IsValid() )
{
AzToolsFramework::ProcessOutput rawOutput;
AzFramework::ProcessOutput rawOutput;
processCommunicator->ReadIntoProcessOutput(rawOutput);
// note that the rawOutput may contain a formating code, such as "%s" within the text,