51 Commits

Author SHA1 Message Date
Joe Kirchoff
086969637c BatchFiles: Clean up so non-ide UBT builds all call the same script and fix up some dependency scanning
#rnx
#rb Brandon.Schaefer
#preflight 63b752af221aab21e0313ac2

[CL 23593968 by Joe Kirchoff in ue5-main branch]
2023-01-05 17:50:34 -05:00
joe kirchoff
27ee520c1b [Backout] - CL23055743
[FYI] Joe.Kirchoff
Original CL Desc
-----------------------------------------------------------------
BatchFiles: Add output directory when caling dotnet build as running the scripts via a visual studio environment requires this, and for consistency. Via UDN

#rnx
#rb Josh.Adams
#preflight 636ae35c7c2b505190d92839

[CL 23069893 by joe kirchoff in ue5-main branch]
2022-11-09 21:04:55 -05:00
joe kirchoff
73b3529e56 BatchFiles: Add output directory when caling dotnet build as running the scripts via a visual studio environment requires this, and for consistency. Via UDN
#rnx
#rb Josh.Adams
#preflight 636ae35c7c2b505190d92839

[CL 23069570 by joe kirchoff in ue5-main branch]
2022-11-09 20:58:05 -05:00
joe kirchoff
f1edb85ce3 Fix up code compile batch scripts to better support visual studio
* If invoked from VS2022, use visual studio to build UnrealBuildTool to prevent unnecessary rebuilds
* If invoked from VS2019 or on the command line without visual studio, use bundled dotnet to build
* Deduplicate all logic into Build.bat, and have Clean.bat and Rebuild.bat call Build.bat with either -Clean or -Rebuild
* Print entire dotnet version
* Replace various calls to dotnet msbuild with dotnet build
* Update old UE4 comments

#jira UE-165754
#rb ?

[CL 22387871 by joe kirchoff in ue5-main branch]
2022-10-06 19:45:24 -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
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
4aa09904f2 UnrealBuildTool now supports running as a net core project.
Added a set of netcore csprojs to BuildUtilities and DotnetUtilities that build to a seperate output folder. This allows other tools to still target .net framework (like UAT for instance).
UBT is still by default targeted as .net framework.

Note that UBT built for net core has a different output directory Engine/Binaries/DotNet/UnrealBuildTool/UnrealBuildTool.exe - this is due to how a netcore project output looks with signficantly more files that are related to that application (that would be overwritten if using a shared directory).

To opt in to this set UE_USE_DOTNET=1 environment variable.
Please note that due to the changed output directory a lot of tooling will likely break at this point.

#rb ben.marsh

[CL 14419918 by Joakim Lindqvist in ue5-main branch]
2020-10-05 08:13:04 -04:00
Joakim Lindqvist
c122ee4f15 Suppressed File Not Found error when running GenerateProjectFiles caused by there no longer being any source under Restricted/NotForLicensees
#rb ben.marsh

[CL 14396583 by Joakim Lindqvist in ue5-main branch]
2020-09-25 11:49:52 -04:00
Andriy Tylychko
7823462709 UE4->UE5 cosmetic renaming
#rb none

[CL 13967524 by Andriy Tylychko in ue5-main branch]
2020-07-29 18:11:24 -04:00
Andriy Tylychko
e798397908 It's UE5 now!
#rb cosmetic

[CL 13966991 by Andriy Tylychko in ue5-main branch]
2020-07-29 17:14:50 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -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
ben marsh
823dd8f8f2 Move restricted UBT source files into the Engine/Restricted folder.
#jira

#ROBOMERGE-SOURCE: CL 12690087 via CL 12690254 via CL 12690282
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v676-12543919)

[CL 12690314 by ben marsh in Main branch]
2020-04-09 11:32:17 -04:00
ryan durand
c11c085cf5 (Integrating from Dev-EngineMerge to Main)
Second batch of remaining Engine copyright updates.

#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10871196 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v626-10872990)

[CL 10902202 by ryan durand in Dev-Core branch]
2020-01-08 03:04:20 -05:00
Martin Ridgers
87cc3f5749 Native MSBuild implementation of UnrealBuildTool's discovery of platform extensions.
#rb josh.adams, ben.marsh

(ushell-p4-cherrypick of 7973988 by Martin.Ridgers)

(ushell-p4-cherrypick of 8124246 by Martin.Ridgers)

[CL 10889764 by Martin Ridgers in Dev-Core branch]
2020-01-07 06:58:43 -05:00
Ryan Durand
28d3d740dd (Integrating from Dev-EngineMerge to Main)
Second batch of remaining Engine copyright updates.

#rnx
#rb none
#jira none

[CL 10871196 by Ryan Durand in Main branch]
2019-12-27 07:44:07 -05:00
Martin Ridgers
18daac013e Undid changelist 8124316. Turns out Main and its children only have a partial implementation of platform extensions and therefore aren't ready for this change yet.
#rb trivial

[CL 8124442 by Martin Ridgers in Dev-Core branch]
2019-08-20 09:00:58 -04:00
Martin Ridgers
c9e740e419 Native MSBuild implementation of UnrealBuildTool's discovery of platform extensions.
#rb josh.adams, ben.marsh

(ushell-p4-cherrypick of 7973988 by Martin.Ridgers)

(ushell-p4-cherrypick of 8124246 by Martin.Ridgers)

[CL 8124316 by Martin Ridgers in Dev-Core branch]
2019-08-20 08:11:07 -04:00
Ben Marsh
0cc6e3dca6 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 6631504 by Ben Marsh in Main branch]
2019-05-24 11:51:54 -04:00
ben marsh
d698950f1e Improve error message when GenerateProjectFiles.bat fails due to no Visual Studio installation having an MSBuild installation available.
#rb none
#jira UE-74162

#ROBOMERGE-SOURCE: CL 6316167 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 6317365 by ben marsh in Main branch]
2019-05-06 11:32:53 -04:00
ben marsh
04ae685571 Fix error messages that instruct the user to install Visual Studio 2015 (should be 2017)
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 5343248 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5343253 by ben marsh in Main branch]
2019-03-07 17:35:38 -05:00
ben marsh
3d75bb6a66 Add a dedicated file to check whether binary prerequisites have been downloaded from GitHub, rather than checking for SwarmAgent.exe or any other build product.
#rb none
#jira UE-71058

#ROBOMERGE-SOURCE: CL 5305673 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5314625 by ben marsh in Main branch]
2019-03-06 12:43:55 -05:00
ben marsh
0a7bff24d0 Remove RPCUtility.
#rb none
#jira UE-70509
[FYI] Peter.Sauerbrei

#ROBOMERGE-SOURCE: CL 5174514 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5207569 by ben marsh in Main branch]
2019-02-26 16:38:49 -05:00
Joe Barnes
55cc21d08f Copying //UE4/Dev-Console to Main (//UE4/Main) Source CL: 4825024
#lockdown: Nick.Penwarden
#rb integration

[CL 4825156 by Joe Barnes in Main branch]
2019-01-28 17:35:18 -05:00