StageFiles should only block NotForLicensees directories if specifically told to

Merging CL 2413745

//depot/UE4-UT/...

to //depot/UE4/...

[CL 2413748 by Peter Knepley in Main branch]
This commit is contained in:
Peter Knepley
2015-01-21 10:01:37 -05:00
parent 850ed7de01
commit 87b18bd66e
@@ -317,7 +317,7 @@ public class DeploymentContext //: ProjectParams
ProjectArgForCommandLines = ProjectArgForCommandLines.Replace("\\", "/");
}
public int StageFiles(StagedFileType FileType, string InPath, string Wildcard = "*", bool bRecursive = true, string[] ExcludeWildcard = null, string NewPath = null, bool bAllowNone = false, bool bRemap = true, string NewName = null)
public int StageFiles(StagedFileType FileType, string InPath, string Wildcard = "*", bool bRecursive = true, string[] ExcludeWildcard = null, string NewPath = null, bool bAllowNone = false, bool bRemap = true, string NewName = null, bool bAllowNotForLicenseesFiles = true)
{
int FilesAdded = 0;
// make sure any ..'s are removed
@@ -347,7 +347,7 @@ public class DeploymentContext //: ProjectParams
continue;
}
if (FileToCopy.Contains("NotForLicensees"))
if (!bAllowNotForLicenseesFiles && FileToCopy.Contains("NotForLicensees"))
{
continue;
}