Commit Graph

441 Commits

Author SHA1 Message Date
Max Chen
e4d4965491 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 7774443 by Max Chen in Dev-Editor branch]
2019-08-05 15:48:51 -04:00
andrew grant
6b18803f46 Fixed issue where P4.FileExistsInDepot would return true when the path didn't exist
Bigly refactor of SyncProject script!

* If project file is not on disk will now attempt to find it in P4 (e.g no need to sync a project before you can sync a project).

*Added -projectonly option to skip updating of Engine dir (useful with -force when you've deleted files..)

* Changed default of maxwait to 0 based on new understanding of how this functions.

* Now works when the project is in a different P4 depot than the engine

[at]ben.marsh


#ROBOMERGE-SOURCE: CL 7688001 via CL 7688013 via CL 7688019 via CL 7690526
#ROBOMERGE-BOT: (v383-7686620)

[CL 7690676 by andrew grant in Main branch]
2019-08-01 13:28:12 -04:00
ben marsh
db5cdb331d Sign binaries with a SHA1 and SHA256 certificate.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 7688654 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v383-7686620)

[CL 7688657 by ben marsh in Main branch]
2019-08-01 12:56:20 -04:00
josh engebretson
d97916126a Gauntlet: Add support for dervice reseration pools
#rnx


#ROBOMERGE-SOURCE: CL 7650698 via CL 7654022
#ROBOMERGE-BOT: (v372-7473910)

[CL 7654117 by josh engebretson in Main branch]
2019-07-29 17:36:06 -04:00
andrew grant
6acdb1f5c8 QOL improvements for Mac from UE4/Main that missed original branch
- Use msbuild where possible for building UAT by checking for mono5
- Hash state of UAT scritps post-compile to skip redundant rebuilds

#jira nojira
#rb na

#ROBOMERGE-SOURCE: CL 7634479 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7634480 by andrew grant in Main branch]
2019-07-26 12:09:44 -04:00
Chris Gagnon
d7d4ee7b38 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) at CL 7473521
#rb none
#fyi Max.Chen, Tim.Gautier

[CL 7614721 by Chris Gagnon in Dev-Editor branch]
2019-07-24 15:05:52 -04:00
andrew grant
0e3be6e446 Cleaned up some comments (thanks MS!)
[FYI] michael.sartain


#ROBOMERGE-SOURCE: CL 7557895 via CL 7557963 via CL 7584977
#ROBOMERGE-BOT: (v372-7473910)

[CL 7606191 by andrew grant in Main branch]
2019-07-24 11:39:25 -04:00
andrew grant
be529ea063 Removed a piece of test code from previous checkin
#ROBOMERGE-SOURCE: CL 7541501 via CL 7541520 via CL 7556001
#ROBOMERGE-BOT: (v372-7473910)

[CL 7556132 by andrew grant in Main branch]
2019-07-23 13:25:02 -04:00
andrew grant
fb608ba070 Now automatically detect if mono5 is installed on Mac and use msbuild if so, otherwise stick to xbuild
[FYI] arciel.rekman, michael.sartain



#ROBOMERGE-OWNER: andrew.grant
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7541249 via CL 7541252 via CL 7555938
#ROBOMERGE-BOT: (v372-7473910)

[CL 7555946 by andrew grant in Main branch]
2019-07-23 13:23:01 -04:00
andrew grant
9955926d69 Added string formatting to BuildTarget
Added ability for Help() markup in build script to span multiple lines



#ROBOMERGE-SOURCE: CL 7464352 via CL 7465048 via CL 7470081
#ROBOMERGE-BOT: (v371-7306989)

[CL 7470221 by andrew grant in Main branch]
2019-07-20 11:18:27 -04:00
leigh swift
011aa07601 Exposing new Install Time Coefficients to C# BPT classes.
#rb Antony.Carter



#ROBOMERGE-SOURCE: CL 7327094 via CL 7350757
#ROBOMERGE-BOT: (v371-7306989)

[CL 7396992 by leigh swift in Main branch]
2019-07-17 10:13:13 -04:00
andrew grant
8f3494794c Updated SyncedProject script with some minor QOL improvements
- Added help documentation
 - Added list of files that should be clobbered to avoid workspace settings
 - Use helper to autodetect project path if a full path is not specified
 - Added skipbuild option
 - Added preview option
 - Added parallel sync (defaults to 2: 30% faster on internal network)
 - Added option to force sync
 - Added option to sync explicit paths (last two are for writable files)
 - Fix issue if buildinfo file is missing

#rb ben.marsh
[CODEREVIEW] ben.marsh


#ROBOMERGE-SOURCE: CL 7293946 via CL 7293951 via CL 7293954 via CL 7293958 via CL 7308957
#ROBOMERGE-BOT: (v371-7306989)

[CL 7316114 by andrew grant in Main branch]
2019-07-15 20:51:57 -04:00
andrew grant
5912400653 Fixed potential issue when UAT is run on a clean workspace
#ROBOMERGE-SOURCE: CL 7292923 via CL 7292924 via CL 7292927 via CL 7292932 via CL 7308928
#ROBOMERGE-BOT: (v371-7306989)

[CL 7316028 by andrew grant in Main branch]
2019-07-15 20:51:02 -04:00
andrew grant
dccd2282ec Added missing copyright notice
[FYI] bob.tellez


#ROBOMERGE-SOURCE: CL 7290535 via CL 7290537 via CL 7292712 via CL 7292735 via CL 7308913
#ROBOMERGE-BOT: (v371-7306989)

[CL 7315955 by andrew grant in Main branch]
2019-07-15 20:50:02 -04:00
andrew grant
92c8c8937f Switched UAT build process on Mac to use msbuild.
Enabled parallel msbuild for Mac
Added HashCollection class that can hold and serialize a collection of content hashes
Added quick dependency checking to UAT build by hashing csproj, input and output files for all modules
Reduced some logging when not running with -verbose

#rb Ben.Marsh
[FYI] Ben.Marsh


#ROBOMERGE-OWNER: andrew.grant
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7290522 via CL 7290525 via CL 7292711 via CL 7292732 via CL 7308901
#ROBOMERGE-BOT: (v371-7306989)

[CL 7315952 by andrew grant in Main branch]
2019-07-15 20:50:01 -04:00
andrew grant
f0e2d2dce3 Added helper UAT script to create a p4config file. Solves issue in Mac with tools that issue P4 commands directly.
#ROBOMERGE-SOURCE: CL 7288848 via CL 7288849 via CL 7289735 via CL 7289806 via CL 7306500
#ROBOMERGE-BOT: (v370-7290619)

[CL 7306552 by andrew grant in Main branch]
2019-07-15 06:43:14 -04:00
Max Chen
4561801a81 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) @7119039
#rb none

[CL 7120528 by Max Chen in Dev-Editor branch]
2019-06-21 01:21:43 -04:00
michael trepka
1e22588e86 Temporarily reverted the optimization that makes UAT launch UBT via a shell script, as it's causing issues that are not easy to solve quickly (UE-76351, UE-76600)
#jira UE-76600
#rb none
[FYI] joe.graf, josh.adams, peter.sauerbrei, ben.marsh

#ROBOMERGE-SOURCE: CL 7106768 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7106769 by michael trepka in Main branch]
2019-06-20 13:19:02 -04:00
michael trepka
d5074d310c Properly handle ; character in command line params when launching UBT from UAT scripts
#jira UE-76351
#rb Arciel.Rekman

#ROBOMERGE-SOURCE: CL 7097232 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7097233 by michael trepka in Main branch]
2019-06-19 17:37:56 -04:00
jason bestimt
b6d13bbd66 Fix for HoloLens preventing UBT from compiling in Linux
#RB: jeff.fisher
[CODEREVIEW] arciel.rekman
#JIRA: UE-76285

#ROBOMERGE-SOURCE: CL 7096860 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7096862 by jason bestimt in Main branch]
2019-06-19 16:46:20 -04:00
daniel lamb
381c48fb44 Added "build Content Only Patch" to ec jobs list.
#ROBOMERGE-SOURCE: CL 6914931 via CL 6919071
#ROBOMERGE-BOT: (v366-6836689)

[CL 6919157 by daniel lamb in Main branch]
2019-06-10 18:07:17 -04:00
Jeff Fisher
bcc5bcf128 Copying //UE4/Dev-VR to Main (//UE4/Main)
-Copy up for 4.23
#rb none

[CL 6911980 by Jeff Fisher in Main branch]
2019-06-10 12:22:13 -04:00
Ben Marsh
2ab7544e7c Properly validate platforms passed into BuildCookRun. Comment around the place where platform names are validated implies that there may be some pathway that incorrectly passes a cook platform through as this value, but I'm unable to find such a case (and it should be fixed if it exists, because it's not being parsed correctly at the moment).
Also improved error path for passing an incorrect configuration.

#rb none
#jira UE-72539

[CL 6911783 by Ben Marsh in Main branch]
2019-06-10 11:58:40 -04:00
Chris Gagnon
0a9f86357f Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6837840 by Chris Gagnon in Dev-Editor branch]
2019-06-04 15:16:30 -04:00
andrew grant
09093eac4f Moved ExportIPA script from project-k to common engine code.
Fixed issue wher eif dependencies caused a platform implementation to be processed twice it'd warn even if they were identical

(Needed for next Fortnite-specific CL).

[at]josh.adams
#rb na


#ROBOMERGE-SOURCE: CL 6763211 via CL 6763215 via CL 6763217 via CL 6763219 via CL 6763240
#ROBOMERGE-BOT: (v365-6733468)

[CL 6763246 by andrew grant in Main branch]
2019-06-02 00:15:34 -04:00