Commit Graph

155 Commits

Author SHA1 Message Date
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
Joakim Lindqvist
2f6056b62b UAT Net-Core now supports running on Linux as well.
Set UE_USE_DOTNET=1 to enable this.

#rb ben.marsh

[CL 14641009 by Joakim Lindqvist in ue5-main branch]
2020-11-03 08:30:22 -04:00
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -04:00
Marc Audy
50a3d7d368 Merge Release-Engine-Staging to Main @ CL# 14467590
This represents UE4/Main @ 14432125 + some cherrypick fixes

[CL 14468207 by Marc Audy in ue5-main branch]
2020-10-09 22:42:26 -04:00
Joakim Lindqvist
3a29656e63 Updated linux shell scripts for UBT in NetCore, opt in by setting UE_USE_DOTNET=1, note that due to output path differences a lot of tooling will break when enabling it.
Added download.sh scripts to download new versions of dotnet sdk to inline for Linux and Mac.

#rb ben.marsh

[CL 14445358 by Joakim Lindqvist in ue5-main branch]
2020-10-08 09:28:12 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
Ben Marsh
03675533ea Rename UE4Game -> UnrealGame, UE4Client -> UnrealClient, UE4Server -> UnrealServer.
Mostly a find/replace, though I have looked through the changes and attempted to update references to other things as necessary (eg. renaming IOS plist files for IOS). I'm not set up to test on any platforms other than windows, and was hoping to get your blessing to submit and give QA enough time as possible to uncover issues before the next milestone release.

Particular things that I know I'm not sure about:
- Android references /UE4Game/ paths everywhere (for paths on device, I think). I have no idea if I've got them all.
- I've renamed the iOS mobileprovisions, but I don't know if they need regenerating for the new app name.
- Likewise, not sure what needs to be updated for icon bundles on iOS.

Things that have not been changed:
- Windows still uses IDI_UE4ICON for its icon
- UE4CommandLine.txt
- There's still a UE4Game module which is used by content-only projects

#rb none

[CL 14301890 by Ben Marsh in ue5-main branch]
2020-09-11 15:54:42 -04:00
Ben Marsh
486408b1a9 Rename UE5Editor to UnrealEditor.
#rb none
#jira UE-97600

[CL 14292067 by Ben Marsh in ue5-main branch]
2020-09-10 15:39:00 -04:00
Ben Marsh
be7034ec27 Rename UE4Editor to UE5Editor, and generated solution/projects from UE4 -> UE5.
UE4Game/Client/Server targets left intact for the time being.

#rb none

[CL 14288076 by Ben Marsh in ue5-main branch]
2020-09-10 09:10:30 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
Ben Marsh
99be00dcdb Merging latest from Private-Starship.
[CL 13192225 by Ben Marsh in ue5-main branch]
2020-05-05 18:50:52 -04:00
michael sartain
8bafdac91b Use msbuild in mono for Linux when using an installed copy and mono >= 5.0.
Pulled code from Andrew's CL 7828885 for the Mac.

#jira none
#rb ben.marsh
[FYI] brandon.schaefer, andrew.grant

#ROBOMERGE-SOURCE: CL 11750877 in //UE4/Release-4.25/... via CL 11750986
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11776541 by michael sartain in Main branch]
2020-02-28 16:03:47 -05:00
brandon schaefer
3b45b4cc1b Move to new llvm clang 9.0.1 v16 toolchain
#jira UE-85219
#rb none
[FYI] Michael.Sartain

#ROBOMERGE-SOURCE: CL 11448348 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11448367 by brandon schaefer in 4.25-Plus branch]
2020-02-14 16:01:59 -05:00