Commit Graph

132 Commits

Author SHA1 Message Date
Ben Marsh
534eb44440 UBT: Include PCH settings in Visual Studio project files for Intellisense parser.
[CL 16883248 by Ben Marsh in ue5-main branch]
2021-07-19 10:11:52 -04:00
jonathan adamczewski
8d1ebef30a 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

[CL 16658600 by jonathan adamczewski in ue5-main branch]
2021-06-14 10:59:59 -04:00
jonathan adamczewski
b1ec85ea5f ProjectFileGenerator.cs:
Remove redundant list copy

#jira none
#trivial

[CL 16650257 by jonathan adamczewski in ue5-main branch]
2021-06-11 21:12:43 -04:00
jonathan adamczewski
4ece24e65a AutomationTool, BuildUtilities:
UnrealBuild -> Unreal for EngineDirectory, RootDirectory, IsEngineInstalled, UnrealBuildToolPath
Remove CommandUtils EngineDirectory, RootDirectory, IsEngineInstalled - use equvalents from UnrealBuildBase.Unreal

#jira none

[CL 16648181 by jonathan adamczewski in ue5-main branch]
2021-06-11 18:20:44 -04:00
jonathan adamczewski
977e566179 UnrealBuildTool/UnrealBuildFiles.csproj:
Create project in its own directory to avoid confusing other builds with UnrealBuildFiles' intermediate files

#jira none

[CL 16646776 by jonathan adamczewski in ue5-main branch]
2021-06-11 16:38:51 -04:00
jonathan adamczewski
2c9fa5c33f 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

[CL 16642908 by jonathan adamczewski in ue5-main branch]
2021-06-11 12:25:47 -04:00
jonathan adamczewski
f9cdd2dc5d UnrealBuildTool:
Move IsEngineInstalled() into BuildUtilities

#jira none

[CL 16642197 by jonathan adamczewski in ue5-main branch]
2021-06-11 11:37:23 -04:00
Michael Noland
66342d3bed UBT: Place non-source/non-config files in Platforms subfolders correctly into their relative folder structure in the project file
#rb josh.adams

[CL 16630055 by Michael Noland in ue5-main branch]
2021-06-10 16:55:47 -04:00
jonathan adamczewski
94b14ee042 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

[CL 16607440 by jonathan adamczewski in ue5-main branch]
2021-06-09 12:54:42 -04:00
jonathan adamczewski
78076f869d Move DirectoryLookupCache.cs to BuildUtilities
#jira none

[CL 16596484 by jonathan adamczewski in ue5-main branch]
2021-06-08 19:12:07 -04:00
jonathan adamczewski
0af1ea99af 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

[CL 16593582 by jonathan adamczewski in ue5-main branch]
2021-06-08 17:01:23 -04:00
aurel cordonnier
43fa62fcd8 Merge from Release-Engine-Test @ 16487383 to UE5/Main
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16488106 by aurel cordonnier in ue5-main branch]
2021-05-27 13:40:37 -04:00
Joe Kirchoff
9879d7f52d 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

[CL 16478477 by Joe Kirchoff in ue5-main branch]
2021-05-26 19:58:10 -04:00
Joe Kirchoff
75edf837e1 Remove build support for Visual Studio 2015
#rb Jonathan.Adamczewski
#preflight 60ad7f3b8194e700015e1d77

[CL 16459038 by Joe Kirchoff in ue5-main branch]
2021-05-25 20:10:26 -04:00
Joe Kirchoff
0e3c9f756f UnrealBuildTool: Slightly optimize generated visual studio project to reduce memory usage
* Filter out numerous source files that match */Source/ThirdParty/* that should have already been filtered, this does not include Module.Build.cs or .tps files, or if bGatherThirdPartySource is enabled
* Filter out source files that match */third_party/* by default
* Add option bIncludeDotNetPrograms to remove all ..NET projects, doing so saved me around 400MB. Note if you disable the .NET projects UnrealBuildTool won't build before compiling (but GenerateProjectFiles.bat will still build it)

Attempted changes that did not reduce memory usage by a significant amount:
* Filtering out project configurations
* Filtering out Engine/Shaders or Engine/Content/Editor/Templates
* Increasing the shared include size, even making it large enough to contain every include path didn't really make a difference. Also it can't really be increased anyway because that entire property is added to the process environment when starting a build and there's a max environment size of around 32k

Other Fixes:
* Fix vs2019 ToolVersionString 15.0 -> 16.0
* Add VCProjectVersion to Project globals
* Update UniqueIdentifier GUIDs in projects to be stable by hashing the directory path and using that hash as the GUID
* Don't write ProjectConfiguration if filtered out (Didn't affect memory usage)
* Add optional configuration filter for Debug, DebugGame, & Development

#jira UE-111822
#rb none

[CL 16319735 by Joe Kirchoff in ue5-main branch]
2021-05-13 17:38:21 -04:00
jonathan adamczewski
882f48323d UnrealBuildTool: Remove SupportsDotNetCoreProjects()
VS2019 is the minimum required VS version, and has support for NET Core projects - we no longer need this check.

#jira none

[CL 16175554 by jonathan adamczewski in ue5-main branch]
2021-04-30 22:12:17 -04:00
jonathan adamczewski
6050e64605 ProjectFileGenerator.cs:
IsRunningOnMono -> !IsRunningOnWindows

#trivial
#jira none

[CL 16174952 by jonathan adamczewski in ue5-main branch]
2021-04-30 20:04:55 -04:00
aurel cordonnier
50944fd712 Merge UE5/RES @ 16162155 to UE5/Main
This represents UE4/Main @ 16130047 and Dev-PerfTest @ 16126156

[CL 16163576 by aurel cordonnier in ue5-main branch]
2021-04-29 19:32:06 -04:00
ben marsh
252afb693c UBT: Rename UE4CSharp.prog files to *.uprogram.
#rb none
#jira UE-104764

#ROBOMERGE-SOURCE: CL 15440534 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15454164 by ben marsh in ue5-main branch]
2021-02-18 13:09:06 -04:00
Marc Audy
cac1fe0019 Merge UE5/Release-Engine-Staging @ CL# 15299266 to UE5/Main
This represents UE4/Main @ CL# 15277572

[CL 15299962 by Marc Audy in ue5-main branch]
2021-02-03 14:57:28 -04:00
Marc Audy
bf80889353 UE5/Release-Engine-Staging to UE5/Main
This represents UE4/Main up to CL# 14958402

[CL 15028197 by Marc Audy in ue5-main branch]
2021-01-08 19:56:07 -04:00
Ben Marsh
6f927647b1 Changing C# code over to using EpicGames.Core over DotNETCommon.
#rb none
#rnx

[CL 14962096 by Ben Marsh in ue5-main branch]
2020-12-21 23:07:37 -04:00
Ben Marsh
d841d84ddb Missing files.
#rb none
#rnx

[CL 14962041 by Ben Marsh in ue5-main branch]
2020-12-21 22:17:17 -04:00
Ben Marsh
f86c977d59 Forking DotNETUtilities into EpicGames.Common, to allow unification with Horde. Uses Core-style hierarchical naming, and excludes classes that have counterparts in NET Core. DotNETUtilities will be deprecated/made as a wrapper around EpicGames.Common.
#rb none
#rnx

[CL 14961221 by Ben Marsh in ue5-main branch]
2020-12-21 11:50:46 -04:00
Ben Marsh
83f27d27e9 UBT: Mark platforms and project file generation code as not nullable aware.
#rb none
#rnx

[CL 14960496 by Ben Marsh in ue5-main branch]
2020-12-20 17:32:59 -04:00