Commit Graph

934 Commits

Author SHA1 Message Date
ben marsh
8246d5a1df Fix log output showing CL being synced for iterative cooks.
#jira
[FYI] Jeff.Williams

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5491806 via CL 5492141 via CL 5492157
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5514730 by ben marsh in Dev-VR branch]
2019-03-22 17:57:13 -04:00
andrew grant
eae72658e7 Fixed issue with UBTArgs including quotes.
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 5460234 via CL 5462256 via CL 5462315
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5480498 by andrew grant in Dev-VR branch]
2019-03-20 13:56:15 -04:00
andrew grant
26fae5a901 Use case-insensitive comparison for package names
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 5435243 via CL 5438956 via CL 5439032
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5442222 by andrew grant in Dev-VR branch]
2019-03-18 21:25:09 -04:00
jeff williams
f13f406cd5 Allow iterate shared cooked builds to re-stage non-UFS files over the base build
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: jeff.williams
#ROBOMERGE-SOURCE: CL 5400125 via CL 5401608 via CL 5403246
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5412264 by jeff williams in Dev-VR branch]
2019-03-15 06:21:50 -04:00
jeff williams
42b4ea562c Allow for selection of shared cooked builds within the most recent code CL
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: jeff.williams
#ROBOMERGE-SOURCE: CL 5400074 via CL 5401504 via CL 5402283
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5412255 by jeff williams in Dev-VR branch]
2019-03-15 06:21:26 -04:00
Ryan Vance
35eb0041ab Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
#rb integration

[CL 5387703 by Ryan Vance in Dev-VR branch]
2019-03-13 15:19:08 -04:00
justin marcus
711dd86f40 Merging //Fortnite/Dev-Kairos to Main (//Fortnite/Main)
CL 5287635

Fix memory mapped bulk data files all being put in chunk0 because they have a wierd compound extension.

review-5287636 [at]Daniel.Lamb

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: justin.marcus
#ROBOMERGE-SOURCE: CL 5296981 via CL 5307598 via CL 5307724
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5326474 by justin marcus in Dev-VR branch]
2019-03-06 18:20:06 -05:00
graeme thornton
1a551d6144 Minor unrealpak refactor
- Added a "-sign" parameter to enable signing for the given pak. The cached settings in the crypto.json file aren't used to enable signing any more.
 - Encapsulated all signing and encryption keys in a single keychain object which is passed around, rather than individual keys
 - Added some validation to UBT/UAT encryption config parsing so that if you enable any signing or encryption stuff but haven't generated a key, it'll warn and disable everything.

#jira

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: graeme.thornton
#ROBOMERGE-SOURCE: CL 5237725 via CL 5237726 via CL 5240337 via CL 5240343
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5257171 by graeme thornton in Dev-VR branch]
2019-02-28 18:38:20 -05:00
joe conley
2ec2d4738f #jira UE-69839 Lumin fails to launch with assert: ICU data directory was not discovered
NonUFSDebugFiles were getting copied to the staging directory first, but did not respect the "DeployLowerCaseFilenames" setting, and were incorrectly determining the captalization of the Engine/Content directory. Copy them after we copy UFSFiles.

#rb Ben.Marsh

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: joe.conley
#ROBOMERGE-SOURCE: CL 5235658 in //UE4/Release-4.22/... via CL 5235659
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5254738 by joe conley in Dev-VR branch]
2019-02-28 18:12:05 -05:00
anthony bills
b2616cd708 [AutomationTool] Add support to override the launch command line per platform.
#rb david.harvey
[FYI] andrew.grant

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: anthony.bills
#ROBOMERGE-SOURCE: CL 5206466 via CL 5211320 via CL 5230557
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5248616 by anthony bills in Dev-VR branch]
2019-02-28 17:28:15 -05:00
josh adams
019c12863e - Merging Dev-Kairos/Engine/... to Main/Engine/...
- Brings over the necessary engine changes for embedding UE4 mobile as a dylib/so in native mobile app
- Various changes for facial animation, screen recording, others
- ARKit and ARCore plugins were removed, as deemed "not ready"
#rb many people

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 5201138 via CL 5203024 via CL 5226277
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5244512 by josh adams in Dev-VR branch]
2019-02-28 17:06:02 -05:00
ben marsh
7011863b74 Remove RPCUtility.
#rb none
#jira UE-70509
[FYI] Peter.Sauerbrei

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

[CL 5223716 by ben marsh in Dev-VR branch]
2019-02-26 22:33:33 -05:00
cosmin sulea
c44a8176fd UE-63767 - iOS Device Output Log console does not work
#jira UE-63767
#rb Jack.Porter

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5036543 in //UE4/Release-4.22/... via CL 5036544
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5122335 by cosmin sulea in Dev-VR branch]
2019-02-22 00:59:43 -05:00
josh adams
62c3af350a - Final fix now for merge issue (I had compiled wrong program to test my fix, oops)
#jira none
#rb none

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

[CL 5032756 by josh adams in Dev-VR branch]
2019-02-16 07:16:33 -05:00
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
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
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
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