Commit Graph

170 Commits

Author SHA1 Message Date
josh adams
9483bd40f5 - Fixed ModernXcode when a program has a ExeBinariesSubFolder
#rb trivial

[CL 25893367 by josh adams in ue5-main branch]
2023-06-09 10:41:06 -04:00
josh adams
7da8c50033 - Fixed location of where EnsureXcodeProjectExists() looks for BP projects
- Fixed warning about SDKROOT[sdk=macosx] type warnings with legacy Xcode
#rb axel.riffard,tim.smith

[CL 25796956 by josh adams in ue5-main branch]
2023-06-05 13:25:48 -04:00
josh adams
3d31269cdf - Fixed a bug caused by the C# auto-cleanup of code. (foo != "") is not the same as (!string.IsNullOrEmpty(foo)) , it is (foo == null || foo.Length() > 0)
#rb trivial
#preflight skip

[CL 25734570 by josh adams in ue5-main branch]
2023-06-01 14:38:53 -04:00
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
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
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
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
Josh Adams
97fae42953 - Fixed QuickLaunch for IOS working with Modern xcode
- No longer try to grab the output from IOS with QuickLaunch as idevicedebug is killing the app too quickly
- The modern Staged directory can now be shared between Development/Shipping/etc, for grabbing any non-Framework .dylibs (like steam)
- Removed the extra --generate-entitlements-der option now that Xcode also always adds it
#preflight 6447d49a024bc608e64072f9
#rb adam.kinge
#preflight 6447d6643d1be392df890776

[CL 25179459 by Josh Adams in ue5-main branch]
2023-04-25 09:51:37 -04:00
Josh Adams
39fe150f8f - Fixed FilePath properties with new XcodeProjectSettings class
#fyi calvin.zheng
#rb trivial
#preflight skip
#preflight 644737cbc632d1e89b7cd072

[CL 25174859 by Josh Adams in ue5-main branch]
2023-04-24 22:29:57 -04:00
calvin zheng
d615e69004 Exposing xcode settings to UE settings UI (more work about dynamic disabling etc will follow)
#jira N/A
#rb Josh.Adams
#preflight 6446ae7a7368de8c98fc84d2

[CL 25169123 by calvin zheng in ue5-main branch]
2023-04-24 15:15:00 -04:00
Josh Adams
cb2b0999c1 - Allow modern xcode indexing of files in modules that are fully under another platform (like /IOS/IOSTargetPlatform), but disallow platform files in a shared module (Core/Private/IOS/IOSPlatformFile.cpp)
#rb adam.kinge
#preflight skip

[CL 25150056 by Josh Adams in ue5-main branch]
2023-04-21 14:24:44 -04:00
Josh Adams
a725affbd8 - Fixed a crash with parallel file writing in modern xcode
#rb calvin.zheng
#preflight skip

[CL 25150024 by Josh Adams in ue5-main branch]
2023-04-21 14:23:47 -04:00
Josh Adams
4323a4108a - QAGame Mac passes validation for App Store (and can upload)
- Thin the dylibs in a .app when archiving, and warn that the dylibs have all needed architectures
- Added some default entitilements files for Mac, for Sandbox, and set Sandbox entiitlements as Shipping default
- Added some Modern ini options (ModernBundleIdentifie, AppCategory
- Updated CEF3 to have a single universal framework, which gets Thinned down if making a single architecture app
#rb calvin.zheng,roman.dzieciol
#preflight 64405af7a9720904a6c3eb4f

[CL 25117174 by Josh Adams in ue5-main branch]
2023-04-19 17:42:52 -04:00