Commit Graph

223 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
d04b198d32 - Removed Win32 from being referenced in:
- BuildScripts so builders won't compile it
  - UBT platform registration and from being registered in UBT (so it won't show up in VS)
  - PlatformInfo (so it can't triggered from Package/Launch On)
#rb ben.marsh

[CL 13546702 by Josh Adams in ue5-main branch]
2020-05-26 12:07:45 -04:00
Ryan Durand
e33c282374 Removing build graph CRC define stuff since it is handled in the .Target.cs file now.
#rnx
#rb none
#jira none

[CL 13149952 by Ryan Durand in Main branch]
2020-05-04 13:34:59 -04:00
ryan durand
5b65443ae7 Fixing build graphs to work with changes to CRC API URL defines.
#rnx
#rb none
#jira none

#ROBOMERGE-SOURCE: CL 13072972 in //UE4/Release-Engine-Staging/...
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13072978 by ryan durand in Main branch]
2020-04-29 15:08:42 -04:00
ryan durand
917e0bbf87 Fixing CRC define behavior on Windows and Mac.
#rnx
#rb none
#jira UE-92278, UE-91460

#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 13037686 in //UE4/Release-4.25/... via CL 13037737 via CL 13038444
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v683-13008971)

[CL 13038446 by ryan durand in Main branch]
2020-04-24 15:46:41 -04:00
ryan durand
b2e3f68280 Fixing CRC defines for Mac.
#rnx
#rb none
#jira UE-92073

#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 12869468 in //UE4/Release-4.25/... via CL 12869471 via CL 12869539
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12869548 by ryan durand in Main branch]
2020-04-16 14:03:26 -04:00
ryan durand
c3f5f1e3b1 Removing Datasmith plugins from outputs from Mac editor since they get built separately.
#rnx
#rb none
#jira UE-92013

#ROBOMERGE-SOURCE: CL 12807664 in //UE4/Release-4.25/... via CL 12807724 via CL 12807785
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12807791 by ryan durand in Main branch]
2020-04-15 11:34:01 -04:00
ryan durand
a00418b907 Fixing CRC defines for Mac.
#rnx
#rb none
#jira UE-91460

#ROBOMERGE-SOURCE: CL 12805598 in //UE4/Release-4.25/... via CL 12805628 via CL 12805668
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12805757 by ryan durand in Main branch]
2020-04-15 11:11:47 -04:00
ryan durand
04698e0bd3 Adding the Datasmith plugin stuff to the Mac platform.
#rnx
#rb none
#jira UE-91594

#ROBOMERGE-SOURCE: CL 12783378 in //UE4/Release-4.25/... via CL 12783380 via CL 12784382
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12786674 by ryan durand in Main branch]
2020-04-14 16:57:10 -04:00
ben marsh
1c9ded525e Fix warning running InstalledEngineBuild.xml if crash reporter params are not set.
[FYI] Ryan.Durand
#jira
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 12733058 in //UE4/Release-4.25/... via CL 12733060 via CL 12782882
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12782901 by ben marsh in Main branch]
2020-04-14 13:51:33 -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
ben marsh
09813e9229 Fix missing platforms in installed build, if the host machine does not have the necessary SDKs installed.
#rb none
#jira UE-89480, UE-91514
#rnx

#ROBOMERGE-SOURCE: CL 12691613 in //UE4/Release-4.25/... via CL 12691621 via CL 12691632
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v676-12543919)

[CL 12691639 by ben marsh in Main branch]
2020-04-09 12:54:31 -04:00
florin pascu
fc6545cace Fix for Windows binary build , Android looks for "-armv764" instead of "armv64"(like Hololens does)
#jira UE-90873
#rb Jack.Porter, Chris.Babcock, Ben.Marsh
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 12689381 in //UE4/Release-4.25/... via CL 12689383 via CL 12689388
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v676-12543919)

[CL 12689396 by florin pascu in Main branch]
2020-04-09 09:57:32 -04:00
ben marsh
69b89d7869 Allow CRC analytics settings to be compiled into the executable, to remove NotForLicensees folder within engine code.
#jira
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 12681294 via CL 12681304 via CL 12681357
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12681363 by ben marsh in Main branch]
2020-04-08 19:18:46 -04:00
ben marsh
fd120f8044 Remove UnrealWatchdog (simplifying NotForLicensees dependencies)
#jira

#ROBOMERGE-SOURCE: CL 12675871 via CL 12675879 via CL 12675884
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12675889 by ben marsh in Main branch]
2020-04-08 13:27:42 -04:00
ryan durand
70ed017021 Implementing feedback from Ben for Datasmith plugin building changes, which also can be used to fix warnings from CrashReporterClient API properties not being set.
#rnx
[FYI] ben.marsh
#jira none

#ROBOMERGE-SOURCE: CL 12527676 in //UE4/Release-4.25/... via CL 12527711 via CL 12527758
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12527843 by ryan durand in Main branch]
2020-04-02 09:39:14 -04:00
ryan durand
f32e8c9ac6 Making Datasmith plugin compile step optional so it can be skipped if building from GitHub.
#rnx
[FYI] ben.marsh
#jira UE-91388

#ROBOMERGE-SOURCE: CL 12521910 in //UE4/Release-4.25/... via CL 12521947 via CL 12522019
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12522076 by ryan durand in Main branch]
2020-04-02 08:52:46 -04:00
chad garyet
f56e173c78 change ios back to $(DefaultWithPlatform)
#jira none
#rb none

#ROBOMERGE-SOURCE: CL 12508022 in //UE4/Release-4.25/... via CL 12508023 via CL 12508025
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12508027 by chad garyet in Main branch]
2020-04-01 12:44:12 -04:00
ryan durand
32a167d4d0 Only set CRC API preprocessor defs only be defined if the properties have been set to something.
#rnx
#rb none
#jira none

#ROBOMERGE-SOURCE: CL 12436184 in //UE4/Release-4.25/... via CL 12436186
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Release-Engine-Staging) (v671-12333473)

[CL 12436191 by ryan durand in Release-Engine-Staging branch]
2020-03-25 19:30:04 -04:00
ryan durand
563c9a025f Only set CRC API preprocessor defs only be defined if the properties have been set to something.
#rnx
#rb none
#jira none

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

[CL 12436186 by ryan durand in 4.25-Plus branch]
2020-03-25 19:29:30 -04:00
Ryan Durand
f2e59a7f77 Only set CRC API preprocessor defs only be defined if the properties have been set to something.
#rnx
#rb none
#jira none

[CL 12436184 by Ryan Durand in 4.25 branch]
2020-03-25 19:28:56 -04:00
ryan durand
e74015daa3 Moving DatasmithCADWorker to a NotForLicensee tools build.
#rnx
#rb none
#jira UE-89427

#ROBOMERGE-SOURCE: CL 12297387 in //UE4/Release-4.25/... via CL 12297452
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v670-12295787)

[CL 12297509 by ryan durand in Main branch]
2020-03-19 11:26:14 -04:00
ryan durand
1cd2eb7789 Moving DatasmithCADWorker to a NotForLicensee tools build.
#rnx
#rb none
#jira UE-89427

#ROBOMERGE-SOURCE: CL 12297387 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v670-12295787)

[CL 12297452 by ryan durand in 4.25-Plus branch]
2020-03-19 11:22:43 -04:00
Ryan Durand
0348ca203c Moving DatasmithCADWorker to a NotForLicensee tools build.
#rnx
#rb none
#jira UE-89427

[CL 12297387 by Ryan Durand in 4.25 branch]
2020-03-19 11:17:31 -04:00
ryan durand
3c24bf7ab8 Add the ability to set CRC API URL and key from buildgraph.
#rnx
#rb none
#jira UE-89440

#ROBOMERGE-SOURCE: CL 12157835 in //UE4/Release-4.25/... via CL 12157838
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v659-12123632)

[CL 12157849 by ryan durand in Main branch]
2020-03-12 19:58:02 -04:00