Commit Graph

26 Commits

Author SHA1 Message Date
jonathan adamczewski
7796bc81bb UnrealBuildTool:
Remove IsRunningOnMono

For remaining references, IsRunningOnMono -> !IsRunningOnWindows

#jira none
#trivial

[CL 16175552 by jonathan adamczewski in ue5-main branch]
2021-04-30 22:11:47 -04:00
jonathan adamczewski
61b793626e revert 16173499
[CL 16173666 by jonathan adamczewski in ue5-main branch]
2021-04-30 17:49:02 -04:00
jonathan adamczewski
c1b2fd7955 HoloLensPlatform.Automation:
Remove some references to Mono

#jira none
#trivial

[CL 16173499 by jonathan adamczewski in ue5-main branch]
2021-04-30 17:32:56 -04:00
jeff newquist
5ea7789d60 Rename UE4CommandLine.txt to UECommandLine.txt and deal with all the related changes
#rb TBD
#jira UE-113713

[CL 16093056 by jeff newquist in ue5-main branch]
2021-04-22 10:29:26 -04:00
robert srinivasiah
dad92ed5fd Hololens: Package missing IoStore files
Plus a little cleanup. Technically, IoStore can run w/o pak.

#rb Jeff.Fisher Ben.Marsh
#jira UE-99878

#ROBOMERGE-SOURCE: CL 15878917 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15878951 by robert srinivasiah in ue5-main branch]
2021-03-31 14:27:57 -04:00
martin ridgers
ca3b5923d6 A few GetCookPlatform() implementations were not checking bIsClientOnly correctly. As a result they were staging Client and Game versions to the same output location.
#rb josh.adams
#rnx

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

[CL 15527031 by martin ridgers in ue5-main branch]
2021-02-25 05:41:14 -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
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
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
017048f505 Changed pdb format to not use portable pdbs (which is the default in net core) and instead back to our old pdb configuration.
This resolves a issue with PCBs were pdbcopy failed to run because it does not support portable pdbs.

#rb none

[CL 14837521 by Joakim Lindqvist in ue5-main branch]
2020-12-02 14:54:53 -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
1b4f6b3ac9 Changed output directory for UAT projects under netcore, now outputting to a seperate directory for each addin. This avoids the risk of output stomping each other breaking incremental builds. Furthermore it makes it easier to understand who adds what dependency to the output.
Also cleaned up some output assemblies, preventing all transative references from being outputed (as we assume they build directly to the output directory instead). Unfortunatley the UBT references still cause tranastive dependencies to be copied as this is also a executable that needs to work outside of UAT as well, we should eventually move all UBT referenced code into BuildUtilities.

#rb none
#fyi ben.marsh

[CL 14775171 by Joakim Lindqvist in ue5-main branch]
2020-11-18 10:18:50 -04:00
Joakim Lindqvist
4aa9d3dddf Hololens fixes in UBT and UAT under netcore
This was using net framework specific apis, found corresponding apis under net core and switched to them.

#jira UE-103000

[CL 14763785 by Joakim Lindqvist in ue5-main branch]
2020-11-17 11:43:58 -04:00
Joakim Lindqvist
bd18d9e6e8 Disabled copy local on project references for netcore projects, fixes build warnigns caused by multiple copies trying to write to the same output files.
Also reduces footprint on disk and speedsup builds slightly.

Also took a pass over all projects to fixup their output paths as there were some inconsitencies from my port to netcore.
Lastly I disabled the resource folders for everything but english to reduce some of the noise in the output folder, this just impacts which languages you get code analysis.

#jira UE-102147
#rb none

[CL 14651855 by Joakim Lindqvist in ue5-main branch]
2020-11-04 09:48:49 -04:00
Joakim Lindqvist
f90e40ffb0 UAT can now build as a netcore application.
Added a NET_CORE define to allow us to have changes side by side.
The AWS S3 changes are required due to us requiring to upgrade the S3 assembly version to get net core support (which made all methods async).
The ACL checks for files are not available in the system libraries of net core, as such the api is a bit different.

AutomationToolLauncher now just spawns a subprocess when used in netcore, as netcore does not support custom AppDomains and shadow copying. We will generally need to revisit this for netcore as this whole feature of building the source for UAT in UAT is not really possible.

To enable this set environment variable "UE_USE_DOTNET=1", note that with netcore all applications change their output path so this will likely break a bit of tooling when enabled.

#rb ben.marsh

[CL 14572339 by Joakim Lindqvist in ue5-main branch]
2020-10-26 06:08:59 -04:00
Joakim Lindqvist
2750553a40 UAT Net Core - Copied project files into net core compatible format
#rb none

[CL 14572287 by Joakim Lindqvist in ue5-main branch]
2020-10-26 06:05:41 -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
Rolando Caloca
5b82f15def Copying //UE4/Dev-RenderPlat-Staging@11388153 to //UE4/Main
#rb none
#rnx

[CL 11388545 by Rolando Caloca in Main branch]
2020-02-12 13:27:19 -05:00
Juan Canada
2ecf4f9708 Merging //UE4/Dev-Main@10877709 to Dev-RenderPlat-Staging(//UE4/Dev-Rendering)
#rnx
#rb none

[CL 10895568 by Juan Canada in Dev-RenderPlat-Staging branch]
2020-01-07 13:45:01 -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
michael trepka
fb67a2b5c3 Copy of CL 10625418 by Ben.Marsh
Fix missing UAT/UBT log output on Mac (fallout from CL 6849473). Standard macros set through the DefineConstants property (eg. "TRACE") were being overwritten by __MonoCS__, causing TraceLog() function calls to be compiled out.



#ROBOMERGE-OWNER: michael.trepka
#ROBOMERGE-AUTHOR: michael.trepka
#ROBOMERGE-SOURCE: CL 10636055 via CL 10636127 via CL 10636131
#ROBOMERGE-BOT: (v609-10634694)

[CL 10636132 by michael trepka in Main branch]
2019-12-10 10:56:43 -05:00
Jeff Fisher
e86444407c UE-81878 Unable to package projects for Android error MSB4186: Invalid static method invocation syntax
#rb Ryan.Vance
#review-9625772
#jira UE-81878

[CL 9625820 by Jeff Fisher in Main branch]
2019-10-16 19:13:53 -04:00
Ben Marsh
60efbc77ea Fix compiling UAT when AutoSDK is not available.
#rb none
#rnx
#robomerge main

[CL 9562410 by Ben Marsh in Dev-Build branch]
2019-10-11 21:36:55 -04:00
Ben Marsh
bbfa349d8c Add support for using AutoSDK in the HoloLens automation project.
#rb none
#rnx

[CL 9551558 by Ben Marsh in Dev-Build branch]
2019-10-11 16:01:19 -04:00
joe conley
30559f99b7 Merging 7325797 using 4.23_to_Dev-VR
Now requiring a certificate to package HL2
Now requiring "CN=" in the company name for creating a certificate

#JIRA: UE-76506
#RB: jason.bestimt

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: joe.conley
#ROBOMERGE-SOURCE: CL 7678483 in //UE4/Release-4.23/... via CL 7678484
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v388-7785529)

[CL 7804620 by joe conley in Dev-Build branch]
2019-08-06 12:25:41 -04:00