Commit Graph

32 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
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
jonathan adamczewski
451c261ca9 GenerateProjectFiles.sh
Use UnrealBuildTool dll, rather than exe

#jira none
#trivial

[CL 16931763 by jonathan adamczewski in ue5-main branch]
2021-07-22 18:03:48 -04:00
jack porter
bd6edb9d47 Fix Mac GenerateProjectFiles.sh argument quoting
#jira UE-106289
#jira UE-112801
#rb Will.Damon
#lockdown Jack.Porter
[FYI] Will.Damon
#preflight 6076842193d37d0001e897d1

#ROBOMERGE-OWNER: jack.porter
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 16001683 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v789-15992632)
#ROBOMERGE-CONFLICT from-shelf

[CL 16001716 by jack porter in ue5-main branch]
2021-04-14 02:30:22 -04:00
will damon
ed1641d05b Fixup GenerateProjectFiles
- Fixup whitespace typo in GenerateProjectFiles.sh (for top-level and Mac)

#rb trivial
#jira none
#rnx

[CL 15886052 by will damon in ue5-main branch]
2021-04-01 00:29:51 -04:00
jonathan adamczewski
28225c7741 Use installed UBT when run from an installed build
#rb Ben.Marsh
#jira UE-111568

[CL 15879394 by jonathan adamczewski in ue5-main branch]
2021-03-31 14:56:06 -04:00
will damon
174a270e0e [UBT][Mac] Fix support for uproject pathnames containing spaces.
- Also, fixup Link phase to use `env' to avoid quotation discrepancies between .NET and shell environments.

#rb josh.adams
[FYI] brandon.schaefer
#jira UE-106289
#rnx

#ROBOMERGE-OWNER: will.damon
#ROBOMERGE-AUTHOR: will.damon
#ROBOMERGE-SOURCE: CL 15836091 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v785-15821902)
#ROBOMERGE-CONFLICT from-shelf

[CL 15836217 by will damon in ue5-main branch]
2021-03-25 19:55:52 -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
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
701b33939e Updated mac 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.
#rb ben.marsh

[CL 14641121 by Joakim Lindqvist in ue5-main branch]
2020-11-03 08:46:05 -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
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
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
joe graf
9dd9880768 Fixed the error when checking a default value that doesn't exist on Mac for generation of project files
#rb: none
#jira: UE-76437

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: joe.graf
#ROBOMERGE-SOURCE: CL 7065728 in //UE4/Release-4.23/... via CL 7065739
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v367-6836689)

[CL 7124607 by joe graf in Dev-Core branch]
2019-06-21 02:08:08 -04:00
jeff fisher
08fda94fd5 Copying //UE4/Dev-VR to Main (//UE4/Main)
-Copy up for 4.23
#rb none

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: jeff.fisher
#ROBOMERGE-SOURCE: CL 6911980 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v366-6836689)

[CL 6925549 by jeff fisher in Dev-Core branch]
2019-06-11 03:36:04 -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
dougmoscrop
713a04b875 PR #5615: Fix quotes on SetupMono.sh for Mac (Contributed by dougmoscrop)
#jira UE-71327
#rb trivial

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

[CL 5367897 by michael trepka in Main branch]
2019-03-12 07:09:13 -04: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
Ben Marsh
a22b952aa9 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 4718806 by Ben Marsh in Main branch]
2019-01-14 12:11:24 -05:00