Commit Graph

484 Commits

Author SHA1 Message Date
UnrealBot
73409369c0 Branch snapshot for CL 21319338
[CL 21319338 in ue5-main branch]
2022-08-10 16:03:37 +00:00
Josh Adams
d80d08dc9e - Cleaned up Xcconfig file creation/writing (needed for re-using when using a Template project, which is coming up)
- Deleted remnants of Extension code
#rb self
#preflight skip

[CL 21274809 by Josh Adams in ue5-main branch]
2022-08-08 16:21:20 -04:00
Josh Adams
f2d201d09b - Rewrote the XcodeProjectFile class to not be spagetti of string maniuplation and guid passing [still requires opt-in via -xcconfig option to GenerateProjectFiles]
- Now each project node is its own class, and they can reference each other
- Projects with only one sub index target now have it rolled up into the main Index target
- Extension support is removed (will return later with an entirely new way to handle unique cases like that)

- Allowed an exception for UHT when disabling plugins on arm64, since Indexing needed the headers to have been generated
#rb self
#preflight skip

[CL 21269167 by Josh Adams in ue5-main branch]
2022-08-08 11:11:04 -04:00
darksylinc
96174281a4 PR #6739: Fixed QMake project generator defines (Contributed by darksylinc)
#jira UE-89821
#preflight 62db00223122bf80ae4e612b
#fyi Brandon.Schaefer

[CL 21228340 by darksylinc in ue5-main branch]
2022-07-22 16:02:35 -04:00
Josh Adams
4a20becb00 - Moved everything over to .xcconfig files, with the exception of Extensions (a little-used IOS feature). It's possible, just not done yet, and is currently removed and will throw an exception
- Requires -xcconfig on the GenerateProjectFiles commandline
- Resurreceted the old non-xcconfig code in another namespace so that we can have both code paths side-by-side
- Had to change a little bit of XcodeProjectFileGenerator to manage the side-by-side classes
#preflight 62d61dbf164251d065b9388b

[CL 21164425 by Josh Adams in ue5-main branch]
2022-07-19 13:24:38 -04:00
Joe Kirchoff
2bd999b2e7 UnrealBuildTool: Update project specific makefile generator to build ProjectEditor instead of UnrealEditor
#jira UE-147562
#rb Brandon.Schaefer
#rnx
#preflight 62d1bc6fa6141b6adf513a58

[CL 21116398 by Joe Kirchoff in ue5-main branch]
2022-07-15 16:10:17 -04:00
Joe Kirchoff
52f52353ba Update terminology. Requires UGS update
#jira UE-158506
#jira UE-158507
#rnx
#rb trivial
#preflight 62c8a7958558075f42ac341d

[CL 21101128 by Joe Kirchoff in ue5-main branch]
2022-07-14 19:18:03 -04:00
josh adams
1ad2bc4cce - Restored the .xcconfig code that I reverted while fixing a bug
#rb trivial
#preflight 62d03e438e4b379590a22ffc

[CL 21093129 by josh adams in ue5-main branch]
2022-07-14 13:20:15 -04:00
josh adams
2bcab46051 [Backout] - CL21082773
#fyi Josh.Adams
Original CL Desc
-----------------------------------------------------------------
- Added support for .xcconfig files, currently for project and targets, but we can make specific config ones (Debug vs Development, etc)
#rb adam.king
#preflight skip

[CL 21091241 by josh adams in ue5-main branch]
2022-07-14 11:15:39 -04:00
Josh Adams
548bd12cd5 - Added support for .xcconfig files, currently for project and targets, but we can make specific config ones (Debug vs Development, etc)
#rb adam.king
#preflight skip

[CL 21082773 by Josh Adams in ue5-main branch]
2022-07-13 18:21:13 -04:00
SmelJey
88bf150c2f PR #9330: Add build information to Rider Project Model (Contributed by SmelJey)
#preflight 62ce1722c644c2b870dd0b0f

[CL 21066492 by SmelJey in ue5-main branch]
2022-07-12 20:57:59 -04:00
Tim Smith
12fc6759d5 [Backout] - CL20817342 - Preventing people from building UE5 or other large projects.
#fyi Joe.Kirchoff
#rnx

Original CL Desc
-----------------------------------------------------------------
UnrealBuildTool: Ignore VCProjectFileSettings.MaxSharedIncludePaths for VS2022

#rnx
#rb none
#preflight 62b62e6fa072cea0b5989414
#preflight 62b9b58bba62f4498a3209c2

[CL 20830204 by Tim Smith in ue5-main branch]
2022-06-27 09:55:34 -04:00
Joe Kirchoff
447f374426 UnrealBuildTool: Ignore VCProjectFileSettings.MaxSharedIncludePaths for VS2022
#rnx
#rb none
#preflight 62b62e6fa072cea0b5989414

[CL 20817342 by Joe Kirchoff in ue5-main branch]
2022-06-24 17:41:49 -04:00
Joe Kirchoff
89698ba820 UnrealBuildTool: Suppress duplicate key exception when generating vs code projects
#rnx
#rb trivial
#preflight skipped

[CL 20815980 by Joe Kirchoff in ue5-main branch]
2022-06-24 16:02:55 -04:00
nathandh13
174c550c32 PR #9128: Added option to remove programs when generating project file (Contributed by nathandh13)
#preflight 62a7d384c3492689258df1a4

[CL 20638783 by nathandh13 in ue5-main branch]
2022-06-13 20:22:46 -04:00
dapetcu21
99b68fe7f2 PR #9076: Fix invalid JSON keys in VSCode project generation (Contributed by dapetcu21)
#preflight 62a7d10567522b9df0130f53

[CL 20638603 by dapetcu21 in ue5-main branch]
2022-06-13 20:12:07 -04:00
Joe Kirchoff
18278d0104 UnrealBuildTool: Don't run dotnet through bash in the generated makefile
#jira UE-147561
#rb none
#rnx
#preflight skipped

[CL 20599685 by Joe Kirchoff in ue5-main branch]
2022-06-10 14:04:51 -04:00
Joe Kirchoff
4a34c8be2e UnrealBuildTool: Handle modules with the same name in different paths when generating projects
#jira UE-138777
#rnx
#rb none
#preflight 629ea2a45d45a8ea9816a164

[CL 20531881 by Joe Kirchoff in ue5-main branch]
2022-06-06 21:16:53 -04:00
Josh Adams
b2a8d5e3bb - FIxed TargetArchitecture string parsing
#preflight 6294c26a380652524ed75c31

[CL 20430466 by Josh Adams in ue5-main branch]
2022-05-30 09:17:09 -04:00
Josh Adams
d2ca7efb2f - Allow editor to build for M1, but not enabled by default. See:
BaseGame.ini:
  [/Script/MacTargetPlatform.MacTargetSettings]
  TargetArchitecture=Universal
  EditorTargetArchitecture=Universal

#rb will.damon
#jira UE-145032,UE-153529
#preflight 62914a156d1aaeda580cbc6b

[CL 20400585 by Josh Adams in ue5-main branch]
2022-05-27 18:34:49 -04:00
David Harvey
78f7b7e0fd deprecate UnrealPlatformGroup.HoloLens
#jira UE-149794
#rnx
#preflight 6290ba31d24a7fc585eed7ca
#rb pending

[CL 20392934 by David Harvey in ue5-main branch]
2022-05-27 10:10:16 -04:00
David Harvey
684d168454 Remove HoloLens platform references from UnrealBuildTool.
#jira UE-149794
#rnx
#rb Jeff.Fisher
#preflight 628f4064f622d972b5ca0202

[CL 20377314 by David Harvey in ue5-main branch]
2022-05-26 05:57:47 -04:00
Ben Marsh
cbb950c578 UBT: Use ILogger throughout UBT, rather than legacy EpicGames.Core.Log methods. All output going forwards should use structured logging rather than String.Format style logging.
#preflight 628e9dc6e746de4961f60032

[CL 20373777 by Ben Marsh in ue5-main branch]
2022-05-25 19:55:37 -04:00
Joe Kirchoff
c512a89ace Rename UnrealBuildTool.EngineSourceDirectory -> Unreal.EngineSourceDirectory
#rnx
#rb trivial
#preflight 628e9fdaf622d972b59ebe85

[CL 20372061 by Joe Kirchoff in ue5-main branch]
2022-05-25 17:54:39 -04:00
halfdan ingvarsson
6ca396c3fd UnrealBuildTool: Fix the Rider project generator in the presence of platform extension specializations.
#robomerge FNMain
#rb david.harvey
#preflight 6285233f2a7df8ed9f9dd2fa

[CL 20263449 by halfdan ingvarsson in ue5-main branch]
2022-05-18 13:09:30 -04:00