Commit Graph

132 Commits

Author SHA1 Message Date
michael sartain
8bafdac91b Use msbuild in mono for Linux when using an installed copy and mono >= 5.0.
Pulled code from Andrew's CL 7828885 for the Mac.

#jira none
#rb ben.marsh
[FYI] brandon.schaefer, andrew.grant

#ROBOMERGE-SOURCE: CL 11750877 in //UE4/Release-4.25/... via CL 11750986
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11776541 by michael sartain in Main branch]
2020-02-28 16:03:47 -05:00
brandon schaefer
3b45b4cc1b Move to new llvm clang 9.0.1 v16 toolchain
#jira UE-85219
#rb none
[FYI] Michael.Sartain

#ROBOMERGE-SOURCE: CL 11448348 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11448367 by brandon schaefer in 4.25-Plus branch]
2020-02-14 16:01:59 -05:00
Rolando Caloca
5b82f15def Copying //UE4/Dev-RenderPlat-Staging@11388153 to //UE4/Main
#rb none
#rnx

[CL 11388545 by Rolando Caloca in Main branch]
2020-02-12 13:27:19 -05:00
Stefan Boberg
55a8b15f1f Copying //UE4/Dev-Core to Main (//UE4/Main)
#rb none

[CL 11258477 by Stefan Boberg in Main branch]
2020-02-05 14:26:36 -05:00
andrew grant
a1a1845816 Adding -w to the grep (now -wi) in the bash script that builds UBT so it isn't triggered by warnings that involved a variable with 'Error' in its name.
(In my case it was 'Missing XML comment for publicly visible type or member 'ReadOnlyTargetRules.bUndefinedIdentifierErrors').

[FYI] ben.marsh


#ROBOMERGE-SOURCE: CL 11191147 via CL 11191149
#ROBOMERGE-BOT: (v640-11091645)

[CL 11191151 by andrew grant in Main branch]
2020-01-30 20:49:07 -05:00
ryan durand
c11c085cf5 (Integrating from Dev-EngineMerge to Main)
Second batch of remaining Engine copyright updates.

#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10871196 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v626-10872990)

[CL 10902202 by ryan durand in Dev-Core branch]
2020-01-08 03:04:20 -05:00
Juan Canada
2ecf4f9708 Merging //UE4/Dev-Main@10877709 to Dev-RenderPlat-Staging(//UE4/Dev-Rendering)
#rnx
#rb none

[CL 10895568 by Juan Canada in Dev-RenderPlat-Staging branch]
2020-01-07 13:45:01 -05:00
Martin Ridgers
87cc3f5749 Native MSBuild implementation of UnrealBuildTool's discovery of platform extensions.
#rb josh.adams, ben.marsh

(ushell-p4-cherrypick of 7973988 by Martin.Ridgers)

(ushell-p4-cherrypick of 8124246 by Martin.Ridgers)

[CL 10889764 by Martin Ridgers in Dev-Core branch]
2020-01-07 06:58:43 -05:00
Ryan Durand
28d3d740dd (Integrating from Dev-EngineMerge to Main)
Second batch of remaining Engine copyright updates.

#rnx
#rb none
#jira none

[CL 10871196 by Ryan Durand in Main branch]
2019-12-27 07:44:07 -05:00
Rolando Caloca
505a4a068c DRPS - Back out changelist 8124246
#rb Martin.Ridgers
#rnx

[CL 9550413 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2019-10-11 14:05:02 -04:00
jeff newquist
1ff08f0bf7 Copying //UE4/Dev-Console to Dev-RenderPlat-Staging (//UE4/Dev-RenderPlat-Staging)
#rb none
#rnx

[CL 9445960 by jeff newquist in Dev-RenderPlat-Staging branch]
2019-10-07 10:54:53 -04:00
Rolando Caloca
7632478918 Merging //UE4/Main@9388041 to Dev-RenderPlat-Staging
#rb none
#rnx

[CL 9389881 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2019-10-03 09:26:00 -04:00
brandon schaefer
d1923b0346 Bump to v15 8.0.1 toolchain
#jira none
#rb none
[FYI] Michael.Sartain
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 9380792 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v456-9359915)

[CL 9380796 by brandon schaefer in Main branch]
2019-10-02 15:29:30 -04:00
Rolando Caloca
f83ae4807a Copying //UE4/Dev-Rendering@9317594 to Dev-RenderPlat-Staging
#rb none
#rnx

[CL 9317904 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2019-10-01 13:03:04 -04:00
Marcus Wassmer
6517c68ef5 Copying //UE4/Dev-RenderPlat-Staging@8684824 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 8684840 by Marcus Wassmer in Main branch]
2019-09-14 09:45:25 -04:00
Marcus Wassmer
ded7cece25 Copying //UE4/Dev-Rendering@8444433 to Dev-RenderPlat-Staging (//UE4/Dev-RenderPlat-Staging)
#rb none

[CL 8445676 by Marcus Wassmer in Dev-RenderPlat-Staging branch]
2019-09-03 19:19:28 -04:00
brandon schaefer
5e6b22cf98 Bump to v14 clang 8.0.1 toolchain for Linux
#jira none
#rb none
[FYI] Arciel.Rekman, Michael.Sartain

#ROBOMERGE-SOURCE: CL 8039909 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v399-8035122)

[CL 8039915 by brandon schaefer in Main branch]
2019-08-14 13:26:41 -04:00
andrew grant
3398e55fc1 Require that installed mono is >= 5.0 to be used above UE bundled version (mono 4 does not appear to support .NET 4.6.2 projects)
Only use msbuild in mono when using an installed copy and not just when >= 5.0. The UE dist uses 5.16 but does not have the msbuild executable or dependencies (will address for 4.24 - UE-78476)

Explicitly use bash when calling .RunUAT.sh from from root stub file for OSs that are set to use a different shell

#jira UE-78311
[FYI] ben.marsh,arciel.rekman,michael.trepka,tim.gautier
#rb na

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

[CL 7828885 by andrew grant in Main branch]
2019-08-06 19:56:37 -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
Chris Gagnon
930e33cb48 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
#rb none

[CL 6838042 by Chris Gagnon in Main branch]
2019-06-04 15:42:48 -04:00
Arciel Rekman
7ef9626fe8 Copying //UE4/Dev-Console@6677439 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 6677614 by Arciel Rekman in Main branch]
2019-05-30 14:48:02 -04:00
Ben Marsh
0cc6e3dca6 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 6631504 by Ben Marsh in Main branch]
2019-05-24 11:51:54 -04:00
arciel rekman
ae2fc6b3cb Linux: fix which spam on some systems (UE-69994).
#rb none
[CODEREVIEW] Brandon.Schaefer
#jira UE-69994

#ROBOMERGE-SOURCE: CL 5291112 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5308921 by arciel rekman in Main branch]
2019-03-05 18:48:02 -05:00
Brandon Schaefer
17026acec8 Pull v13 toolchain now
#jira none
#rb none
#fyi Arciel.Rekman

[CL 5064413 by Brandon Schaefer in Dev-Editor branch]
2019-02-19 13:13:42 -05:00
arciel rekman
1c470dc6a1 Linux: download to the v13 toolchain for 4.22 (UE-69672)
#jira UE-69672
#rb none

#ROBOMERGE-SOURCE: CL 4967350 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4968670 by arciel rekman in Main branch]
2019-02-12 09:41:26 -05:00