izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merging //UE4/Dev-Main to Dev-Mobile (//UE4/Dev-Mobile)

Browse Source 
#rb None

[CL 6267338 by Jack Porter in Dev-Mobile branch]
This commit is contained in:
Jack Porter
2019-05-03 01:50:07 -04:00
parent 3e53d383c5
commit 8951e6117b
1252 changed files with 81688 additions and 13128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Engine/Source/Developer/Windows/LiveCodingServer/Private/External/LC_ServerCommandThread.cpp vendored
View File

@@ -41,7 +41,11 @@ namespace
{
InitializeCOM(void)
{
::CoInitialize(NULL);
const HRESULT success = ::CoInitialize(NULL);
if (success != S_OK)
{
LC_LOG_DEV("Could not initialize COM. Error: %d", success);
}
}
~InitializeCOM(void)
@@ -125,6 +129,7 @@ ServerCommandThread::~ServerCommandThread(void)
// this is only called when Live++ is being torn down anyway, so we leave cleanup to the OS.
// otherwise we could run into races when trying to terminate the thread that might currently be doing
// some intensive work.
delete m_directoryCache;
}
@@ -703,7 +708,8 @@ void ServerCommandThread::CompileChanges(bool didAllProcessesMakeProgress)
GLiveCodingServer->GetStatusChangeDelegate().ExecuteIfBound(L"Compiling changes for live coding...");
TMap<FString, TArray<FString>> ModuleToObjectFiles;
if (!CompileDelegate.Execute(Targets, ModuleToObjectFiles))
TMap<FString, FString> ObjectFileToUnityObjectFile;
if (!CompileDelegate.Execute(Targets, ModuleToObjectFiles, ObjectFileToUnityObjectFile))
{
GLiveCodingServer->GetCompileFinishedDelegate().ExecuteIfBound(ELiveCodingResult::Error, L"Compilation error.");
return;
@@ -766,11 +772,19 @@ void ServerCommandThread::CompileChanges(bool didAllProcessesMakeProgress)
return;
}
types::vector<std::wstring> ObjectFiles;
types::vector<LiveModule::ModifiedObjFile> ObjectFiles;
for(const FString& ObjectFile : Pair.Value)
{
std::wstring NormalizedObjectFile = file::NormalizePath(*ObjectFile);
ObjectFiles.push_back(std::move(NormalizedObjectFile));
LiveModule::ModifiedObjFile ModifiedObjFile;
ModifiedObjFile.objPath = file::NormalizePath(*ObjectFile);
const FString* UnityObjectFile = ObjectFileToUnityObjectFile.Find(ObjectFile);
if (UnityObjectFile != nullptr)
{
ModifiedObjFile.amalgamatedObjPath = file::NormalizePath(**UnityObjectFile);
}
ObjectFiles.push_back(std::move(ModifiedObjFile));
}
m_liveModuleToModifiedOrNewObjFiles.insert(std::make_pair(ModuleFileName, std::move(ObjectFiles)));
@@ -823,14 +837,14 @@ void ServerCommandThread::CompileChanges(bool didAllProcessesMakeProgress)
else
{
// build a patch with the given list of .objs for this module
const std::vector<std::wstring>& objFiles = objFilesIt->second;
const types::vector<LiveModule::ModifiedObjFile>& objFiles = objFilesIt->second;
moduleUpdateError = liveModule->Update(&fileCache, m_directoryCache, updateType, objFiles);
}
}
else
{
// no optional .objs were given, update all live modules regularly
std::vector<std::wstring> emptyObjs;
types::vector<LiveModule::ModifiedObjFile> emptyObjs;
moduleUpdateError = liveModule->Update(&fileCache, m_directoryCache, updateType, emptyObjs);
}
@@ -1323,7 +1337,10 @@ bool ServerCommandThread::BuildPatchAction::Execute(CommandType* command, const
pipe->SendAck();
commandThread->m_liveModuleToModifiedOrNewObjFiles[packetCommand.moduleName].push_back(packetCommand.objPath);
LiveModule::ModifiedObjFile modifiedObjFile;
modifiedObjFile.objPath = packetCommand.objPath;
modifiedObjFile.amalgamatedObjPath = packetCommand.amalgamatedObjPath;
commandThread->m_liveModuleToModifiedOrNewObjFiles[packetCommand.moduleName].push_back(modifiedObjFile);
}
commandThread->m_manualRecompileTriggered = true;