Commit Graph

167 Commits

Author SHA1 Message Date
Brandon Schaefer
9bc8cb80ac Forgot to submit change here for zlib when building toolchain
#jira none
#rb none

[CL 19542143 by Brandon Schaefer in ue5-main branch]
2022-03-29 10:50:34 -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
Brandon Schaefer
8d8f6dac39 Update some files for building v20 13.0.1 toolchain
#jira UE-136811
#rb none
#preflight none
#fyi Michael.Sartain, Robert.Seiver

[CL 19495034 by Brandon Schaefer in ue5-main branch]
2022-03-24 10:08:31 -04:00
Brandon Schaefer
adb9207567 Do not try to build UBT when running an installed builds (PR #8995 Thanks slonopotamus!)
#jira UE-146826
#rb none
#preflight none
#fyi Robert.Seiver

[CL 19485453 by Brandon Schaefer in ue5-main branch]
2022-03-23 16:46:04 -04:00
Ben Marsh
7012109f94 Upgrade GitDependencies to NET Core 3.1, and convert to a self-contained application.
- Application is now built separately and has a native executable for each supported host platform (win-x64, osx-x64, linux-x64).
- Included Publish.bat file allows publishing new builds for each platform to the correct location.
- Bundled Mono distribution is no longer required for bootstrapping the repo.
- Publish script will likely need updating to support osx-arm64 once we upgrade to NET 6.0.
- Renamed environment variables and state files to be UE_ rather than UE4_.

#fyi Ryan.Hummer, Jonathan.Adamczewski, Will.Damon, Brandon.Schaffer
#preflight none

[CL 19122278 by Ben Marsh in ue5-main branch]
2022-02-24 14:52:40 -05:00
robert seiver
a06276389d Fixed a typo in an error message which listed an incorrect path.
#jira UE-140063
#review-18710998 @brandon.schaefer
#preflight 61eef44cef289ffc6df2e62d

[CL 18712198 by robert seiver in ue5-main branch]
2022-01-24 14:07:18 -05:00
robert seiver
f0416374ea Accepting PR fixing an error with escape sequences and recommending a different Linux build
#jira UE-137741
#preflight none
#review-18666392 @Brandon.Schaefer
#preflight 61e8891f1267521567e5a041

[CL 18666856 by robert seiver in ue5-main branch]
2022-01-19 17:11:58 -05:00
robert seiver
0492fc5725 Fixed typos in wording of error statements and whitespace mistakes.
#jira UE-131094
#review @Brandon.Schaefer
#preflight 61e888e0276892ce1080d293

[CL 18666825 by robert seiver in ue5-main branch]
2022-01-19 17:10:22 -05:00
brandon schaefer
d5823b1b37 Make sure to rebuild libc++/libc++abi with FILESYSTEM enabled
#jira UE-136811
#rb none

#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 18560804 in //UE5/Release-5.0/... via CL 18560805
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v899-18417669)

[CL 18560832 by brandon schaefer in ue5-release-engine-test branch]
2022-01-10 11:44:14 -05:00
brandon schaefer
66a2b15ba9 Force zlib enabled when building the toolchain, requires correctly static linking
#jira none
#rb none

#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 18560702 in //UE5/Release-5.0/... via CL 18560734
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v899-18417669)

[CL 18560770 by brandon schaefer in ue5-release-engine-test branch]
2022-01-10 11:41:26 -05:00
Marc Audy
f512a6d461 Eliminate whitespace only differences between Release-Engine-Staging and Release-Engine-Test
#fyi Aurel.Cordonnier

[CL 18448630 by Marc Audy in ue5-release-engine-test branch]
2021-12-13 15:59:48 -05:00
aurel cordonnier
dc4bf61540 Merge from Release-Engine-Staging @ 17030559 to Release-Engine-Test
This represents UE4/Main @ 17030256 and Dev-PerfTest @ 17030553

[CL 17031509 by aurel cordonnier in ue5-release-engine-test branch]
2021-08-03 11:56:47 -04:00
brandon schaefer
63120c8d9d Add support for LLDB pretty printer for Linux
#jira UE-52619
#rb none
[FYI] Will.Damon, Michael.Sartain

#ROBOMERGE-SOURCE: CL 16974335 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v838-16927207)

[CL 16974342 by brandon schaefer in ue5-release-engine-test branch]
2021-07-27 17:36:41 -04:00
michael sartain
2097967364 Convert CRLF Linux files to LF
They need to be LF on Linux like all the other bat files, and
git really doesn't like .bat files with mixed line endings since our .gitattributes file claims all .bat files are CRLF.

PR #8241

#rb Brandon.Schaefer
[FYI] Ben.Marsh
#jira none

#ROBOMERGE-SOURCE: CL 16971649 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v838-16927207)

[CL 16971656 by michael sartain in ue5-release-engine-test branch]
2021-07-27 14:58:04 -04:00
brandon schaefer
c60b80f7da Update UE5/Main to v19 toolchain
#jira UE-118949
#rb none

#ROBOMERGE-SOURCE: CL 16862196 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)

[CL 16862200 by brandon schaefer in ue5-release-engine-test branch]
2021-07-15 10:20:22 -04:00
Marc Audy
e80ea6b959 Merge from Release-Engine-Staging @ 16444985
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16445122 by Marc Audy in ue5-release-engine-test branch]
2021-05-25 02:43:26 -04:00
james singer
5cd34442bc Change filetype for some Linux scripts to binary, but still with delta storage.
This allows WSL compiles to use the same workspace as normal Windows.  It works because it prevents the perforce client from modifying the line ending to be CRLF.

#jira none
#rb Brandon.Schaefer

#ROBOMERGE-SOURCE: CL 16299647 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v800-16297934)

[CL 16299663 by james singer in ue5-release-engine-test branch]
2021-05-12 11:05:46 -04:00
jonathan adamczewski
1c0b3d7c15 SetupDotnet.sh:
Handle different major version for installed dotnet

#jira none

[CL 16057564 by jonathan adamczewski in ue5-main branch]
2021-04-19 21:03:35 -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
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
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
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
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