Commit Graph

431 Commits

Author SHA1 Message Date
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
Ben Marsh
31f893e490 UAT: Add a utility function for converting a P4 tag record to a string.
#rb none
#rnx

[CL 7697320 by Ben Marsh in Dev-Build branch]
2019-08-01 16:13:20 -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
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