Commit Graph

252 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
axel riffard
229065504a DeploymentServer Deletion
#jira UE-103878 #rb Jack.Porter
#preflight 6059508a7d511a0001f910da

#ROBOMERGE-SOURCE: CL 15773943 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v783-15756269)

[CL 15785903 by axel riffard in ue5-main branch]
2021-03-23 17:57:06 -04:00
Marc Audy
76a4f7dd9e Merge CEF version 84.0.4147 from the //Portal branch directly into the //UE5/EA branch
- The CEF helper process has been renamed from UnrealCEFSubprocess to EpicWebHelper
- Support for accelerated rendering from CEF has been added (using GPU->GPU texture copies). This works for the Standalone renderer in DX11/macOS-OpenGL and in the D3D11 RHI renderer, otherwise falls back to the default CPU texture copy mode. Accelerated paint can be disabled by adding "-nocefaccelpaint" to the commandline.
- Numerous other bug fixes and perf improvements in the CEF code have been added since we last took a version drop

#jira distro-133
#[fyi] wes.fudala

#ushell-cherrypick of 15635368 by alfred.reynolds

[CL 15651276 by Marc Audy in ue5-main branch]
2021-03-09 01:37:10 -04:00
Marc Audy
8f73cd7fa9 Merge UE5/Release-Engine-Staging @ 15630841 to UE5/Main
This represents UE4/Main @ 15601601

[CL 15631170 by Marc Audy in ue5-main branch]
2021-03-05 19:27:14 -04:00
josh engebretson
d5c86ff44f Testing installed build mac uat/ubt changes
#ROBOMERGE-SOURCE: CL 15501404 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15502666 by josh engebretson in ue5-main branch]
2021-02-23 14:04:19 -04:00
Josh Engebretson
19a3987686 Fix for netcore AutomationTool/UnrealBuildTool binaries
#jira UE-108221
#rb ben.marsh

[CL 15387203 by Josh Engebretson in ue5-main branch]
2021-02-11 09:31:41 -04:00
Josh Adams
b0e4357576 - UBT Code changes to remove 32-bit Windows support (C++ code for 32-bit still exists)
#rb marc.audy (concept, not each file)

[CL 15265424 by Josh Adams in ue5-main branch]
2021-01-31 15:09:58 -04:00
Ryan Durand
f5110c1f52 Fixing graph break when Win64 isn't targeted for a release build.
#rtnx
#rb none
#jira none

[CL 15209972 by Ryan Durand in ue5-main branch]
2021-01-26 14:54:00 -04:00
Ben Marsh
973c5cbd7b Remove VS2017 as a supported compiler by default. Can still be overridden with the -2017 argument, but will not be maintained from this point onwards.
#rb none

[CL 15138832 by Ben Marsh in ue5-main branch]
2021-01-19 16:23:00 -04:00
Joakim Lindqvist
4477d7c295 Fixed issue were ubt was being spawned with the wrong path and via mono when creating a installed engine build
#jira UE-104425

[CL 15019201 by Joakim Lindqvist in ue5-main branch]
2021-01-08 09:42:20 -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
Ryan Durand
88449247dd Attempting to get Mac to stop being built when only Win64 is selected.
#rnx
#rb none
#jira none

[CL 14940579 by Ryan Durand in ue5-main branch]
2020-12-16 14:03:16 -04:00
Ryan Durand
5021ae3eb1 Fixing graph break.
#rnx
#rb none
#jira none

[CL 14937204 by Ryan Durand in ue5-main branch]
2020-12-15 22:05:15 -04:00
Ryan Durand
4301d65302 A platform's DDC should not be included when WithDDC is set if that paltform is not being built.
#rnx
#rb none
#jira none

[CL 14937180 by Ryan Durand in ue5-main branch]
2020-12-15 21:58:32 -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
94d7bd658a Avoid building our temporary net core csproj when build UAT during creation of installed build.
#rb none

[CL 14614245 by Joakim Lindqvist in ue5-main branch]
2020-10-29 15:06:51 -04:00
Marc Audy
68150e0be7 Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496
This represents UE4/Main @ 14594913

[CL 14612291 by Marc Audy in ue5-main branch]
2020-10-29 13:38:15 -04:00
Ryan Durand
f527a6cdb2 Fix Mac Datasmith plugins getting added when compiling Win64 only.
#rnx
#rb none
#jira UE-101766

[CL 14580736 by Ryan Durand in ue5-main branch]
2020-10-26 16:17:56 -04:00
Richard TalbotWatkin
5454adb18a Removed stale references to StaticMeshEditorExtension plugin in Build config files.
[CL 14558569 by Richard TalbotWatkin in ue5-main branch]
2020-10-23 13:23:42 -04:00
Ben Marsh
a96095af71 Mering fixes to installed build script from 4.26
#rb none

[CL 14475834 by Ben Marsh in ue5-main branch]
2020-10-12 18:24:31 -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
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