Commit Graph

82 Commits

Author SHA1 Message Date
jonathan adamczewski
4ece24e65a AutomationTool, BuildUtilities:
UnrealBuild -> Unreal for EngineDirectory, RootDirectory, IsEngineInstalled, UnrealBuildToolPath
Remove CommandUtils EngineDirectory, RootDirectory, IsEngineInstalled - use equvalents from UnrealBuildBase.Unreal

#jira none

[CL 16648181 by jonathan adamczewski in ue5-main branch]
2021-06-11 18:20:44 -04:00
aurel cordonnier
e0ad4e25df Merge from Release-Engine-Test @ 16624776 to UE5/Main
This represents UE4/Main @ 16579691 and Dev-PerfTest @ 16579576

[CL 16625248 by aurel cordonnier in ue5-main branch]
2021-06-10 13:13:24 -04:00
Ben Marsh
ab5822fd36 Fix non-deterministic use of GetHashCode() in ProjectUtils.cs.
#rb none
#rnx

[CL 15214570 by Ben Marsh in ue5-main branch]
2021-01-26 22:40:11 -04:00
Ben Marsh
6f927647b1 Changing C# code over to using EpicGames.Core over DotNETCommon.
#rb none
#rnx

[CL 14962096 by Ben Marsh in ue5-main branch]
2020-12-21 23:07:37 -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
4a3312078d -Compile for UAT is now handled by the batchfiles rather then inside UAT itself when running netcore version (as netcore does not support shadow copy so we can not update the assemblies we are running)
Also removed usages of automationtool launcher in netcore as we no longer need it.

#rb ben.marsh
#jira UE-102151

[CL 14663048 by Joakim Lindqvist in ue5-main branch]
2020-11-05 09:07:32 -04:00
Ben Marsh
423991c54b Fix UAT compile error.
#rb none

[CL 14354764 by Ben Marsh in ue5-main branch]
2020-09-20 20:48:38 -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
da26a1885b Deprecate the BranchInfo constructor that takes a list of host platforms as a parameter.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 12489772 in //UE4/Release-4.25/... via CL 12489774 via CL 12489779
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12489787 by ben marsh in Main branch]
2020-03-30 16:23:08 -04:00
ben marsh
ecc58f4ad8 Fix slow UAT startup due to populating metadata for every project in branch.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 12487058 in //UE4/Release-4.25/... via CL 12487062 via CL 12487069
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12487632 by ben marsh in Main branch]
2020-03-30 12:15:31 -04:00
anthony bills
1ef400627b Add support for whitelisting additional plugins and adding additional modules to plugin extensions.
Additionally allow monolithic programs inside platform extensions to ouput to the Binaries directory in the extension.

[at]brian.white, [at]josh.adams, [at]ben.marsh
#jira UE-81798
#rb ben.marsh

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

[CL 11655284 by anthony bills in Main branch]
2020-02-27 10:47:20 -05:00
ben marsh
03ae195b79 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536 via CL 10870955
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v624-10872983)

[CL 10876681 by ben marsh in Dev-Build branch]
2020-01-05 17:24:44 -05:00
Ryan Durand
9ef3748747 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536
#ROBOMERGE-BOT: FORTNITE (Main -> Dev-EngineMerge) (v613-10869866)

[CL 10870955 by Ryan Durand in Main branch]
2019-12-26 23:01:54 -05:00
marc audy
6c38998de8 Allow projects to opt out of having enabled by default engine plugins enabled by specify DisableEnginePluginsByDefault in the uproject. This requires all plugins to be explicitly enabled and prevents upgrades from bringing new plugins in unexpectedly.
#jira

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 10772231 via CL 10776004 via CL 10776035 via CL 10776057
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v610-10636431)

[CL 10831478 by marc audy in Dev-Build branch]
2019-12-19 16:39:54 -05:00
marc audy
bfcbfc1ffa Allow projects to opt out of having enabled by default engine plugins enabled by specify DisableEnginePluginsByDefault in the uproject. This requires all plugins to be explicitly enabled and prevents upgrades from bringing new plugins in unexpectedly.
#jira


#ROBOMERGE-SOURCE: CL 10772231 via CL 10776004 via CL 10776035
#ROBOMERGE-BOT: (v610-10636431)

[CL 10776057 by marc audy in Main branch]
2019-12-17 16:37:25 -05:00
ben marsh
aafb4851cb Rework checks for whether a temporary target is necessary to ensure the same code is used at runtime and in UAT.
#rb none
#jira UE-84440, UE-84444
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 10312968 in //UE4/Release-4.24/... via CL 10312999
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v610-10636431)

[CL 10761608 by ben marsh in Dev-Build branch]
2019-12-17 09:30:24 -05:00
ben marsh
becd2b94d4 Rework checks for whether a temporary target is necessary to ensure the same code is used at runtime and in UAT.
#rb none
#jira UE-84440, UE-84444
#rnx

#ROBOMERGE-SOURCE: CL 10312968 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v593-10286020)

[CL 10312999 by ben marsh in Main branch]
2019-11-19 16:53:37 -05:00
Ben Marsh
d1201f3c99 Fix CIS
#rb none
#rnx

[CL 10083725 by Ben Marsh in Dev-Build branch]
2019-11-08 11:23:41 -05:00
ben marsh
c1ce0c7b01 UBT: Add native support for parsing command line arguments inside Target.cs files, via the [CommandLine] attribute on fields.
#jira


#ROBOMERGE-SOURCE: CL 9137624 via CL 9137662
#ROBOMERGE-BOT: (v443-9013191)

[CL 9137678 by ben marsh in Main branch]
2019-09-26 09:49:06 -04:00
Ben Marsh
af881c5bbd Allow selecting the target to package through the project packaging menu, rather than showing client/server in the configuration menu. This allows support for multiple game/client/server targets.
#rb none
#jira UE-80162

[CL 8675647 by Ben Marsh in Dev-Build branch]
2019-09-13 13:29:44 -04:00
Ben Marsh
421de9107a Fix editor-only plugins triggering recompilation of code projects.
Also rework logic for determining whether a project needs to be compiled, to more closely match equivalent code in UAT. ITargetPlatform::NeedsTempTarget() now allows querying whether a project needs a temporary target to be generated.

#rb none
#jira UE-79833

[CL 8623682 by Ben Marsh in Dev-Build branch]
2019-09-10 16:11:58 -04:00
Ben Marsh
828f1fda6a Tidy up ProjectUtils.RequiresTempTarget.
#rb none
#rnx

[CL 8579529 by Ben Marsh in Dev-Build branch]
2019-09-09 18:46:25 -04:00