Commit Graph

508 Commits

Author SHA1 Message Date
Ben Marsh
c5ea9d7d29 UAT: Add support for Windows on ARM64 through RunUAT.bat.
#preflight none

[CL 23179353 by Ben Marsh in ue5-main branch]
2022-11-17 13:07:35 -05:00
joe kirchoff
27ee520c1b [Backout] - CL23055743
[FYI] Joe.Kirchoff
Original CL Desc
-----------------------------------------------------------------
BatchFiles: Add output directory when caling dotnet build as running the scripts via a visual studio environment requires this, and for consistency. Via UDN

#rnx
#rb Josh.Adams
#preflight 636ae35c7c2b505190d92839

[CL 23069893 by joe kirchoff in ue5-main branch]
2022-11-09 21:04:55 -05:00
joe kirchoff
73b3529e56 BatchFiles: Add output directory when caling dotnet build as running the scripts via a visual studio environment requires this, and for consistency. Via UDN
#rnx
#rb Josh.Adams
#preflight 636ae35c7c2b505190d92839

[CL 23069570 by joe kirchoff in ue5-main branch]
2022-11-09 20:58:05 -05:00
joe kirchoff
b311a39f7b Build.bat: Partially restore old logic where UBT was not compiled and only compile if it is missing, to prevent building mulitple times in parallel from visual studioand while UBT is running.
UBT should already be compiled via UGS (GenerateProjectFiles) or from VisualStudio, and while this could cause an out of date UBT to run this is a better stopgap fix then never building at all

#rnx
#rb trivial

[CL 22793046 by joe kirchoff in ue5-main branch]
2022-10-26 17:31:21 -04:00
joe kirchoff
cc127cea07 Correctly return errorlevel from Build.bat
#rnx
#rb Tim.Smith
#jira UE-167352
#preflight 634d9514181aa2a00d8d8846

[CL 22594247 by joe kirchoff in ue5-main branch]
2022-10-18 01:22:18 -04:00
Ryan Hummer
0ea41c9941 Removing mono referenced from GitDependencies scripts
mono not used by this tool

#rnx
#jira none
#rb none
#preflight none

[CL 22490973 by Ryan Hummer in ue5-main branch]
2022-10-12 21:25:25 -04:00
joe kirchoff
f1edb85ce3 Fix up code compile batch scripts to better support visual studio
* If invoked from VS2022, use visual studio to build UnrealBuildTool to prevent unnecessary rebuilds
* If invoked from VS2019 or on the command line without visual studio, use bundled dotnet to build
* Deduplicate all logic into Build.bat, and have Clean.bat and Rebuild.bat call Build.bat with either -Clean or -Rebuild
* Print entire dotnet version
* Replace various calls to dotnet msbuild with dotnet build
* Update old UE4 comments

#jira UE-165754
#rb ?

[CL 22387871 by joe kirchoff in ue5-main branch]
2022-10-06 19:45:24 -04:00
calvin zheng
b3be31546a Fix ShaderCompileWorker arm64 support in Xcode
#jira UE-166157
#preflight 633ddbcdb6053e828796119b
#rb rolando.caloca
#lockdown rolando.caloca

[CL 22387843 by calvin zheng in ue5-main branch]
2022-10-06 19:44:31 -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
joe kirchoff
1c78b292a7 Disable .NET Server GC for Mac as it is currently causing errors
#jira UE-161338
#rnx
#rb trivial
#preflight 631f8d5e065c4ac9ce62f550

[CL 21984671 by joe kirchoff in ue5-main branch]
2022-09-13 12:10:46 -04:00
robert seiver
23fae11e9e Disabled an optimization which crashes dotnet during GenerateProjectFiles on Ubuntu 20.04.
#rb Brandon.Schaefer
#fyi Henrik.Karlsson, Joe.Kirchoff, Francisco.Vicente
#preflight none

[CL 21553834 by robert seiver in ue5-main branch]
2022-08-24 18:08:06 -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
David Harvey
b1769c8472 Preserve the ERRORLEVEL from AutomationTool if we apply Turnkey variables.
#rnx
#jira none
#rb Martin.Sevigny
#preflight 62f50052185b21882a31c2bc

[CL 21335116 by David Harvey in ue5-main branch]
2022-08-11 09:31:16 -04:00
Joe Kirchoff
3f1de0e66c Update bundled dotnet to 6.0.302
#rb Ryan.Hummer
#rnx
#jira UE-159980
#preflight 62f152ba0264595302c59855

[CL 21273202 by Joe Kirchoff in ue5-main branch]
2022-08-08 15:06:11 -04:00
josh adams
f133254485 - Fixed up 3 Linux ContentWorker issues that came from the dotnet 6 upgrade (or other recent UE5 changes):
* Staged the wrong Dotnet directory when making CW from Windows (it would stage Dotnet/6.20.00/windows)
* The ScriptModule code that used the Automation.json files to discover the precompiled UAT script dlls didn't handle \'s on Linux in the paths, and since Windows wrote out the files, there are \'s aplenty. I fixed up the known issue, but possibly all paths loaded from the json files should be fixed up, but it's not easy to do automatically
* We moved to using RunUAT.sh instead of calling dotnet directly, however because we make the CW on Windows, dotnet was not executable, and the code in RunUAT.sh to find the dotnet executable and make it executable (chmod `which dotnet`) only works if dotnet is already executable! So, I moved the +x code into SetupDotnet.sh, on Linux and Mac
#rb eric.knapik
#preflight 62ccd2009922f7e512b6e51a

#ROBOMERGE-OWNER: josh.adams
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 21055451 via CL 21055464 via CL 21055478
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v972-20964824)
#ROBOMERGE-CONFLICT from-shelf

[CL 21076349 by josh adams in ue5-main branch]
2022-07-13 14:17:50 -04:00
Ryan Hummer
20675b16cb Wrap paths in quotes to allow for spaces in path names
#rnx
#jira UE-158233
#rb brandon.schaefer
#preflight na

[CL 20948137 by Ryan Hummer in ue5-main branch]
2022-07-05 15:49:20 -04:00
robert seiver
d88ec4c971 Accepting GitHub 9284 which modifies SetupToolchain.sh to not use incomplete archives when downloading the toolchain (instead it starts from scratch)
#jira UE-156934
#fyi @Brandon.Schaefer
#preflight none

[CL 20773768 by robert seiver in ue5-main branch]
2022-06-22 10:01:04 -04:00
Josh Adams
3bf0256dd3 - Added a CompileSingleFile.sh that can run in Xcode to compile a single file via UBT. It activates Terminal so the user can see output and copy and paste, etc. To use, make a new custom Behavior (+ button at bottom of Behaviors window), and point it at this script. It uses AppleScript to find the current document, platform, and scheme, but will always compile in Development (couldn't find a way to get the project to get the build config)
#rb none
#preflight skip

[CL 20333045 by Josh Adams in ue5-main branch]
2022-05-23 14:05:17 -04:00
Josh Adams
8ba3d7ed4c - MIssed NFL path in P4VUtils installers
#rb trivial
#preflight skip

[CL 20248551 by Josh Adams in ue5-main branch]
2022-05-17 14:56:57 -04:00
Josh Adams
bcb77edc06 - Fixing up some P4VUtils paths in the installers
- Split up the binaries between platform since there are #if's due to WinForms
#rb trivial
#preflight skip

[CL 20247967 by Josh Adams in ue5-main branch]
2022-05-17 14:26:37 -04:00
Josh Adams
a6c5a6ccd9 - Updated p4vutils to dotnet6, so we can use OperatingSystem nicely
- Will compile on Mac and Linux now
- Mac replaced the WinForms functionality with AppleScript
- Linux will compile be have reduced functionality
- Fixed up paths for p4v settings and dotnet location
- Added binaries and installer scripts for all 3 platforms - won't need UGS to install, will copy to user-library location (may need some adustment on Linux, will address after)
#rb will.damon
#preflight skip

[CL 20244727 by Josh Adams in ue5-main branch]
2022-05-17 12:00:08 -04:00
Ryan Durand
0d13c0dbf4 Per platform GitDependencies with the read-only fixes.
#rnx
#rb ryan.hummer
#jira none
#preflight

[CL 20103260 by Ryan Durand in ue5-main branch]
2022-05-09 11:12:21 -04:00
brandon schaefer
de9a7c46ea Update SetupToolchain.sh to download new v20 toolchain
#jira UE-136811
#rb Ryan.Hummer, James.Singer
#preflight none

#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 20040844 in //UE5/Release-5.0/... via CL 20045719
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20047950 by brandon schaefer in ue5-main branch]
2022-05-04 16:14:01 -04:00
Josh Adams
79f52f0a4e - Changed RunUAT.sh to always chmod u+x dotnet
#rb brandon.schaefer,mitchell.fisher
#jira UE-150680
#preflight skip

[CL 20013961 by Josh Adams in ue5-main branch]
2022-05-02 15:44:13 -04:00
Ryan Durand
06cb489d5c Fix missing x flag on Mac version of SetupDotnet.sh, move GitDependencies to .Net 6, and fix GitDependencies binaries and scripts.
#rnx
#jira none
#rb ryan.hummer
#preflight

[CL 19983705 by Ryan Durand in ue5-main branch]
2022-04-29 15:26:36 -04:00