Fix warnings building DDC.

- Check for the exisence of EpicInternal.txt to determine whether to copy DDCUtils.dll to the staging directory for generating DDC. These conditions are evaluated before dependencies are read from the temp storage directory, so we can't expect them to be there.
- Copy DDCUtils for ShaderCompileWorker, since it has its own copy.
- Resave InstallingVisualStudioTutorial.uasset with correct engine verison.

#rb none
#lockdown Nick.Penwarden

[CL 4039259 by Ben Marsh in Main branch]
This commit is contained in:
Ben Marsh
2018-04-28 23:30:32 -04:00
parent c3dfa7eba9
commit 1da04bb95b
3 changed files with 35 additions and 10 deletions
@@ -227,7 +227,7 @@ namespace AutomationTool
// Check whether file or directory exists. Evaluate the argument as a subexpression.
Idx++;
string Argument = EvaluateScalar(Tokens, ref Idx);
Result = (File.Exists(Argument) || Directory.Exists(Argument))? "true" : "false";
Result = Exists(Argument)? "true" : "false";
}
else if(String.Compare(Tokens[Idx], "HasTrailingSlash", true) == 0 && Tokens[Idx + 1] == "(")
{
@@ -258,6 +258,24 @@ namespace AutomationTool
return Result;
}
/// <summary>
/// Checks whether a path exists
/// </summary>
/// <param name="Scalar">The path to check for</param>
/// <returns>True if the path exists, false otherwise.</returns>
static bool Exists(string Scalar)
{
try
{
string FullPath = Path.Combine(CommandUtils.RootDirectory.FullName, Scalar);
return CommandUtils.FileExists(FullPath) || CommandUtils.DirectoryExists(FullPath);
}
catch
{
return false;
}
}
/// <summary>
/// Converts a scalar to a boolean value.
/// </summary>