Commit Graph

96 Commits

Author SHA1 Message Date
david harvey
bb7cacf86b Visual Studio project generators can request a distinct configuration name for each platform target.
This is to support cases where there may be more than one UnrealTargetPlatform requiring the same VS Solution Platform. Without a distinct separation these platforms will overwrite each other's properties.


#jira UE-129637
#rnx
#rb Eric.McDaniel
#preflight 61e13f41341d372424fda39b

#ROBOMERGE-AUTHOR: david.harvey
#ROBOMERGE-SOURCE: CL 18615646 in //UE5/Release-5.0/... via CL 18615669 via CL 18615678
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v899-18417669)

[CL 18615693 by david harvey in ue5-main branch]
2022-01-14 04:58:29 -05:00
joe kirchoff
f039dfd7ab UnrealBuildTool: Pass $(AdditionalOptions) instead of the c++ version along with /Yu in project, as that contains the version already
#rnx
#rb trivial
#preflight 61ddba939b2dd4f66b796e68

#ROBOMERGE-AUTHOR: joe.kirchoff
#ROBOMERGE-SOURCE: CL 18573913 in //UE5/Release-5.0/... via CL 18573957
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v899-18417669)

[CL 18573995 by joe kirchoff in ue5-release-engine-test branch]
2022-01-11 12:45:07 -05:00
joe kirchoff
29c74ba0b7 UnrealBuildTool: Update HoloLensToolChain to inherit from VcToolChain and remove duplicate code
#preflight 61d8db831a3fd09dcbed8e97
#preflight 61dc593f6c000c869b45914f

#rnx
#rb Jeff.Fisher
#rb jonathan.adamczewski

#ROBOMERGE-AUTHOR: joe.kirchoff
#ROBOMERGE-SOURCE: CL 18566628 in //UE5/Release-5.0/... via CL 18566645
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v899-18417669)

[CL 18566647 by joe kirchoff in ue5-release-engine-test branch]
2022-01-10 18:13:24 -05:00
jonathan adamczewski
c7aeb00f62 UnrealBuildTool: Remove various references to UE4.
#jira UE-111420
#trivial
#preflight none

#ROBOMERGE-AUTHOR: jonathan.adamczewski
#ROBOMERGE-SOURCE: CL 18565554 in //UE5/Release-5.0/... via CL 18565574
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v899-18417669)

[CL 18565586 by jonathan adamczewski in ue5-release-engine-test branch]
2022-01-10 16:46:00 -05:00
jonathan adamczewski
5c48869c86 UnrealBuildTool: rename MasterProject settings as PrimaryProject, and some other uses of 'master'
Variable, function and class renames only. XML-facing variables included deprecated support for the old names.

Renaming of the MasterProjectName.txt file will be handled in a subsequent change.

#jira none
#preflight 61d8a162ec35d1b940f74818

#ROBOMERGE-AUTHOR: jonathan.adamczewski
#ROBOMERGE-SOURCE: CL 18550269 in //UE5/Release-5.0/... via CL 18550308
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v899-18417669)

[CL 18550325 by jonathan adamczewski in ue5-release-engine-test branch]
2022-01-07 15:40:01 -05:00
rex hill
6ff2416ad9 Update code to match new nullable requirements
#ROBOMERGE-AUTHOR: rex.hill
#ROBOMERGE-SOURCE: CL 18407429 via CL 18407445 via CL 18434902 via CL 18437289
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v897-18405271)

[CL 18437344 by rex hill in ue5-release-engine-test branch]
2021-12-10 20:35:46 -05:00
rex hill
0a45f859eb Add ExludedFilePaths to vcproject generation for special situations where a developer does not want to see certain files in visual studio project
#rb dave.belanger
[FYI] Jonathan.Adamczewski
#preflight 61b0cdbf7177ccd1a12fe73e

#ROBOMERGE-OWNER: rex.hill
#ROBOMERGE-AUTHOR: rex.hill
#ROBOMERGE-SOURCE: CL 18406142 via CL 18406661 via CL 18407277 via CL 18407281 via CL 18434891 via CL 18437287
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v897-18405271)

[CL 18437342 by rex hill in ue5-release-engine-test branch]
2021-12-10 20:35:34 -05:00
joe kirchoff
3744d4e088 VCProjectGen: Add std version to AdditionalOptions to fix intellisense
#jira UE-135516
#rnx
#rb none

#ROBOMERGE-AUTHOR: joe.kirchoff
#ROBOMERGE-SOURCE: CL 18407259 in //UE5/Release-5.0/... via CL 18407269
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v897-18405271)

[CL 18407279 by joe kirchoff in ue5-release-engine-test branch]
2021-12-08 12:00:17 -05:00
david harvey
75c0729392 Adding the option to change the Visual Studio platform name on a per-project basis.
#jira UE-129637
#rnx
#[robomerge][starship] UE5-Main
#rb Ben.Marsh

#ROBOMERGE-OWNER: david.harvey
#ROBOMERGE-AUTHOR: david.harvey
#ROBOMERGE-SOURCE: CL 18404402 via CL 18404418 via CL 18404419 via CL 18404445 via CL 18404455
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v896-18170469)

[CL 18404461 by david harvey in ue5-release-engine-test branch]
2021-12-08 06:26:07 -05:00
jonathan adamczewski
9394c1c414 UnrealBuildTool: Make platform handling more consistent
#jira UE-130413
#rb josh.adams

#ROBOMERGE-AUTHOR: jonathan.adamczewski
#ROBOMERGE-SOURCE: CL 18271725 in //UE5/Release-5.0/... via CL 18271746
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18271752 by jonathan adamczewski in ue5-release-engine-test branch]
2021-11-23 12:25:08 -05:00
Marc Audy
0c3be2b6ad Merge Release-Engine-Staging to Test @ CL# 18240298
[CL 18241953 by Marc Audy in ue5-release-engine-test branch]
2021-11-18 14:37:34 -05:00
aurel cordonnier
69fe095547 Merge from Release-Engine-Staging @ 17636544 to Release-Engine-Test
This represents UE4/Main @17638339 and Dev-PerfTest @17636504

[CL 17638842 by aurel cordonnier in ue5-release-engine-test branch]
2021-09-27 19:54:25 -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
jonathan adamczewski
e420cb12f0 UnrealBuildTool:
Make ConfigValueTracker immutable.
Propagate some nullability in and around TargetRules.

#jira none
#rb none

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

[CL 17377828 by jonathan adamczewski in ue5-release-engine-test branch]
2021-08-31 17:09:35 -04:00
rolando caloca
f6cd88c157 UE5 - Remove platform
#rb Steve.Smith
[FYI] Jules.Blok, Ryan.Durand, Ben.Marsh

#ROBOMERGE-SOURCE: CL 17295935 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v861-17282326)

[CL 17295945 by rolando caloca in ue5-release-engine-test branch]
2021-08-24 19:28:38 -04:00
joe kirchoff
8772a271da UBT: Check if target is null before filtering out invalid configurations when generating project files
#jira UE-121614
#rb trivial
#rnx

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

[CL 17202381 by joe kirchoff in ue5-release-engine-test branch]
2021-08-17 14:08:24 -04:00
ben marsh
74fac70496 UBT: Fix arguments for Intellisense PCH generation.
#ROBOMERGE-SOURCE: CL 16894546 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)

[CL 16894553 by ben marsh in ue5-release-engine-test branch]
2021-07-20 07:04:16 -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
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
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
alexis matte
f01b1f01d8 Backout changelist 16519471, interchange worker will not be build by the build system automatically, user will have to build it manually.
#rb none
#jira UE-108125

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

[CL 16610769 by alexis matte in ue5-release-engine-test branch]
2021-06-09 15:19:23 -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
Joe Kirchoff
80fca790c7 UnrealBuildTool: Use BuildToolOverride for -2022 in VcProject generation
#rb trivial

[CL 16590047 by Joe Kirchoff in ue5-main branch]
2021-06-08 14:11:54 -04:00
Alexis Matte
b4b391a5f6 Force InterchangeWorker to be build when building the editor
#rb ryan.durand
#jira UE-108125

[CL 16519471 by Alexis Matte in ue5-main branch]
2021-06-01 14:49:58 -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