Commit Graph

155 Commits

Author SHA1 Message Date
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
Josh Adams
ab4a48f566 - Moved UEBuildPlatformSDK into a separate DLL, BuildUtilities (similar to DotNETUtilities), allowing for better sharing of code between UBT and UAT (Turnkey in particular)
- Refactored SDK versioning into more formalized APIs for all platforms. Currently UBT will not error with bad versions, but that is coming.
- Turnkey updated to use new BuildUtilities
#rb ben.marsh

[CL 13733158 by Josh Adams in ue5-main branch]
2020-06-22 14:32:25 -04:00
Josh Adams
2e39adff82 - Fixed paths to known ThirdParty assemblies
#rb ben.marsh

[CL 13721810 by Josh Adams in ue5-main branch]
2020-06-19 17:05:51 -04:00
Josh Adams
12dfa939db - Moving Google Apis to Binaries/ThirdParty with Copy Local set to False in the references in UAT
- Deleted .net version DLLs that we aren't using (.net40 and .netstandard10/13)
#fyi andrew.grant,ben.marsh
#rb ben.marsh

[CL 13534400 by Josh Adams in ue5-main branch]
2020-05-24 15:49:30 -04:00
jack porter
726be3773b Fixed iOS failure to match find profile when packaging for distribution with an ad-hoc provisioning profile
Fixed issue with fix for UE-77351 with Shipping builds
Fixed iOS automation failure enumerating folders where there user does not have permission the read the folder
#jira UE-91526
#jira UE-77351
#rb Allan.Bentham
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 12917406 in //UE4/Release-4.25/... via CL 12918163 via CL 12918398
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12918444 by jack porter in Main branch]
2020-04-20 07:22:45 -04:00
Ben Marsh
d6d7c939e5 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 12726184 by Ben Marsh in Main branch]
2020-04-10 11:30:32 -04:00
steve smith
ef82f1572e Merged from Dev-Build:
Fixed issue with converting UnrealTargetPlatform to string when parsing command line options

Added a TypeConverter for UnrealTargetPlatform
Added check if a typeconverter exists when parsing command line arguments
#rb ben.marsh
#jira none

#ROBOMERGE-SOURCE: CL 12383340 in //UE4/Release-4.25/... via CL 12383343
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v671-12333473)

[CL 12383347 by steve smith in Main branch]
2020-03-23 17:09:31 -04:00
ben marsh
afc9107407 Allow specifying a timespan for ThreadPoolWorkQueue.Wait().
#jira


#ROBOMERGE-SOURCE: CL 12147960 via CL 12147962 via CL 12149504
#ROBOMERGE-BOT: (v659-12123632)

[CL 12149616 by ben marsh in Main branch]
2020-03-12 13:29:29 -04:00
ben marsh
0f201db161 Add support for UAT script projects using foreign engine builds, and for game projects to output binaries under their own project directory.
* UAT will now read each *.Automation.csproj file to determine the output path, and load from there rather than just loading anything under Engine\Binaries\AutomationScripts.
* When compiling *.Automation.csproj files, UAT will set the $(EngineDir) directory to the current engine directory, allowing the project to resolve assembly references to the correct location.
* When generating project files, UBT will create an *.Automation.csproj.props file next to the project containing the path to the engine directory, allowing the assembly to be compiled correctly from Visual Studio.

#rb none
#jira UE-77934

#ROBOMERGE-SOURCE: CL 11601626 in //UE4/Release-4.25/... via CL 11601635
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)

[CL 11601659 by ben marsh in Main branch]
2020-02-25 09:26:12 -05:00
Ben Marsh
0e6aa011b3 Copying //UE4/Dev-Build @ CL 11166028 to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 11166227 by Ben Marsh in Main branch]
2020-01-29 14:48:18 -05:00
ryan durand
282b7051e2 Fixing an edge case crash when trying to word wrap a very long "word" and the current sentence is already full.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10955034 via CL 10972174 via CL 10972336
#ROBOMERGE-BOT: (v632-10940481)

[CL 10972496 by ryan durand in Main branch]
2020-01-13 19:33:59 -05:00
robomerge
0e74e5d0cf Merging Engine/Source/Programs/DotNETCommon/MetaData.cs from Dev-EngineMerge to Main.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: buildmachine
#ROBOMERGE-SOURCE: CL 10870957 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v624-10872983)

[CL 10876683 by robomerge in Dev-Build branch]
2020-01-05 17:25:15 -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
buildmachine
7e38813b4f Merging Engine/Source/Programs/DotNETCommon/MetaData.cs from Dev-EngineMerge to Main.
#rnx
#rb none
#jira none

[CL 10870957 by buildmachine in Main branch]
2019-12-26 23:03:39 -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
MilkyEngineer
f6c91ff260 PR #6412: FIX: Added support for FileReference to fix serialisation of RemoteMac.SshPrivateKey (Contributed by MilkyEngineer)
#rb none

[CL 10488810 by Ben Marsh in Dev-Build branch]
2019-12-02 15:32:14 -05:00
Ryan Durand
e2eeda3ff3 Refactor how we find child process IDs.
#rnx
#rb ben.marsh
#jira none

[CL 10075533 by Ryan Durand in Dev-Build branch]
2019-11-07 16:18:10 -05:00
Ryan Durand
cd14b5d4ac Adding WriteFileTask so we can write out a "build complete" file onto the share so the stuff Rene is working on can upload the build.
#rnx
#rb ben.marsh
#jira none

[CL 9749288 by Ryan Durand in Dev-Build branch]
2019-10-22 15:08:57 -04:00
Rolando Caloca
1a30325d6f Copying //UE4/Dev-RenderPlat-Staging@9551419 to //UE4/Main
#rb none
#rnx

[CL 9551447 by Rolando Caloca in Main branch]
2019-10-11 15:33:31 -04:00
Andrew Grant
bf5ae63b7f Restoring changes from 9530618 with -
- Don't fall through to an exception if an Exists() clause fails
- Don't use an inline function for recursion (older .net versions?)
- Remove project reference in Gauntlet that was being added by new Platform/* wildcard

#fyi luke.thatcher, marc.audy
#jira UE-81525
#rb na

[CL 9537797 by Andrew Grant in Main branch]
2019-10-10 11:44:17 -04:00
Andrew Grant
54c420f6ac Undo //UE4/Main/Engine/Source/Programs/... changelist 9530618
#jira #rb na

[CL 9534305 by Andrew Grant in Main branch]
2019-10-10 10:39:08 -04:00
Andrew Grant
1e1d6f7e6e Fixing odd issue on builders with nested function
#jira na
#rb marc.audy

[CL 9534192 by Andrew Grant in Main branch]
2019-10-10 10:34:51 -04:00
Andrew Grant
b334dd8b98 The "platforms as plugins" work exposed two awesome issues...
1) The CsProjectinfo class was not processing <Choose> nodes so ItemGroups within those nodes were not having their compile files parsed

2) The CsProjectInfo class only supported fully formed paths, not the wildcard syntax that csproj files can use.

This CL corrects both of these by adding the following -

* <Choose> nodes are now descended into and their elements are processed.
* The condition evalutor now supports the Exists statement (e.g. Exists(path))
* Wildcard include statements are expanded into a list of files. File wildcards (Foo/*.cs), path wildcards (Foo/*/*.cs), and greedy wildcards (Foo/**) are all supported.

As part of this work the Gauntlet.csproj file has been modified to use wildcards.

#review-9493793 @ben.marsh,@luke.thatcher
#jira UE-81525
#rb reviewed

[CL 9530618 by Andrew Grant in Main branch]
2019-10-10 08:54:46 -04:00
bob tellez
8caa83dfc9 #UE4 Added copyright
[FYI] Ben.Marsh


#ROBOMERGE-SOURCE: CL 9421562 via CL 9421564 via CL 9421566 via CL 9421568 via CL 9422709
#ROBOMERGE-BOT: (v480-9420520)

[CL 9423042 by bob tellez in Main branch]
2019-10-04 16:48:38 -04:00
ben marsh
69d578b959 UBT: Add unique error messages for every site that can throw an exception when creating managed processes. Also retry creating a process if it fails with ERROR_ACCESS_DENIED, which we seem to be seeing intermittently on the builders.
#ROBOMERGE-SOURCE: CL 9420558 via CL 9420568 via CL 9420572 via CL 9420589 via CL 9422358
#ROBOMERGE-BOT: (v480-9420520)

[CL 9422426 by ben marsh in Main branch]
2019-10-04 16:19:09 -04:00