Commit Graph

619 Commits

Author SHA1 Message Date
joe kirchoff
acacd6a8de UnrealBuildTool: More automated code cleanup
* Use object type rather than var
* Remove double newlines
* Use pattern matching

#rnx
#preflight 647780095d23eca37d28a387

[CL 25706751 by joe kirchoff in ue5-main branch]
2023-05-31 13:37:21 -04:00
Ben Marsh
c80dcd77cb Fix UBT/UAT building on Windows ARM64.
#preflight 6477562f4b0d5a1eb1411fa1

[CL 25701794 by Ben Marsh in ue5-main branch]
2023-05-31 10:31:38 -04:00
joe kirchoff
acf80ab609 [Backout] - CL25694851
[FYI] Joe.Kirchoff
Original CL Desc
-----------------------------------------------------------------
UnrealBuildTool: More automated code cleanup

#rnx

[CL 25695155 by joe kirchoff in ue5-main branch]
2023-05-30 19:55:37 -04:00
joe kirchoff
7ed1a39679 UnrealBuildTool: More automated code cleanup
#rnx

[CL 25694864 by joe kirchoff in ue5-main branch]
2023-05-30 19:36:05 -04:00
joe kirchoff
c04da27b3b UnrealBuildTool: More automated code cleanup
#rnx
#preflight 64767efb4b1ead7c7f428c7a

[CL 25693857 by joe kirchoff in ue5-main branch]
2023-05-30 18:59:32 -04:00
joe kirchoff
36d266e932 UnrealBuildTool: Automated code cleanup
#rnx
#preflight 6476799e947ff6973c225619

[CL 25693241 by joe kirchoff in ue5-main branch]
2023-05-30 18:38:07 -04:00
joe kirchoff
57a8fe409c UnrealBuildTool: Use expression body for simple properties and accessors
#rnx
#preflight 64766abcfe6a3b258a04cb50

[CL 25691579 by joe kirchoff in ue5-main branch]
2023-05-30 18:01:50 -04:00
Josh Adams
b770627288 - FIxed the --delete mode in rsync to not delete extra files when staging in Modern xcode
#rb adam.kinge (tested)
#preflight 64711ae3c109725039db5692

[CL 25652919 by Josh Adams in ue5-main branch]
2023-05-26 17:18:47 -04:00
Josh Adams
b7d0fe4ab0 - Cleaning up MacExports/IOSExports/IOSDeploy/etc for shared functionality from Modern Xcode
#rb trivial
#preflight 6470ddb73c13defa05f64f51

[CL 25647200 by Josh Adams in ue5-main branch]
2023-05-26 12:51:21 -04:00
Josh Adams
017c7ef4c5 - Allow a project file generator to create temporary primary projects (.sln, .xcworkspace, etc) in the Intermediate/ProjectFIles directory where the rest of the projects are created (the generator would need to not hardcode relative paths from parimary to sub projects)
#rb joe.kirchoff
#preflight 646fb3d68174dda722e93c2c

[CL 25629330 by Josh Adams in ue5-main branch]
2023-05-25 17:18:29 -04:00
Josh Adams
a2263b2ce0 - Xcode support for Content Only projects
- Added a top-level .xcconfig file to Xcode workspace for use with UnrealGame/etc so it knows where to find staged data, and set the commandline automatically
  - Stage the UECommandLine.txt file for modern builds because we no longer make the Bootstrap .app
  - Added XcodeBuildMode enum/string so scripts can tell when the project is being built (so build time could act differently than stage time, etc)
  - Making use of the enum and other env vars to skip steps when not needed

- Other fixes for project generation
  - Added -modernxcode and -legacyxcode comandline options which will override the .ini setting (refactored all UseModern checks into one function)
  - Support for programs that have a .uproject, and GPF with -game -project=<program.uproject>
  - Added success return value to FinalizeAppWithModernXcode
  - Added quotes to fix paths with spaces in GenerateProjectFiles.command
  - Enabled parallel AddAdditionalNativeTargetInformation for gathering Frameworks from targts, now that parallel project generation has been enabled and most parallel issues are fixed

#preflight 646ce67c2e78be98411323d9
#rb zack.neyland
#preflight 646f8f2850786bb5ba8a98f0

[CL 25623979 by Josh Adams in ue5-main branch]
2023-05-25 13:04:27 -04:00
Tim Smith
8ea4145e2c Fix issue with UBT where the UE_TARGET_NAME isn't the actual target name. This resulted in HotReload and Live Coding to no longer work when used with a non-unity build.
#rb joe.kirchoff
#rnx
#preflight 646e55766c2a2532b1f15a72

[CL 25609152 by Tim Smith in ue5-main branch]
2023-05-24 14:31:06 -04:00
joe kirchoff
a53dc3cf98 Prevent fatal error when generating projects if there's an error creating the TargetRules that can be ignored
#rnx
#rb trivial

[CL 25515660 by joe kirchoff in ue5-main branch]
2023-05-17 16:22:48 -04:00
Josh Adams
9d4caec55a - Brought the idea of hybrid/temp targets for content only projects that need to be treated as code, to UBT instead of UAT. Generate temp targets when building or generating projects
- Only active when the project generator says it supports ContentOnly projects, although that is just for now until Xcode can test it out, in case it causes Visual Studio issues
#rb joe.kirchoff
#preflight 64638f4a4404e3cdd240327f

[CL 25490732 by Josh Adams in ue5-main branch]
2023-05-16 11:49:47 -04:00
robert millar
16a5091a38 Write tasks and launch configurations to workspace file instead of .vscode directory so users can persist their own files in that directory.
#rb joe.kirchoff

[CL 25460540 by robert millar in ue5-main branch]
2023-05-12 17:40:11 -04:00
robert millar
3bc53dfb24 Remove unnecessary setting from generated workspace file.
#rb none
#jra none

[CL 25454564 by robert millar in ue5-main branch]
2023-05-12 13:34:17 -04:00
Benn Gallagher
7473847b3c Fix UBT project generation skipping remove on invalid targets when buliding the collection of project file targets.
#rb Josh.Adams
#jira none
#preflight 645e384eea1c7ba4d6127813

[CL 25447281 by Benn Gallagher in ue5-main branch]
2023-05-12 09:20:56 -04:00
Josh Adams
0bf75c41e2 - Added support for allowing ContentOnly projects to have projectfiles generated for them (with GenerateProjectFiles -game -project=<project>). A projectfile generator needs to opt in for this because the generator will need to handle the special cases for using UnrealGame in the context of a .uproject. Xcode will be the first generator to support it
#rb joe.kirchoff,david.harvey
#preflight 645d23616b4bdec267a26121

[CL 25431284 by Josh Adams in ue5-main branch]
2023-05-11 13:29:59 -04:00
calvin zheng
37ed928387 Modern Xcode: using copies of info.plist instead of using the original
#jira n/a
#rb Josh.Adams
#preflight 645bfcdb2965f6ea8e441d2d

[CL 25416509 by calvin zheng in ue5-main branch]
2023-05-10 16:53:20 -04:00
Josh Adams
d1511ade28 - Fixed generatingXcode temporary projects (hybrid content-only-as-code projects)
- Updated the temp .Target.cs to use modern include order to avoid some warning spam
#preflight 645871664c3ec54e6ef344ca
#rb none (but tested by wei.lu)

[CL 25370095 by Josh Adams in ue5-main branch]
2023-05-08 09:44:42 -04:00
joe kirchoff
2fce65608d UnrealBuildTool: Add msvc conformance flags to generated projects for intellisense
#rnx
#rb trivial

[CL 25345886 by joe kirchoff in ue5-main branch]
2023-05-04 19:40:36 -04:00
Josh Adams
703f9af2a7 - Error out when building Mac/IOS modern .app if no cooked&staged data is found (for non-editor, non-program projects)
- Fixed an issue where it would skip running the PostBuild stuff if it fails during the pulling in staged directory step
#preflight 6451033b0722d4f6a28bf138

[CL 25300116 by Josh Adams in ue5-main branch]
2023-05-02 08:43:19 -04:00
Josh Adams
c3d20c01c5 - Workaround to get engine source code in IOS projects (force the UnrealEditor project in the worksapce, but as a "stub" project)
#rb adam.kinge
#preflight 644ac0c71150e908d041eb67

[CL 25220918 by Josh Adams in ue5-main branch]
2023-04-27 14:55:24 -04:00
Josh Adams
8b1d9615f8 - Packaging and archiving for modern IOS/Mac:
- When doing standard BuildCookRun, package will simply finalize the (likely already finalize) .app in Binaries/<platform>
  - When using Distribution mode, packge will create a .xcarchive in the Xcode Library (as seen in Organizer) to be able to distribute in various modes
  - Archiving will copy either the .app or .xcarchive made above to the archive directory (it will always copy the most recent .xcarchive, since we don't create the directory name, we can't know which archive to copy, so the most recent one wins - not an issue when using -package, because it always makes a new .xcarchive)
- A few code cleanup/refactors in related
#preflight 644ab91fb208f61af82d8f76

[CL 25220287 by Josh Adams in ue5-main branch]
2023-04-27 14:22:37 -04:00
Joe Kirchoff
d0a2767ece UnrealBuildTool: Fix failure to open/browse to source file in Visual Studio
* Always update PrimaryProjectName.txt when a project specific solution is generated
* -Game solution is always placed under the project directory, update SourceCodeAccessor according, this code was out of date

#rnx
#jira UE-114382
#preflight 6449c0c4401d328ad93a635b

[CL 25209946 by Joe Kirchoff in ue5-main branch]
2023-04-26 20:42:54 -04:00