Commit Graph

110 Commits

Author SHA1 Message Date
Josh Adams
2e03486229 - Remove unused orientation parameters from GeneratePList, etc functions
#rb trivial
#preflight 63517e3e3d41a4455a390431

[CL 22661134 by Josh Adams in ue5-main branch]
2022-10-20 13:07:40 -04:00
calvin zheng
f3f22de9e3 Fix creating cpp projects cannot run editor correctly
#jira UE-166010
#rb Josh.Adams
#preflight 63488b173c37eed4811dd83e
#lockdown rolando.caloca

[CL 22537874 by calvin zheng in ue5-main branch]
2022-10-14 18:38:15 -04:00
calvin zheng
6300a2f9a3 Fix code sign error on QAGCookedEditor
#jira UE-165547
#preflight 633ef83fb20780acc19e2b7f
#rb rolando.caloca,josh.adams
#lockdown rolando.caloca

[CL 22388849 by calvin zheng in ue5-main branch]
2022-10-06 20:10:51 -04:00
josh adams
b4b723bfa6 - More modernization of Xcode, focusing on Mac, IOS plist still needs a lot of work
- Premade "template" plist files for Mac, MacEditor, IOS, and added a PlistMode to choose between updating a template plist (from engine) or using a "baked" out plist that Xcode won't really mess with (this is still a work in progress, as it still needs thought on how to handle IOS premade vs Mac template, etc)
- Updating icons to using xcassets instead of .icns file
- Added post build step for UBT to write out build versions (increments each build) to a .xcconfig for Xcode to put into the .plist, but it reads previous value. Not terrible, but it still  needs work

#rb adam.king
#preflight 632c7e8ee23e50651b43139b

[CL 22137251 by josh adams in ue5-main branch]
2022-09-22 11:42:27 -04:00
Bertrand Carre
241e69db84 Mac: Allow to launch UE Editor through XCode without commandline
#jira none
#review-22029391 @Josh.Adams @Rafa.Lecina
#preflight 632482cc3752284a318025a7

[CL 22049175 by Bertrand Carre in ue5-main branch]
2022-09-16 10:30:38 -04:00
Josh Adams
47372e99ae - Better solution for Xcode 14 requiring plist file for Mac local signing:
* Remove the "Mac short circuit" blocks of code in the project generator as it was skipping the code that sets up PLIST and BUNDLE_IDENT settings (which Xcode14 will need)
* Point Xcode at the temp plist files that project generator makes
* Make sure to copy the final plist on top of the temp plist file so Xcode will pull that one into the .app at the end
#preflight 6323ef8b74361465143e1b86

[CL 22045794 by Josh Adams in ue5-main branch]
2022-09-15 23:54:29 -04:00
Josh Adams
6dc98e43ae - Fixed bad xcode project format, missing a "
#jira UE-163738
#rb trivial
#preflight skip

[CL 22015002 by Josh Adams in ue5-main branch]
2022-09-14 16:13:38 -04:00
josh adams
6ba6e383d9 - Fix xcode 14 for mac that needs a plist generated for it
#rb adam.king,zack.neyland
#jira UE-156920
#preflight 631fb26a551a6a2554c16e2a

[CL 21986553 by josh adams in ue5-main branch]
2022-09-13 13:16:01 -04:00
Josh Adams
97c6a662ae - Restored some behavior I had left commented out by mistake
#jira UE-161891
#preflight skip
#rb trivial

[CL 21544991 by Josh Adams in ue5-main branch]
2022-08-24 13:22:18 -04:00
Josh Adams
2060045e96 - More work on "modern xcode" mode (automatic signing works well, xcode can generate plists/entitlements, shared settings between Mac/IOS/TVOS). Needs the bUseModernXcode ini setting (see BaseEngine.ini) to activate
- Indexing improvements
- No longer asks to auto-create schemes, since we create all schemes needed
- Sped up the run-only project generation to skip a lot of cruft

#preflight 63041e960061f895d0fe3ccf
#rb ian.fox,roman.dzieciol (i am submitting without their final sign-off)
#preflight 63051c23516bef57ffb5b1c2

[CL 21517539 by Josh Adams in ue5-main branch]
2022-08-23 15:40:10 -04:00
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