Commit Graph

173 Commits

Author SHA1 Message Date
andrew scheidecker
39785ce5f4 Editegrate fix from //UE5/Release-Engine-Staging changelist 18086920 to //UE5/Main:
Enable a project file generator to set ShouldGenerateIntelliSenseData()=true to get module dependency information, but ShouldGenerateIntelliSenseCompileEnvironments()=false to skip generating compile environments for those modules (including writing Definitions.h files).
#rb Jonathan.Adamczewski

#preflight 618d4c5b0c2fa8a2324b1beb

#ROBOMERGE-AUTHOR: andrew.scheidecker
#ROBOMERGE-SOURCE: CL 18154308 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v889-18060218)

[CL 18154328 by andrew scheidecker in ue5-release-engine-test branch]
2021-11-11 13:08:57 -05:00
aurel cordonnier
a6e741e007 Merge from Release-Engine-Staging @ 17915896 to Release-Engine-Test
This represents UE4/Main @17911760, Release-5.0 @17915875 and Dev-PerfTest @17914035

[CL 17918595 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-25 20:05:28 -04:00
jonathan adamczewski
a84f655a97 UnrealBuildTool: Exclude more C# projects from generated solution based on unsupported platform directories
C# projects found in Engine/Platforms/PLATFORM/... will not be included in the generated solution if UBT has decided that PLATFORM is not supported.

Additionally, provides extra logging of which directories and projects have been excluded from the solution.

#jira none

#ROBOMERGE-AUTHOR: jonathan.adamczewski
#ROBOMERGE-SOURCE: CL 17818458 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v881-17767770)

[CL 17818472 by jonathan adamczewski in ue5-release-engine-test branch]
2021-10-14 13:20:43 -04:00
joe kirchoff
c46a4af3c5 UnrealBuildTool: Remove support for VS2017
#jira UE-126521
#rb Jonathan.Adamczewski
#preflight 6144ffdb11925a000119cac6

#ROBOMERGE-AUTHOR: joe.kirchoff
#ROBOMERGE-SOURCE: CL 17559611 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17559616 by joe kirchoff in ue5-release-engine-test branch]
2021-09-17 18:25:11 -04:00
joe kirchoff
ad19fb803a Remove force disable of bIncludeEngineSource when passing -code
#rnx
#rb none

#ROBOMERGE-AUTHOR: joe.kirchoff
#ROBOMERGE-SOURCE: CL 17543816 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17543820 by joe kirchoff in ue5-release-engine-test branch]
2021-09-16 16:14:55 -04:00
joe kirchoff
73856b7e60 [Backout] - CL17543621
[FYI] Joe.Kirchoff
Original CL Desc
-----------------------------------------------------------------
ProjectGeneration: Don't filter out engine by default for -game

#jira UE-122365
#rb none
#rnx

#ROBOMERGE-AUTHOR: joe.kirchoff
#ROBOMERGE-SOURCE: CL 17543744 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17543756 by joe kirchoff in ue5-release-engine-test branch]
2021-09-16 16:05:14 -04:00
joe kirchoff
639beb2725 ProjectGeneration: Don't filter out engine by default for -game
#jira UE-122365
#rb none
#rnx

#ROBOMERGE-AUTHOR: joe.kirchoff
#ROBOMERGE-SOURCE: CL 17543621 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17543624 by joe kirchoff in ue5-release-engine-test branch]
2021-09-16 15:52:48 -04:00
joe kirchoff
ec90df19ec Don't add all DotNet and Engine programs to -game specific generated projects by default
#jira UE-122365
#rb none

#ROBOMERGE-AUTHOR: joe.kirchoff
#ROBOMERGE-SOURCE: CL 17542147 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v870-17433530)

[CL 17542171 by joe kirchoff in ue5-release-engine-test branch]
2021-09-16 14:14:17 -04:00
jonathan adamczewski
42ef103436 UnrealBuildTool:
Add new commandline option: -AlwaysRulesCompile, ensures that rules assemblies will be compiled during the run.

#jira none

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

[CL 17428452 by jonathan adamczewski in ue5-release-engine-test branch]
2021-09-03 19:27:06 -04:00
jonathan adamczewski
e9fb5df427 GenerateProjectFiles:
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]
2021-09-02 08:50:48 -04:00
jonathan adamczewski
de4f879f66 UnrealBuildTool:
Remove unnecessary check for Makefile validity.

#jira none
#rb none
#trivial

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

[CL 17375418 by jonathan adamczewski in ue5-release-engine-test branch]
2021-08-31 15:18:10 -04:00
jonathan adamczewski
2b7b866f45 Move DotNETCommon/BuildUtilities to Shared/EpicGames.Build
Also moves DotNETCommon/Metadata.cs to Shared/Metadata.cs

#jira none
#rb tim.smith

#ROBOMERGE-SOURCE: CL 17116964 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v855-17104924)

[CL 17116977 by jonathan adamczewski in ue5-release-engine-test branch]
2021-08-10 11:09:18 -04:00
jonathan adamczewski
f270855eef AutomationTool: Compile script modules within the application
Add a layer of caching to avoid running msbuild as much as possible.

#jira UE-109181
#rb ben.marsh

#ROBOMERGE-SOURCE: CL 17102399 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v853-17066230)

[CL 17102408 by jonathan adamczewski in ue5-release-engine-test branch]
2021-08-09 10:39:35 -04:00
ben marsh
39ea9c65dd UBT: Include PCH settings in Visual Studio project files for Intellisense parser.
#ROBOMERGE-SOURCE: CL 16883248 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)

[CL 16883253 by ben marsh in ue5-release-engine-test branch]
2021-07-19 10:12:28 -04:00
jonathan adamczewski
7690b7838d UnrealBuildTool:
Per-project rules assembly csprojen.

Previously: all .build.cs and .target.cs were being grouped into a single project, which resulted in duplicate symbols when trying to build the project.

Now: multiple assemblies csprojs are generated, one for each Engine & Game project. Also, includes preprocessor defines.

#jira none
#rb ben.marsh

#ROBOMERGE-SOURCE: CL 16658600 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v833-16641396)

[CL 16658608 by jonathan adamczewski in ue5-release-engine-test branch]
2021-06-14 11:00:14 -04:00
jonathan adamczewski
921afc7bb7 ProjectFileGenerator.cs:
Remove redundant list copy

#jira none
#trivial

#ROBOMERGE-SOURCE: CL 16650257 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v833-16641396)

[CL 16650271 by jonathan adamczewski in ue5-release-engine-test branch]
2021-06-11 21:14:19 -04:00
jonathan adamczewski
64c210d294 AutomationTool, BuildUtilities:
UnrealBuild -> Unreal for EngineDirectory, RootDirectory, IsEngineInstalled, UnrealBuildToolPath
Remove CommandUtils EngineDirectory, RootDirectory, IsEngineInstalled - use equvalents from UnrealBuildBase.Unreal

#jira none

#ROBOMERGE-SOURCE: CL 16648181 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v833-16641396)

[CL 16648203 by jonathan adamczewski in ue5-release-engine-test branch]
2021-06-11 18:21:35 -04:00
jonathan adamczewski
c7984899ea UnrealBuildTool/UnrealBuildFiles.csproj:
Create project in its own directory to avoid confusing other builds with UnrealBuildFiles' intermediate files

#jira none

#ROBOMERGE-SOURCE: CL 16646776 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v833-16641396)

[CL 16646811 by jonathan adamczewski in ue5-release-engine-test branch]
2021-06-11 16:40:18 -04:00
jonathan adamczewski
608020b86e UnrealBuildFiles.csproj
Generate UnrealBuildFiles.csproj, a project that contains references to all of the Build.cs and Target.cs files in the solution, and add it to the generated solution.

With this project in the solution, Intellisense is available when editing these files, and the project may be compiled in Visual Studio, providing representative results of what UBT will do with the files (UBT will re-compile the files when it needs to)

Using Visual Studio 2019 16.9.6, adding this project increased memory usage by ~20MB after load (from 540MB to 560MB) for a workspace containing Engine, and two sample games.

#jira none
#rb ben.marsh

#ROBOMERGE-SOURCE: CL 16642908 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v833-16641396)

[CL 16642914 by jonathan adamczewski in ue5-release-engine-test branch]
2021-06-11 12:25:58 -04:00
jonathan adamczewski
233b7719a5 <saved by Perforce>
#ROBOMERGE-SOURCE: CL 16642197 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v833-16641396)

[CL 16642206 by jonathan adamczewski in ue5-release-engine-test branch]
2021-06-11 11:37:42 -04:00
michael noland
65ea9e2550 UBT: Place non-source/non-config files in Platforms subfolders correctly into their relative folder structure in the project file
#rb josh.adams

#ROBOMERGE-SOURCE: CL 16630055 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v831-16623017)

[CL 16630060 by michael noland in ue5-release-engine-test branch]
2021-06-10 16:55:58 -04:00
jonathan adamczewski
d58996b916 UnrealBuildTool: move some path constants into BuildUtilities
RootDirectory, EngineDirectory, UnrealBuildToolPath are now found in BuildUtilities' UnrealBuild namesapce.

The way these are computed has changed. Previously, it was assumed that the application is UnrealBuildTool, and paths were constructed relative to that assembly.

Now, the assumption is that the process is located under a "Engine/Build/DotNET" sub-path and paths are constructed relative to that.

#jira none

#ROBOMERGE-SOURCE: CL 16607440 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v828-16531559)

[CL 16607455 by jonathan adamczewski in ue5-release-engine-test branch]
2021-06-09 12:55:13 -04:00
jonathan adamczewski
0dc1d65494 Move DirectoryLookupCache.cs to BuildUtilities
#jira none

#ROBOMERGE-SOURCE: CL 16596484 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v828-16531559)

[CL 16596492 by jonathan adamczewski in ue5-release-engine-test branch]
2021-06-08 19:12:31 -04:00
jonathan adamczewski
3d5833e02f Add a common C# method for detecting the current host platform to EpicGames.Core, and move many a test to use that code.
#jira none
#rb joe.kirchoff

#ROBOMERGE-SOURCE: CL 16593582 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v828-16531559)

[CL 16593589 by jonathan adamczewski in ue5-release-engine-test branch]
2021-06-08 17:01:47 -04:00
joe kirchoff
a63bd44f2b UnrealBuildTool: Support VS2022 Preview
Default is still VS2019, running `GenerateProjectFiles.bat -2022` will create a solution and projects that pass -2022 to UnrealBuild tool when compiling from Visual Studio to force it to use the 2022 toolchain.
Please note, as the defaults are unchanged building from UnrealGameSync will still compile with VS2019 so I would disable that build if testing VS2022.
None of this is necessary to use VS2022, it can open VS2019 solutions and will use the Vs2019 toolchain to build.

#rb Ben.Marsh
#pf 60aebccd7d4b9f0001197729

#ROBOMERGE-SOURCE: CL 16478477 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v823-16466674)

[CL 16483814 by joe kirchoff in ue5-release-engine-test branch]
2021-05-27 10:12:01 -04:00