Commit Graph

1836 Commits

Author SHA1 Message Date
josh adams
8ba99b94de - Proper fix to merge conflicts
#jira nojira
[FYI] bob.tellez
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4974522 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5032626 by josh adams in Dev-VR branch]
2019-02-16 07:13:44 -05:00
ben marsh
4bab8246c2 Fix target not being rebuilt when an plugin not required for this platform is disabled. Also add log output showing why a temp target was required.
#rb none
#jira UE-69674

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4974444 in //UE4/Release-4.22/... via CL 4974445
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5032625 by ben marsh in Dev-VR branch]
2019-02-16 07:13:43 -05:00
bob tellez
1d031bb7be Back out revision 103 from CopyBuildToStagingDirectory.Automation.cs to fix CIS
#jira nojira
[FYI] Josh.Adams
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 4974353 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5032623 by bob tellez in Dev-VR branch]
2019-02-16 07:13:40 -05:00
arciel rekman
75cd110161 PhysX: change v13 Linux toolchain to v12 one (for real).
- There are issues when the libraries are compiled with clang 7.0.1 (tracked as UE-69848).

#rb Ben.Marsh
#rnx
[FYI] [at]Bob.Tellez

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4963477 via CL 4963480 via CL 4964321 via CL 4969377
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5031241 by arciel rekman in Dev-VR branch]
2019-02-16 06:06:55 -05:00
arciel rekman
7eea5d5946 PhysX: change v13 Linux toolchain to v12 one.
- There are issues when the libraries are compiled with clang 7.0.1 (tracked as UE-69848).

#rb Ben.Marsh
#rnx
[FYI] [at]Bob.Tellez

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4963367 via CL 4963372 via CL 4964207 via CL 4969343
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5031233 by arciel rekman in Dev-VR branch]
2019-02-16 06:06:36 -05:00
josh adams
ba53727028 - Memory Mapped IO enabled on IOS for Audio (via ini and platform property)
- -nommio on the commandline will disble it for testing
#rb gil.gribb

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4963115 via CL 4963118 via CL 4963812 via CL 4969283
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5031108 by josh adams in Dev-VR branch]
2019-02-16 06:02:18 -05:00
ben marsh
20590a9f8e Fix ue4commandline.txt being written to engine directory during staging.
#rb none
#jira UE-69193

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4967031 in //UE4/Release-4.22/... via CL 4968665
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5031097 by ben marsh in Dev-VR branch]
2019-02-16 06:01:14 -05:00
arciel rekman
b83639afd6 PhysX: change v13 Linux toolchain to v12 one.
- There are issues when the libraries are compiled with clang 7.0.1 (tracked as UE-69848).

#jira UE-69848
#rb Ben.Marsh
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4965320 in //UE4/Release-4.22/... via CL 4968661
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5031096 by arciel rekman in Dev-VR branch]
2019-02-16 06:01:10 -05:00
nick shin
d798fb2ecc HTML5 - pthread_main.js name changed by emscripten 1.38.24 upgrade
also, inform developer about the long link time

#jira UE-69632  Multithreaded adds 8.5 minutes to Launch On
#rnx
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: nick.shin
#ROBOMERGE-SOURCE: CL 4925927 in //UE4/Release-4.22/... via CL 4925930
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5017756 by nick shin in Dev-VR branch]
2019-02-16 01:26:42 -05:00
ben marsh
29893a312d Fix times for MSVC timing info being out by a factor of 1000.
#rb none
#jira

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4919950 via CL 4922411 via CL 4922639
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5016545 by ben marsh in Dev-VR branch]
2019-02-16 01:12:51 -05:00
Ryan Vance
b8f69c61f4 Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
#rb integration

[CL 4922272 by Ryan Vance in Dev-VR branch]
2019-02-06 13:27:58 -05:00
ben marsh
6b417a0b2f Add missing copyright notice.
#rb none
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4897786 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4912971 by ben marsh in Dev-VR branch]
2019-02-05 18:55:39 -05:00
ben marsh
d5f04b3023 Parse out a sorted list of classes and functions from the MSVC timing info. Groups templates together, to allow better understanding the most expensive code to compile.
#jira

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4896229 via CL 4896975 via CL 4896977
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4912546 by ben marsh in Dev-VR branch]
2019-02-05 18:49:22 -05:00
ben marsh
764c622bbc UAT: Add a build command to parse the output from MSVC's /d1reportTime argument, and convert it into a trace that can be visualized in Chrome's chrome://tracing tab.
To generate an input file, compile a single file with UnrealBuildTool and redirect the output to a text file:

    UnrealBuildTool.exe UE4Editor Win64 Development -SingleFile="E:\P4\Engine\Source\Runtime\Core\Private\Misc\CoreGlobals.cpp" -Timing > E:\Output.txt

To convert into a trace readable by chrome:

   AutomationTool.exe ParseMsvcTimingInfo -File=E:\Output.txt

Output file will be written to the same directory as the input file, but with a json extension.

#jira

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4896073 via CL 4896742 via CL 4896785
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4912487 by ben marsh in Dev-VR branch]
2019-02-05 18:49:07 -05:00
dominic barile
9476fa5b64 Made SaveRoleArtifacts virtual so it can be overridden
#rb William.Ewen, Andrew.Grant
[CODEREVIEW] William.Ewen, Andrew.Grant

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: dominic.barile
#ROBOMERGE-SOURCE: CL 4887792 via CL 4893034 via CL 4893147
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4908256 by dominic barile in Dev-VR branch]
2019-02-05 18:31:48 -05:00
nick shin
063b0f86c1 HTML5 - fix log spam
replicated to //UE4/Release-4.22

#jira UE-68969  HTML5 logspam when packaging/launching: NOTE[ReadEmscriptenConfigFile]: using EM_CONFIG
#rb none
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: nick.shin
#ROBOMERGE-SOURCE: CL 4890103 in //UE4/Release-4.22/... via CL 4890108
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4890114 by nick shin in Dev-VR branch]
2019-02-04 15:01:19 -05:00
andrew grant
2a2d69a419 Gauntlet -
Moved SubmitToDashboard into its own function to ensure derived classes don't accidentally skip it.
Renamed a few classes for future work

[at]ben.salem [at]clayton.langford

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 4861596 via CL 4867071 via CL 4868435 via CL 4873931
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4874093 by andrew grant in Dev-VR branch]
2019-02-01 19:02:29 -05:00
andrew grant
7a42f01705 Gauntlet -
native plugin now marked as runtime so it's available in more builds.
android device now uses a path under the Gauntlet tempdir for pulling artifacts. Dir is also marked for cleanup.


#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 4861589 via CL 4867069 via CL 4868434 via CL 4873925
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4874092 by andrew grant in Dev-VR branch]
2019-02-01 19:02:27 -05:00
andrew grant
9bfd0a7fee Made Gauntlet's build path source support multiple folders to search. This is to better support packaged builds which end up in Binaries/<platform> so they can be found at the same time as staged builds without moving them under /saved
-build=local is now a (clearer) synonym for -build=staged. Both will search /Saved/StagedBuilds and /Binaries for matching builds


[at]josh.engebretson
#tests BuildCookFort and RunFort with Android

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 4858090 via CL 4858092 via CL 4858870 via CL 4859004
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4859110 by andrew grant in Dev-VR branch]
2019-01-31 11:59:27 -05:00
jamie dale
6072ce9820 Allow Localization Automation to be be submitted to Perforce
#rb Ben.Marsh

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: jamie.dale
#ROBOMERGE-SOURCE: CL 4858896 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4858899 by jamie dale in Dev-VR branch]
2019-01-31 11:36:22 -05:00
clayton langford
2eaadf4b8d Small fix for Gauntlet HtmlBuilder.
#rnx
#rb Ben.Salem

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: clayton.langford
#ROBOMERGE-SOURCE: CL 4845119 via CL 4848240 via CL 4850464 via CL 4850553
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4850700 by clayton langford in Dev-VR branch]
2019-01-30 18:54:43 -05:00
daniel lamb
3ceaf934ba Added support for using UE_SDK_ROOT (carefullyredist) in build scripts.
[FYI] Chris.Babcock

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: daniel.lamb
#ROBOMERGE-SOURCE: CL 4841911 via CL 4844765 via CL 4844786
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4844866 by daniel lamb in Dev-VR branch]
2019-01-30 12:32:58 -05:00
josh engebretson
3bd7e5a97a Gauntlet iOS device support for running parallel tests
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.engebretson
#ROBOMERGE-SOURCE: CL 4835252 via CL 4838365 via CL 4838533
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4838654 by josh engebretson in Dev-VR branch]
2019-01-30 03:30:53 -05:00
chris gagnon
632b923945 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 4837001 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4837006 by chris gagnon in Dev-VR branch]
2019-01-29 19:23:19 -05:00
Ryan Vance
cf29818a4d Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
#rb integration
Unblocking RoboMerge

[CL 4836190 by Ryan Vance in Dev-VR branch]
2019-01-29 17:41:46 -05:00