Commit Graph

1198 Commits

Author SHA1 Message Date
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
Jeff Farris
96f162e5dd UAT: fix SyncProject's handling of p4 commands and improvements to global p4 option handling in general (collab with Josh)
#rb Josh.Adams

[CL 14746262 by Jeff Farris in ue5-main branch]
2020-11-13 17:53:33 -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
Marc Audy
68150e0be7 Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496
This represents UE4/Main @ 14594913

[CL 14612291 by Marc Audy in ue5-main branch]
2020-10-29 13:38:15 -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
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -04:00
Joakim Lindqvist
a626769a0f Deleted unused source files in UAT
While these were present no csproj actually referenced them and built them, thus these files do not actually compile.

#rb none

[CL 14532228 by Joakim Lindqvist in ue5-main branch]
2020-10-21 06:15:33 -04:00
Marc Audy
50a3d7d368 Merge Release-Engine-Staging to Main @ CL# 14467590
This represents UE4/Main @ 14432125 + some cherrypick fixes

[CL 14468207 by Marc Audy in ue5-main branch]
2020-10-09 22:42:26 -04:00
devin doucette
0d0880c989 Extended and added platforms to UAT BuildCMakeLib
- Wrapped the build in try/finally to always clean up of the build directory.
- Fixed target platform construction to include the target architecture.
- Fixed target platform construction to log an error on failure instead of crashing on a null dereference later.
- Fixed configuration name comparisons to be case-insensitive.
- Added an optional BinOutputPath param to match LibOutputPath.
- Changed to an empty default MakeTarget because CMake was not generating a target with the previous default name.
- Changed BuildTargetLib to use cmake --build instead of implementing custom build logic for every target platform.
- Changed Linux to use CMake and make from the path instead of attempting to use the Mac binaries.
- Simplified the TargetPlatform interface to remove a lot of boilerplate code from the implementations.

#jira none
#rb Brandon.Schaefer

[CL 14439522 by devin doucette in ue5-main branch]
2020-10-07 13:32:27 -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
03675533ea Rename UE4Game -> UnrealGame, UE4Client -> UnrealClient, UE4Server -> UnrealServer.
Mostly a find/replace, though I have looked through the changes and attempted to update references to other things as necessary (eg. renaming IOS plist files for IOS). I'm not set up to test on any platforms other than windows, and was hoping to get your blessing to submit and give QA enough time as possible to uncover issues before the next milestone release.

Particular things that I know I'm not sure about:
- Android references /UE4Game/ paths everywhere (for paths on device, I think). I have no idea if I've got them all.
- I've renamed the iOS mobileprovisions, but I don't know if they need regenerating for the new app name.
- Likewise, not sure what needs to be updated for icon bundles on iOS.

Things that have not been changed:
- Windows still uses IDI_UE4ICON for its icon
- UE4CommandLine.txt
- There's still a UE4Game module which is used by content-only projects

#rb none

[CL 14301890 by Ben Marsh in ue5-main branch]
2020-09-11 15:54:42 -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
Ben Marsh
be7034ec27 Rename UE4Editor to UE5Editor, and generated solution/projects from UE4 -> UE5.
UE4Game/Client/Server targets left intact for the time being.

#rb none

[CL 14288076 by Ben Marsh in ue5-main branch]
2020-09-10 09:10:30 -04:00
Joakim Lindqvist
f6d7bf2fa9 Added UAT commands with helpers in DotNetUtilities for uploading and download trees of content to Jupiter (our new storage service).
#rb ben.marsh

[CL 14266118 by Joakim Lindqvist in ue5-main branch]
2020-09-07 07:28:34 -04:00
Marc Audy
7379fa99c5 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14229157
[CL 14233282 by Marc Audy in ue5-main branch]
2020-09-01 14:07:48 -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
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
cfd31ecf26 - Moved UAT project commandline parsing up to BuildCommand to be usable by scripts other than BuildCookRun
[CL 13623629 by Josh Adams in ue5-main branch]
2020-06-04 17:13:26 -04:00
Ryan Durand
e6f651d0f2 Adding support in CopyUAT to write out a copied file list for debugging purposes.
#rnx
#rb none
#jira none

[CL 13427461 by Ryan Durand in ue5-main branch]
2020-05-19 17:11:30 -04:00
per larsson
aca6a34679 IoDispatcher: Encryption support.
- updated IoStoreWriter to encrypt blocks (not assets)
- updated automation scripts to pass relevant encryption commands to IoStore comandlet
- added encryption guid to container TOC header
- added encryption guid to container meta when loading/saving release information
- updated IoStore command to enable container local namemap when encryption is enabled
- updated IoDispatcher file backend to decrypt blocks
- added encryption key cache to FileIoStore

#rb CarlMagnus.Nordin, PJ.Kack


#ushell-cherrypick of 13032243 by Per.Larsson

#ROBOMERGE-SOURCE: CL 13167088 via CL 13167091 via CL 13167092 via CL 13167094
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v688-13145358)

[CL 13167097 by per larsson in Main branch]
2020-05-05 03:49:22 -04:00
pj kack
4218910d99 IoStore: Replace GlobalImports (only referenced script objects and package exports) with ScriptObjects (all script objects) and PublicExports (all public exports)
1) First, parse all import tables to find the set of all referenced script packages (as a good approximation of which modules/script packages that are actually used for the target platform)
2) Then find and build import name lookup tables from all public non editoronly objects in memory in these packages.
3) Parse all export tables, to find all exports, and build import name lookup tables from all public exports.
4) Parse and validate all individual import entries in the import tables using the import name lookup tables from 2 & 3.
Dump all import and export data to/from the release version meta.

#rb per.larsson


#ushell-cherrypick of 13063212 by PJ.Kack

#ROBOMERGE-SOURCE: CL 13146983 via CL 13146985 via CL 13146986 via CL 13146988
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v688-13145358)

[CL 13146989 by pj kack in Main branch]
2020-05-04 05:57:35 -04:00
jeff newquist
6992d55362 Move location of GameOpenOrder.log, EditorOpenOrder.log and CookerOpenOrder.log to platform extensions folder
#rb none
[FYI] josh.adams
#rnx

#ROBOMERGE-SOURCE: CL 13119430 via CL 13119444 via CL 13119470
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v687-13115495)

[CL 13119491 by jeff newquist in Main branch]
2020-04-30 12:42:29 -04:00
ben marsh
4605c70651 Remove unused test code.
#jira

#ROBOMERGE-SOURCE: CL 13113744 via CL 13113745 via CL 13113747
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13113750 by ben marsh in Main branch]
2020-04-30 08:09:34 -04:00
jeff newquist
ba5f688d8c Move Build platform files to platform extensions folder
#rb none
[FYI] josh.adams, ben.woodhouse
#rnx

#ROBOMERGE-SOURCE: CL 13072249 via CL 13072256 via CL 13072267
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13072279 by jeff newquist in Main branch]
2020-04-29 14:23:13 -04:00