Commit Graph

194 Commits

Author SHA1 Message Date
josh adams
780e81649c - XboxOne Build/Resources files moving to PlatformExtensions
#rb david.harvey
#rnx

#ROBOMERGE-SOURCE: CL 13072487 via CL 13072492 via CL 13072497
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13072502 by josh adams in Main branch]
2020-04-29 14:37:34 -04:00
ben marsh
1212463ed2 Fix CompileEnvironment being mutated during a call to VCToolChain.CompileFiles().
#jira

#ROBOMERGE-SOURCE: CL 13012408 via CL 13012476 via CL 13012531
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v683-13008971)

[CL 13012562 by ben marsh in Main branch]
2020-04-23 14:48:37 -04:00
Ryan Durand
e3665d1269 Adding toolchain test builds.
#rnx
#rb ben.marsh
#jira UE-91215

[CL 12972250 by Ryan Durand in Main branch]
2020-04-21 22:15:27 -04:00
ben marsh
eb7cfe44b8 Clear out the INCLUDE environment variable before building. Since the IncludePath property from the Visual C++ project files gets propagated to this environment variable, it gets convered into /I arguments by the compiler driver. That results in a long argument list, which causes an error in Visual Studio 2017.
#jira

#ROBOMERGE-SOURCE: CL 12911467 via CL 12911468 via CL 12911475
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12911478 by ben marsh in Main branch]
2020-04-19 15:02:33 -04:00
david harvey
e3b5f26803 Manifest string resource helper function returns the manifest string reference too.
#rb trivial
#jira none

#ROBOMERGE-SOURCE: CL 12850545 in //UE4/Release-4.25Plus/... via CL 12850613
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12850662 by david harvey in Main branch]
2020-04-16 07:26:01 -04:00
david harvey
642e0a7364 Helper function to add a debug string to the manifest localised string resources.
#jira MTHRL-96
#rb eric.mcdaniel

#ROBOMERGE-SOURCE: CL 12849359 in //UE4/Release-4.25Plus/... via CL 12849372
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12849391 by david harvey in Main branch]
2020-04-16 06:58:06 -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
248ca5454e Move PVS-Studio into Restricted/NoRedist folder.
#jira

#ROBOMERGE-SOURCE: CL 12689676 via CL 12689681 via CL 12689685
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v676-12543919)

[CL 12689695 by ben marsh in Main branch]
2020-04-09 10:23:37 -04:00
josh adams
90ff579ecc - UBT/C++ changes needed for new Restricted locations
- Does not have the changes for new .ini file locations
#rb ben.marsh

#ROBOMERGE-SOURCE: CL 12676628 via CL 12676630 via CL 12676633
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12676637 by josh adams in Main branch]
2020-04-08 15:07:46 -04:00
ben marsh
456f9a9ca7 Add support for different analysis modes in the PVS toolchain.
Defaults to just using general analysis (which UE4 builds cleanly with), but other options can be configured by setting TargetRules.WindowsPlatform.PVS.ModeFlags or by setting TargetRules.WindowsPlatform.PVS.UseApplicationSettings = true to read from the PVS config file.

Based on PR #6730.

#rb none
#jira UE-89664

#ROBOMERGE-SOURCE: CL 12496329 in //UE4/Release-4.25/... via CL 12496331 via CL 12496343
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12496355 by ben marsh in Main branch]
2020-03-31 09:54:21 -04:00
Ben Marsh
9f8366248b Merging fix for crash if VS2019-Preview directory does not exist.
#rb none
#rnx

[CL 12484294 by Ben Marsh in Main branch]
2020-03-29 20:15:56 -04:00
Ryan Durand
273983cd7d Merging support for -Preview toolchains to Main.
#rnx
#rb none
#jira none

[CL 12472705 by Ryan Durand in Main branch]
2020-03-27 14:14:05 -04:00
michael sartain
6ad1d3d59a Fix Windows UBT build break caused by 12224860
#jira none
#rb none
[FYI] Matt.Hoffman, Michael.Forot, Ben.Marsh

#ROBOMERGE-SOURCE: CL 12226010 in //UE4/Release-4.25/... via CL 12226016
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v663-12210973)

[CL 12226037 by michael sartain in Main branch]
2020-03-16 20:15:31 -04:00
michael sartain
43ef13a97b Fix UnrealBuildTool unused variable warnings
#jira none
#rb Ben.Marsh
[FYI] Andrew.Grant, Brandon.Schaefer

#ROBOMERGE-SOURCE: CL 12224860 in //UE4/Release-4.25/... via CL 12224862
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v663-12210973)

[CL 12224868 by michael sartain in Main branch]
2020-03-16 19:04:42 -04:00
ben marsh
560471c482 Make sure UBT and HoloLens platforms agree on the architecture being compiled. The architecture setting is now driven by the target being built, and cannot be overridden later. The HoloLens platform returns the default architecture value to UBT, ensuring that intermediate folders and the like are named consistently between builds where an architecture isn't specified (and it uses the default), and and builds where an architecture is explicitly specified.
#rb Steve.Smith
#rnx
#jira

#ROBOMERGE-SOURCE: CL 12167048 in //UE4/Release-4.25/... via CL 12167060
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v661-12148976)

[CL 12167071 by ben marsh in Main branch]
2020-03-13 16:21:18 -04:00
ben marsh
71a47ecfa8 Use a subdirectory for storing PVS studio artifacts, to avoid triggering a full rebuild with the next regular compile.
#rb none
#jira

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

[CL 12157009 by ben marsh in Main branch]
2020-03-12 18:39:25 -04:00
paul chipchase
861a2c7621 Fixed MSVC code analysis from giving compiler errors when run with Conformance Mode enabled.
When the '/permissive- is set we get a number of compile errors (C2337) due to microsoft attributes in \include\CodeAnalysis\sourceannotations.h

#jira none
#rnx
#rb Ben.Marsh

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

[CL 12124777 by paul chipchase in Main branch]
2020-03-11 09:17:20 -04:00
ben marsh
c973c45f1b Fix recursive action when running PVS toolchain.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 12056498 in //UE4/Release-4.25/... via CL 12056499
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v657-12064184)

[CL 12076288 by ben marsh in Main branch]
2020-03-09 13:21:27 -04:00
ben marsh
09ca12ccef Refactor UBT to use an interface (IActionGraphBuilder) to construct the action graph. Response files are also constructed through this interface, allowing them to be tracked as dependencies (will be added in subsequent change).
#rb none
#jira

#ROBOMERGE-SOURCE: CL 12038895 in //UE4/Release-4.25/... via CL 12038911
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v657-12064184)

[CL 12076066 by ben marsh in Main branch]
2020-03-09 13:20:14 -04:00
ben marsh
d1eb7b7007 UBT: Always embed an application manifest during linking, rather than relying on the resource file to include one. This ensures that projects that have a custom resource file for icons, versioning metadata, etc... still operate correctly with manifested OS versions.
To embed a custom manifest, set the WindowsPlatform.ManifestFile to a vaild path in a *.Target.cs file. To disable the embedding of the default manifest, set it to null.

#rb none
#jira UE-88825, UE-87398

#ROBOMERGE-SOURCE: CL 11619014 in //UE4/Release-4.25/... via CL 11619045
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)

[CL 11619057 by ben marsh in Main branch]
2020-02-25 16:33:18 -05:00
ben marsh
0454bd151f Generate type library headers as a standalone build action, to eliminate contention when generated by multiple compiler instances.
Also add support for using Visual Studio DTE type libraries from AutoSDK, to fix accessor not working in installed builds built from licensee workspaces.

#jira UE-88791, UE-89124, UE-89162
#rb none

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

[CL 11590486 by ben marsh in Main branch]
2020-02-24 15:45:01 -05:00
ryan durand
84ede489ee Fixing a bug in UBT when generating timing data.
#rnx
#rb none
#jira UE-88709


#ROBOMERGE-SOURCE: CL 11448423 via CL 11448428 via CL 11448435
#ROBOMERGE-BOT: (v654-11333218)

[CL 11448440 by ryan durand in Main branch]
2020-02-14 16:04:35 -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
Ben Marsh
6615366b2f Use VS2017 by default when running static analysis with PVS studio.
#rb none
#fyi Marc.Audy
#rnx

[CL 11341779 by Ben Marsh in Main branch]
2020-02-11 12:38:20 -05:00
Josh Adams
aa9705149b Copying Private-LoadTimes-4.24 stream to Main. Biggest changes are in Materials/Shader memory freezing.
#rb none

[CL 11282608 by Josh Adams in Main branch]
2020-02-06 13:13:41 -05:00