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

GenerateProjectFiles:

Browse Source 
Group Automation projects in the same folder with their Game or Sample project.

#jira none

#ROBOMERGE-SOURCE: CL 17401839 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v865-17346139)

[CL 17401858 by jonathan adamczewski in ue5-release-engine-test branch]
This commit is contained in:
jonathan adamczewski
2021-09-02 08:50:48 -04:00
parent cdd8d8e03a
commit e9fb5df427
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Engine/Source/Programs/UnrealBuildTool/ProjectFiles/ProjectFileGenerator.cs
View File

@@ -419,9 +419,8 @@ namespace UnrealBuildTool
/// <summary>
/// Adds all .automation.csproj files to the solution.
/// </summary>
void AddAutomationModules(List<FileReference> UnrealProjectFiles, MasterProjectFolder ProgramsFolder)
void AddAutomationModules(List<FileReference> UnrealProjectFiles, MasterProjectFolder RootFolder, MasterProjectFolder ProgramsFolder)
{
MasterProjectFolder Folder = ProgramsFolder.AddSubFolder("Automation");
List<DirectoryReference> BuildFolders = new List<DirectoryReference>();
foreach (FileReference UnrealProjectFile in UnrealProjectFiles)
{
@@ -432,6 +431,9 @@ namespace UnrealBuildTool
}
}
MasterProjectFolder AutomationFolder = ProgramsFolder.AddSubFolder("Automation");
DirectoryReference SamplesDirectory = DirectoryReference.Combine(Unreal.RootDirectory, "Samples");
// Find all the automation modules .csproj files to add
List<FileReference> ModuleFiles = Rules.FindAllRulesSourceFiles(Rules.RulesFileType.AutomationModule, null, ForeignPlugins: null, AdditionalSearchPaths: BuildFolders);
foreach (FileReference ProjectFile in ModuleFiles)
@@ -443,12 +445,24 @@ namespace UnrealBuildTool
Project.ShouldBuildForAllSolutionTargets = false;//true;
AddExistingProjectFile(Project, bForceDevelopmentConfiguration: true);
AutomationProjectFiles.Add(Project);
Folder.ChildProjects.Add(Project);
if (!ProjectFile.IsUnderDirectory(Unreal.EngineDirectory))
{
FileReference PropsFile = new FileReference(ProjectFile.FullName + ".props");
CreateAutomationProjectPropsFile(PropsFile);
if (ProjectFile.IsUnderDirectory(SamplesDirectory))
{
RootFolder.AddSubFolder("Samples").ChildProjects.Add(Project);
}
else
{
RootFolder.AddSubFolder("Games").ChildProjects.Add(Project);
}
}
else
{
AutomationFolder.ChildProjects.Add(Project);
}
}
}
@@ -1019,7 +1033,7 @@ namespace UnrealBuildTool
ProgramsFolder.ChildProjects.Add(AutomationToolProject);
// Add automation.csproj files to the master project
AddAutomationModules(AllGameProjects, ProgramsFolder);
AddAutomationModules(AllGameProjects, RootFolder, ProgramsFolder);
// Add shared projects
AddSharedDotNetModules(ProgramsFolder);