Commit Graph

170 Commits

Author SHA1 Message Date
Tim Smith
36421e5c91 Minor refactor to UBT plugins.
Added support for props file for UBT plugins.  Needed for packaging of plugins having a ubt plugin

#rnx
#rb trivial
#preflight 62694f6a7f6900cdefa9431c

[CL 19939499 by Tim Smith in ue5-main branch]
2022-04-27 10:30:21 -04:00
Tim Smith
ee9ae5c66a Adding UBT plugin support currently only used by UHT
#rb jonathan.adamczewski ben.marsh
#preflight 625ff59ace2ef75d47707e74

[CL 19828042 by Tim Smith in ue5-main branch]
2022-04-20 08:27:26 -04:00
jonathan adamczewski
d4f03243e3 Remove various obsolete (deprecated) items in C# code
#jira none
#trivial
#rnx
#preflight 625a32bbde3638cefa4106cb

[CL 19786027 by jonathan adamczewski in ue5-main branch]
2022-04-18 11:27:53 -04:00
Josh Adams
a5ae97e75e - Look in Restricted directories for Shared projects
#rb ryan.durand
#jira none
#preflight 6258429a7a394d0082a8aa06

[CL 19758221 by Josh Adams in ue5-main branch]
2022-04-14 12:01:29 -04:00
Tim Smith
d87a922dfb UBT will now find "Shared" C# project files in the Restricted directories.
#rb joe.kirchoff
#rnx
#preflight 6255ab7b3f5641db59f99e0b

[CL 19724399 by Tim Smith in ue5-main branch]
2022-04-12 13:15:41 -04:00
jonathan adamczewski
c12d99d854 .net6.0 is not supported in VS2019. Suppress warnings about that when using that IDE (with this change, when building UnrealBuildTool & AutomationTool)
#jira none
#rnx
#rb joe.kirchoff
#preflight 624f2c163c2aff69c54ff9eb

[CL 19675097 by jonathan adamczewski in ue5-main branch]
2022-04-07 15:06:02 -04:00
jonathan adamczewski
c1bb6901bf Upgrade to .NET 6.0
#jira UE-119846
#preflight 624cbb2ecc0872e96b0d5181

[CL 19652696 by jonathan adamczewski in ue5-main branch]
2022-04-06 14:46:50 -04:00
jonathan adamczewski
5c68d1d9ef Revert //UE5/Main/... changelist 19531725 - return to NET Core 3.1
#preflight 62422fd0470aff98e946bfce
#jira UE-119846

[CL 19534572 by jonathan adamczewski in ue5-main branch]
2022-03-28 18:25:19 -04:00
jonathan adamczewski
18ac15cbb1 Upgrade to .NET 6.0
#jira UE-119846
#preflight 6241fc06470aff98e943c035

[CL 19531725 by jonathan adamczewski in ue5-main branch]
2022-03-28 15:30:56 -04:00
Joe Kirchoff
82466ed8be UnrealBuildTool: Fix engine modules being filtered out of generated projects when programs should not be added
#jira UE-146426
#rnx
#rb trivial
#preflight 62338ddd0820efd0945ea479

[CL 19427071 by Joe Kirchoff in ue5-main branch]
2022-03-17 17:05:06 -04:00
Tim Smith
2bf67af6e7 UHT in UBT initial version. Currently disabled.
Tested against UnrealEditor, ShooterGame, QAGame, FortniteGame, Lyra, CitySample, and a local project

Ciode review was a preliminary review for a coding style.

#rnx
#rb jonathan.adamczewski, joe.kirchoff
#preflight 6220cfb76f26901529b6514e

[CL 19243710 by Tim Smith in ue5-main branch]
2022-03-03 09:59:05 -05:00
jonathan adamczewski
2c3a702a8c Upgrade to nuget package Microsoft.Win32.Registry 5.0.0
#trivial
#jira none
#rnx
#preflight 62149c809e2201e214fe1a6c

[CL 19076594 by jonathan adamczewski in ue5-main branch]
2022-02-22 13:52:23 -05:00
jonathan adamczewski
5b47c771a0 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 via CL 18565586
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Test -> Main) (v899-18417669)

[CL 18565609 by jonathan adamczewski in ue5-main branch]
2022-01-10 16:46:54 -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
0509b06d55 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 via CL 18550325
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Test -> Main) (v899-18417669)

[CL 18550338 by jonathan adamczewski in ue5-main branch]
2022-01-07 15:40:41 -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
Ben Marsh
b516c7819c UBT: Add a -nocpp option for generating solutions without any C++ source when working on C# projects.
#preflight none

[CL 18487877 by Ben Marsh in ue5-main branch]
2021-12-19 16:09:38 -05:00
Ben Marsh
a6aac6046d Rename UnrealBuildToolTests to UnrealBuildTool.Tests, and include in the solution by default.
#preflight none

[CL 18487766 by Ben Marsh in ue5-main branch]
2021-12-19 14:43:17 -05:00
rex hill
d2b92625d8 Editgrate 18353193 - UnrealBuildTool: track history for AdditionalPluginDirectories
External plugins will be built in project_dir/Intermediate/External/...
#jira UE-136243
#preflight 61ae4dbe0532fbb8b3fe217e

#ROBOMERGE-AUTHOR: rex.hill
#ROBOMERGE-SOURCE: CL 18386243 via CL 18388534 via CL 18388876 via CL 18388926 via CL 18434579 via CL 18435940
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v897-18405271)

[CL 18436644 by rex hill in ue5-release-engine-test branch]
2021-12-10 19:21:45 -05:00
jonathan adamczewski
575aea6fd3 UnrealBuildTool: track history for AdditionalPluginDirectories
External plugins will be built in project_dir/Intermediate/External/...

#jira UE-136243
#preflight 61a8efe3ca183f8de48d781f

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

[CL 18353249 by jonathan adamczewski in ue5-release-engine-test branch]
2021-12-02 11:49:46 -05:00
jonathan adamczewski
f47cdcfeec UnrealBuildTool: Cache BuildConfiguration.xml file locations
#jira none

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

[CL 18343070 by jonathan adamczewski in ue5-release-engine-test branch]
2021-12-01 14:45:33 -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
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