Commit Graph

120 Commits

Author SHA1 Message Date
Ben Marsh 7012109f94 Upgrade GitDependencies to NET Core 3.1, and convert to a self-contained application.
- Application is now built separately and has a native executable for each supported host platform (win-x64, osx-x64, linux-x64).
- Included Publish.bat file allows publishing new builds for each platform to the correct location.
- Bundled Mono distribution is no longer required for bootstrapping the repo.
- Publish script will likely need updating to support osx-arm64 once we upgrade to NET 6.0.
- Renamed environment variables and state files to be UE_ rather than UE4_.

#fyi Ryan.Hummer, Jonathan.Adamczewski, Will.Damon, Brandon.Schaffer
#preflight none

[CL 19122278 by Ben Marsh in ue5-main branch]
2022-02-24 14:52:40 -05: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
robert seiver 0492fc5725 Fixed typos in wording of error statements and whitespace mistakes.
#jira UE-131094
#review @Brandon.Schaefer
#preflight 61e888e0276892ce1080d293

[CL 18666825 by robert seiver in ue5-main branch]
2022-01-19 17:10:22 -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
Ben Marsh f0ef65f0cf Fix GitDependencies.sh creating invalid symlink.
#jira UE-118800

[CL 16771531 by Ben Marsh in ue5-main branch]
2021-06-24 08:50:42 -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
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
jack porter dcb36dc03d Fix merge error breaking iOS remote build
#rb trivial
#jira UE-108593

#ROBOMERGE-SOURCE: CL 15429402 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15429407 by jack porter in ue5-main branch]
2021-02-17 01:00:07 -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
Jack Porter 75f53c8388 Fix up iOS remote build after move from Mono to dotnet
- build UBT/UAT on remote Mac
- exclude unnecessary UBT platform source from rsync upload
- modifications to UBT to allow it to compile with Linux and Lumin excluded
- manually convert CRLF for Mac shell scripts after rsync upload
#review
#rb Brandon.Schaefer
#fyi Ben.Marsh

[CL 15045791 by Jack Porter in ue5-main branch]
2021-01-11 21:17:03 -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
Marc Audy bf80889353 UE5/Release-Engine-Staging to UE5/Main
This represents UE4/Main up to CL# 14958402

[CL 15028197 by Marc Audy in ue5-main branch]
2021-01-08 19:56:07 -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
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 d2a25fafa7 When using UBT in dotnet, unset TargetName when starting build from xcode as this also has meaning to dotnet breaking the build of UBT.
#jira UE-103443

[CL 14813662 by Joakim Lindqvist in ue5-main branch]
2020-11-25 15:18:53 -04:00
Joakim Lindqvist 5e269e72d8 Fixed dotnet environment on Mac, the bundled dotnet sdk setup was incorrect.
[CL 14788160 by Joakim Lindqvist in ue5-main branch]
2020-11-19 13:37:29 -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
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 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