Commit Graph

439 Commits

Author SHA1 Message Date
hongyi yu
a77a6383a4 Add unit test for the function that chooses patch target
#test Run RunUAT.exe Fortnite_PatchTargetUnitTest and make sure all tests passes


#ROBOMERGE-SOURCE: CL 8385058 via CL 8385475
#ROBOMERGE-BOT: (v403-8382528)

[CL 8385490 by hongyi yu in Main branch]
2019-08-30 14:04:55 -04:00
Ben Marsh
f6564eb124 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 8194620 by Ben Marsh in Dev-Build branch]
2019-08-21 16:28:23 -04:00
daniel lamb
312c726d4f Fix issue with missing -IOS on Code only buildversions inside the manifest.
Leigh.Swift

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: daniel.lamb
#ROBOMERGE-SOURCE: CL 8117708 via CL 8117711 via CL 8120869 via CL 8120935
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v401-8057353)

[CL 8164134 by daniel lamb in Dev-Build branch]
2019-08-21 10:06:09 -04:00
justin marcus
60610d1b81 Optional paks are now contained in their own install bundles instead of using optional tag sets.
[at]Daniel.Lamb [at]Thomas.Ross


#ROBOMERGE-SOURCE: CL 8129730 via CL 8129735 via CL 8133455
#ROBOMERGE-BOT: (v401-8057353)

[CL 8159454 by justin marcus in Main branch]
2019-08-21 09:27:39 -04:00
daniel lamb
9a812c0ecf Fix issue with missing -IOS on Code only buildversions inside the manifest.
Leigh.Swift


#ROBOMERGE-SOURCE: CL 8117708 via CL 8117711 via CL 8120869
#ROBOMERGE-BOT: (v401-8057353)

[CL 8120935 by daniel lamb in Main branch]
2019-08-19 18:11:30 -04:00
andrew grant
f8f35e743b Editgrated latest SyncProject script from FN as part of UE-78832, UE-78826, and resolved issues with omitted / dangerous arguments.
Project arg is now optional and will simply sync the engine.
Passing -CL=0 will now require the -force argument before syncing files out of the workspace.
Fixed issue with deep samples (e.g AREnvProbe) not being discovered by FindProjectFileFromName
Added NativeProjects.ClearCache option for the case when syncing a project from P4 that isn't yet on disk

Fixed issue with P4.FileExistsInDepot returning true if passed a path that isn't in the users client view. Relates to UE-78832 but not the entire fix
Fixed issue with BuildEditor not working without a project arg.
Fixed issue building projects that don't have source

[CODEREVIEW] ben.marsh
#jira UE-78832, UE-78826
#rb na

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 8008332 in //UE4/Release-4.23/... via CL 8008726
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v399-8035122)

[CL 8048144 by andrew grant in Dev-Build branch]
2019-08-14 23:01:07 -04:00
andrew grant
47a03942a9 Editgrated latest SyncProject script from FN as part of UE-78832, UE-78826, and resolved issues with omitted / dangerous arguments.
Project arg is now optional and will simply sync the engine.
Passing -CL=0 will now require the -force argument before syncing files out of the workspace.
Fixed issue with deep samples (e.g AREnvProbe) not being discovered by FindProjectFileFromName
Added NativeProjects.ClearCache option for the case when syncing a project from P4 that isn't yet on disk

Fixed issue with P4.FileExistsInDepot returning true if passed a path that isn't in the users client view. Relates to UE-78832 but not the entire fix
Fixed issue with BuildEditor not working without a project arg.
Fixed issue building projects that don't have source

[CODEREVIEW] ben.marsh
#jira UE-78832, UE-78826
#rb na

#ROBOMERGE-OWNER: andrew.grant
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 8008332 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v396-7974030)

[CL 8008726 by andrew grant in Main branch]
2019-08-13 16:24:19 -04:00
Josh Adams
2eb5796bba - Revamped the Platform Extension plugin support to go back to just passing one directory to ReadPluginsFromDirectory now that the directory swap allows it
#rb ben.marsh

[CL 7954514 by Josh Adams in Dev-Build branch]
2019-08-12 17:59:42 -04:00
andrew grant
0ef5ae5ff8 Fix for packaging warning on Mac. No longer check mono version, just see if msbuild exists. TraceInfo if not,
#jira UE-78524
#rb na

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7855006 in //UE4/Release-4.23/... via CL 7855019
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v389-7813075)

[CL 7873761 by andrew grant in Dev-Build branch]
2019-08-08 08:06:56 -04:00
andrew grant
c533b6bda5 Now deal with situation where mono is >= 5.0 but msbuild does not exist. For reference it looks like mono that's bundled with UE was upgraded to 5.16 at some point but msbuild was not added.
#jira UE-78311
#rb na

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7814233 in //UE4/Release-4.23/... via CL 7814249
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v389-7813075)

[CL 7867152 by andrew grant in Dev-Build branch]
2019-08-08 05:32:55 -04:00
andrew grant
fcdd3be672 Made -configuration a fallback to -config in BuildCookRun for consistency with UBT and Gauntlet
#jira nojira
#rb na

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7763293 in //UE4/Release-4.23/... via CL 7763335
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v389-7813075)

[CL 7862618 by andrew grant in Dev-Build branch]
2019-08-08 04:29:59 -04:00
andrew grant
9462028d66 Fix for packaging warning on Mac. No longer check mono version, just see if msbuild exists. TraceInfo if not,
#jira UE-78524
#rb na

#ROBOMERGE-OWNER: andrew.grant
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7855006 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7855019 by andrew grant in Main branch]
2019-08-07 21:28:08 -04:00
ben marsh
32ead558ce Change to SHA1 signing for MSI files. Doesn't seem to like being signed with SHA256.
#rb none
#jira
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 7712970 in //UE4/Release-4.23/... via CL 7712971
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v389-7813075)

[CL 7837304 by ben marsh in Dev-Build branch]
2019-08-06 23:06:55 -04:00
ben marsh
98e83076e7 UAT: Propagate the XGE autorecover attribute when building through UAT.
#rb none
#rnx
#jira UE-77952

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 7706876 in //UE4/Release-4.23/... via CL 7706877
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v389-7813075)

[CL 7834590 by ben marsh in Dev-Build branch]
2019-08-06 22:18:31 -04:00
ben marsh
22b9b043a0 Only use SHA256 certs to sign MSI files, since they don't support multiple signatures.
#rb none
#rnx
#jira

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 7705743 in //UE4/Release-4.23/... via CL 7705985
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v389-7813075)

[CL 7833698 by ben marsh in Dev-Build branch]
2019-08-06 22:05:03 -04:00
andrew grant
c9ba372605 Now deal with situation where mono is >= 5.0 but msbuild does not exist. For reference it looks like mono that's bundled with UE was upgraded to 5.16 at some point but msbuild was not added.
#jira UE-78311
#rb na

#ROBOMERGE-SOURCE: CL 7814233 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7814249 by andrew grant in Main branch]
2019-08-06 14:59:16 -04:00
andrew grant
1288aa1171 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-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7688001 via CL 7688013 via CL 7688019 via CL 7690526 via CL 7690676
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v388-7785529)

[CL 7810192 by andrew grant in Dev-Build branch]
2019-08-06 13:03:35 -04:00
ben marsh
eb69dbf389 Sign binaries with a SHA1 and SHA256 certificate.
#rb none
#jira

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

[CL 7808910 by ben marsh in Dev-Build branch]
2019-08-06 12:52:27 -04:00
josh engebretson
7ea71f1f2e Gauntlet: Add support for dervice reseration pools
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: josh.engebretson
#ROBOMERGE-SOURCE: CL 7650698 via CL 7654022 via CL 7654117
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v388-7785529)

[CL 7791093 by josh engebretson in Dev-Build branch]
2019-08-06 10:57:14 -04:00
andrew grant
2c00199e7f Made -configuration a fallback to -config in BuildCookRun for consistency with UBT and Gauntlet
#jira nojira
#rb na

#ROBOMERGE-SOURCE: CL 7763293 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7763335 by andrew grant in Main branch]
2019-08-05 12:03:51 -04:00
andrew grant
1004e7cebc 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-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7634479 in //UE4/Release-4.23/... via CL 7634480
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v385-7708028)

[CL 7731875 by andrew grant in Dev-Build branch]
2019-08-05 07:11:19 -04:00
andrew grant
649b5938d1 Cleaned up some comments (thanks MS!)
[FYI] michael.sartain

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7557895 via CL 7557963 via CL 7584977 via CL 7606191
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v385-7708028)

[CL 7714949 by andrew grant in Dev-Build branch]
2019-08-05 04:44:44 -04:00
ben marsh
67a7eca8e9 Change to SHA1 signing for MSI files. Doesn't seem to like being signed with SHA256.
#rb none
#jira
#rnx

#ROBOMERGE-SOURCE: CL 7712970 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7712971 by ben marsh in Main branch]
2019-08-03 16:33:21 -04:00
ben marsh
73baa9265b UAT: Propagate the XGE autorecover attribute when building through UAT.
#rb none
#rnx
#jira UE-77952

#ROBOMERGE-SOURCE: CL 7706876 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v384-7690951)

[CL 7706877 by ben marsh in Main branch]
2019-08-02 11:04:49 -04:00
ben marsh
75a56d9542 Only use SHA256 certs to sign MSI files, since they don't support multiple signatures.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 7705743 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v384-7690951)

[CL 7705985 by ben marsh in Main branch]
2019-08-02 09:46:33 -04:00