Commit Graph

100 Commits

Author SHA1 Message Date
Josh Adams
c038650013 - First version of support for allowing a project to have a template project that GenProjectFiles will merge the generated project into the template project to be the final project. This allows for standard Xcode poject setup for signing, extensions, asset catalogs, etc. There are alot of edge cases still to deal with (conflicting settings from UBT vs Xcode, moving more stuff out of UBT since Xcode can do it, stuff like that).
- The merging of xcode project files is done with PlistBuddy, but with the amount of operations we do now, it takes seconds to make one project. This will need to change
- This is still only enabled when GPF is run with -xcconfig
#rb self
#preflight skip

[CL 21322780 by Josh Adams in ue5-main branch]
2022-08-10 14:30:33 -04:00
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
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
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
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
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
jonathan adamczewski
0a6164bbd3 nullability annotations, rethrow fixes, net6.0 warning suppression
#jira none
#trivial
#rnx
#preflight 62425155c61d8a458f230657

[CL 19536049 by jonathan adamczewski in ue5-main branch]
2022-03-28 20:50:06 -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
dave hunter
25be456263 Engine targets for Mac installed builds
This forces UBT to always include an engine target for Mac installed builds

#jira UE-142717
#rnx
[REVIEW] [at]will.damon
#preflight none

#ROBOMERGE-AUTHOR: dave.hunter
#ROBOMERGE-SOURCE: CL 19247899 in //UE5/Release-5.0/... via CL 19251731
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v924-19243027)

[CL 19263217 by dave hunter in ue5-main branch]
2022-03-04 03:24:38 -05:00
adam kinge
f2e2089f8f When packaging an iOS app on BigSur/Catalina, it is unable to be installed on an iOS15 device. This fix now sets the "--generate-entitlement-der" flag for 'codesign'.
#jira UE-143619
#rb jack.porter
#preflight 6218eaec1d1c50179942cc17

#ROBOMERGE-AUTHOR: adam.kinge
#ROBOMERGE-SOURCE: CL 19147374 in //UE5/Release-5.0/... via CL 19148519
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19156782 by adam kinge in ue5-main branch]
2022-02-25 16:22:47 -05:00
jack porter
ba5e2d8634 Always include a UE5 target when generating an Xcode project file for a blueprint project for codesigning
#jira UE-132318
#rb Carl.Lloyd
[REVIEW]
#preflight NoneForApplePlatforms
[FYI] jonathan.adamczewski, will.damon

#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 18901387 in //UE5/Release-5.0/... via CL 18901434 via CL 18901520
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v912-18901109)

[CL 18901521 by jack porter in ue5-main branch]
2022-02-08 09:13:59 -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
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
a12d56ff31 Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485

[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
jack porter
9e39d468e2 Fix assertion when generating Xcode project files for a single game target
#jira UE-129516
#rnx
#rb Dmitriy.Dyomin
[FYI] Will.Damon

#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 17781185 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v881-17767770)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 17781212 by jack porter in ue5-release-engine-test branch]
2021-10-12 02:31:58 -04:00
richard wallis
3cec9abbfc Update Xcode project XCBuildConfiguration to handle unique build environments. Also implement platform process GetModulesDirectory() on macOS which allows re-launching of the correct app to also work.
#jira UE-80706
[at]will.damon,  [at]ben.marsh,  [at]dave.hunter
#rb will.damon,  ben.marsh

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

[CL 17332818 by richard wallis in ue5-release-engine-test branch]
2021-08-27 06:31:40 -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