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 //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)

Browse Source 
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
This commit is contained in:
Marc Audy
2020-06-23 18:40:00 -04:00
parent a54c560436
commit 11f5b21210
9390 changed files with 453099 additions and 425504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Engine/Source/Programs/UnrealBuildTool/ProjectFiles/VisualStudioCode/VSCodeProjectFileGenerator.cs
View File

@@ -279,7 +279,7 @@ namespace UnrealBuildTool
WriteTasksFile(ProjectData);
WriteLaunchFile(ProjectData);
WriteWorkspaceSettingsFile(Projects);
WriteWorkspaceIgnoreFile(Projects);
WriteCppPropertiesFile(VSCodeDir, false, ProjectData);
WriteWorkspaceFile(ProjectData);
//WriteProjectDataFile(ProjectData);
@@ -1191,10 +1191,8 @@ namespace UnrealBuildTool
base.ConfigureProjectFileGeneration(Arguments, ref IncludeAllPlatforms);
}
private void WriteWorkspaceSettingsFile(List<ProjectFile> Projects)
private void WriteWorkspaceIgnoreFile(List<ProjectFile> Projects)
{
JsonFile OutFile = new JsonFile();
List<string> PathsToExclude = new List<string>();
foreach (ProjectFile Project in Projects)
@@ -1208,7 +1206,7 @@ namespace UnrealBuildTool
GetExcludePathsCPP(ProjDir, PathsToExclude);
DirectoryReference PluginRootDir = DirectoryReference.Combine(ProjDir, "Plugins");
WriteWorkspaceSettingsFileForPlugins(PluginRootDir, PathsToExclude);
WriteWorkspaceIgnoreFileForPlugins(PluginRootDir, PathsToExclude);
bFoundTarget = true;
}
@@ -1220,27 +1218,19 @@ namespace UnrealBuildTool
}
}
OutFile.BeginRootObject();
StringBuilder OutFile = new StringBuilder();
if (!IncludeAllFiles)
{
if (!IncludeAllFiles)
string WorkspaceRoot = UnrealBuildTool.RootDirectory.ToString().Replace('\\', '/');
foreach (string PathToExclude in PathsToExclude)
{
OutFile.BeginObject("files.exclude");
{
string WorkspaceRoot = UnrealBuildTool.RootDirectory.ToString().Replace('\\', '/') + "/";
foreach (string PathToExclude in PathsToExclude)
{
OutFile.AddField(PathToExclude.Replace('\\', '/').Replace(WorkspaceRoot, ""), true);
}
}
OutFile.EndObject();
OutFile.AppendLine(PathToExclude.Replace('\\', '/').Replace(WorkspaceRoot, ""));
}
}
OutFile.EndRootObject();
OutFile.Write(FileReference.Combine(VSCodeDir, "settings.json"));
FileReference.WriteAllText(FileReference.Combine(MasterProjectPath, ".ignore"), OutFile.ToString());
}
private void WriteWorkspaceSettingsFileForPlugins(DirectoryReference PluginBaseDir, List<string> PathsToExclude)
private void WriteWorkspaceIgnoreFileForPlugins(DirectoryReference PluginBaseDir, List<string> PathsToExclude)
{
if (DirectoryReference.Exists(PluginBaseDir))
{
@@ -1254,7 +1244,7 @@ namespace UnrealBuildTool
}
else
{
WriteWorkspaceSettingsFileForPlugins(SubDir, PathsToExclude);
WriteWorkspaceIgnoreFileForPlugins(SubDir, PathsToExclude);
}
}
}