Commit Graph

384 Commits

Author SHA1 Message Date
jonathan adamczewski
70ed64e369 Fix "Build Tools CS Mac" on Mac
RunUAT.sh:
Setup Mono environment on Mac and Linux so that AutomationTool is able to launch xbuild for CsCompile tasks that have not been transitioned to NET Core.
(Linux change is untested)

CsCompileTask.cs:
Don't add the "/restore" argument to command line when building using xbuild as it does not appear to be supported.

InstalledEngineBuild.xml:
Remove CsCompile invocations for UAT projects as these are currently not able to be compiled by UAT: CsCompile does not know how use the bundled dotnet to build NET Core projects, and [our bundled] mono does not support NET Core projects.

This file is consumed by AutomationTool, which is compiled by RunUAT.sh. As such, it can generally be assumed that the UAT build is up to date when the built files are consumed (InstalledEngineBuild.xml has directives to tag the AutomationTool files to ensure they are included.)

#jira UE-112471

[CL 15902338 by jonathan adamczewski in ue5-main branch]
2021-04-02 12:03:38 -04:00
will damon
ed1641d05b Fixup GenerateProjectFiles
- Fixup whitespace typo in GenerateProjectFiles.sh (for top-level and Mac)

#rb trivial
#jira none
#rnx

[CL 15886052 by will damon in ue5-main branch]
2021-04-01 00:29:51 -04:00
jonathan adamczewski
28225c7741 Use installed UBT when run from an installed build
#rb Ben.Marsh
#jira UE-111568

[CL 15879394 by jonathan adamczewski in ue5-main branch]
2021-03-31 14:56:06 -04:00
will damon
174a270e0e [UBT][Mac] Fix support for uproject pathnames containing spaces.
- Also, fixup Link phase to use `env' to avoid quotation discrepancies between .NET and shell environments.

#rb josh.adams
[FYI] brandon.schaefer
#jira UE-106289
#rnx

#ROBOMERGE-OWNER: will.damon
#ROBOMERGE-AUTHOR: will.damon
#ROBOMERGE-SOURCE: CL 15836091 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v785-15821902)
#ROBOMERGE-CONFLICT from-shelf

[CL 15836217 by will damon in ue5-main branch]
2021-03-25 19:55:52 -04:00
jonathan adamczewski
007a58123e UnrealBuildTool.exe -> dotnet UnrealBuildTool.dll (2/n)
Various build scripts

[CL 15750907 by jonathan adamczewski in ue5-main branch]
2021-03-19 16:26:44 -04:00
jonathan adamczewski
a64f00151e UnrealBuildTool.exe -> dotnet UnrealBuildTool.dll (1/n)
Build.bat, Clean.bat, GenerateProjectFiles.bat

[CL 15733201 by jonathan adamczewski in ue5-main branch]
2021-03-17 21:12:07 -04:00
ben marsh
60ac8174c8 Hardening validation of command line arguments for RunUAT.bat. Removes need to escape arguments with parentheses.
#rb none
[FYI] Andrew.Grant

#ROBOMERGE-SOURCE: CL 15668827 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v779-15635321)

[CL 15670582 by ben marsh in ue5-main branch]
2021-03-10 17:58:04 -04:00
jack porter
dcb36dc03d Fix merge error breaking iOS remote build
#rb trivial
#jira UE-108593

#ROBOMERGE-SOURCE: CL 15429402 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15429407 by jack porter in ue5-main branch]
2021-02-17 01:00:07 -04:00
Marc Audy
bc88b73a29 Merge Release-Engine-Staging to Main @ CL# 15151250
Represents UE4/Main @ 15133763

[CL 15158774 by Marc Audy in ue5-main branch]
2021-01-21 16:22:06 -04:00
Joakim Lindqvist
bcb42bbe0e Removed extra call to GetDotnetPath which was caused by a incorrect merge in change 14834347
[CL 15048236 by Joakim Lindqvist in ue5-main branch]
2021-01-12 08:20:11 -04:00
Jack Porter
75f53c8388 Fix up iOS remote build after move from Mono to dotnet
- build UBT/UAT on remote Mac
- exclude unnecessary UBT platform source from rsync upload
- modifications to UBT to allow it to compile with Linux and Lumin excluded
- manually convert CRLF for Mac shell scripts after rsync upload
#review
#rb Brandon.Schaefer
#fyi Ben.Marsh

[CL 15045791 by Jack Porter in ue5-main branch]
2021-01-11 21:17:03 -04:00
Brandon Schaefer
57e6dd7c53 Rename and fix up UE4 referencing in GDB/LLDB formatters
#jira UE-104743
#rb Will.Damon
#fyi Michael.Sartain

[CL 15041825 by Brandon Schaefer in ue5-main branch]
2021-01-11 16:00:52 -04:00
Marc Audy
bf80889353 UE5/Release-Engine-Staging to UE5/Main
This represents UE4/Main up to CL# 14958402

[CL 15028197 by Marc Audy in ue5-main branch]
2021-01-08 19:56:07 -04:00
will damon
4dd3568c5f Rename UE4EditorServices to UnrealEditorServices
- Rename files/folders.
- Rename output targets.
- Fixup icon reference in Info.plist

#rb brandon.schaefer rolando.caloca
#review-15004124 @rolando.caloca @brandon.schaefer
#jira UE-104770
#rnx

[CL 15004464 by will damon in ue5-main branch]
2021-01-06 18:21:17 -04:00
Joakim Lindqvist
ebccc2c5ce Removed node reuse and shared compilation flags for RunUAT.sh, these were not inteded to be submitted. They would disable the worker nodes which means we will now dotnet process hosting msbuild left after the build, which is annoying but a fairly substantial speed up. This is consistent with how RunUAT works on windows.
Also added -msbuild-verbose to RunUAT.sh for consistency with RunUAT.bat

#jira UE-104511

[CL 14947662 by Joakim Lindqvist in ue5-main branch]
2020-12-17 12:39:35 -04:00
Joakim Lindqvist
6cc3671c25 Fixed incorrect path to UBT project
#rb none

[CL 14850000 by Joakim Lindqvist in ue5-main branch]
2020-12-03 17:39:56 -04:00
Joakim Lindqvist
21c8c9e829 Switched over to dotnet msbuild from dotnet build (which just calls msbuild anyway).
This has less verbose output when a build is successful (nothing) but still outputs errors when something is wrong, which means we can remove the redirection of stdout so we actually can see compile errors from UBT when running GenerateProjects.

#rb none

[CL 14842937 by Joakim Lindqvist in ue5-main branch]
2020-12-03 07:08:20 -04:00
Joakim Lindqvist
1b63b507be Reduced verbosity on RunUAT back to expected levels and removed msbuild logo when invoking it to clean up the output a bit.
#rb none

[CL 14834497 by Joakim Lindqvist in ue5-main branch]
2020-12-02 08:10:50 -04:00
Joakim Lindqvist
8769374226 Build UBT before running UAT, this should not be needed but testing to see if this resolves our incremental horde build issue.
#rb none

[CL 14834471 by Joakim Lindqvist in ue5-main branch]
2020-12-02 07:54:31 -04:00
Joakim Lindqvist
145c291d1c Temporarily increased msbuild verbosity to debug issues when starting incremental builds in horde
[CL 14834417 by Joakim Lindqvist in ue5-main branch]
2020-12-02 07:30:58 -04:00
Joakim Lindqvist
ccc145439f Improved output of using bundled dotnet sdk
#rb none

[CL 14834410 by Joakim Lindqvist in ue5-main branch]
2020-12-02 07:28:29 -04:00
Joakim Lindqvist
e7039d3d35 UBT and UAT now use .NET Core instead of Framework and Mono. This means that we use the same runtime on Windows, Linux and Mac. Further benefits including newer C# features and a lot of intresting features for the future around AOT and Tiered compilation.
Some behavior changes:
Output paths - Both tools are now output to a subdirectory of Binaries/Dotnet, I believe most hardcoded paths have been fixed up but there may be tools that will fail because of this.
UAT Plugin Building - As .NET Core does not support AppDomain unloading, how we build the plugins has changed quite a bit, these are now built before UAT is started rather then by UAT itself. If you just start UAT via RunUAT.bat/sh this should just continue to work.

#rb ben.marsh

[CL 14834347 by Joakim Lindqvist in ue5-main branch]
2020-12-02 06:57:13 -04:00
Joakim Lindqvist
fd2b821c0c Fixed dotnet_root not being set when executing UBT if you do not have a dotnet runtime installed.
#jira UE-103636

[CL 14815602 by Joakim Lindqvist in ue5-main branch]
2020-11-26 06:25:07 -04:00
Joakim Lindqvist
d2a25fafa7 When using UBT in dotnet, unset TargetName when starting build from xcode as this also has meaning to dotnet breaking the build of UBT.
#jira UE-103443

[CL 14813662 by Joakim Lindqvist in ue5-main branch]
2020-11-25 15:18:53 -04:00
Joakim Lindqvist
5e269e72d8 Fixed dotnet environment on Mac, the bundled dotnet sdk setup was incorrect.
[CL 14788160 by Joakim Lindqvist in ue5-main branch]
2020-11-19 13:37:29 -04:00