Commit Graph

1015 Commits

Author SHA1 Message Date
steve smith
ef82f1572e Merged from Dev-Build:
Fixed issue with converting UnrealTargetPlatform to string when parsing command line options

Added a TypeConverter for UnrealTargetPlatform
Added check if a typeconverter exists when parsing command line arguments
#rb ben.marsh
#jira none

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

[CL 12383347 by steve smith in Main branch]
2020-03-23 17:09:31 -04:00
ben woodhouse
18619a229c Enable Chaos by default in the engine
#rb michael.lentine
[FYI] michael.lentine


#ROBOMERGE-SOURCE: CL 12306862 via CL 12306872
#ROBOMERGE-BOT: (v670-12295787)

[CL 12306873 by ben woodhouse in Main branch]
2020-03-19 14:37:43 -04:00
chad garyet
5bfeb69a64 add xml comment to IsZipFile
#rb none
[FYI] ryan.durand


#ROBOMERGE-SOURCE: CL 12249783 via CL 12249786 via CL 12250633
#ROBOMERGE-BOT: (v668-12245121)

[CL 12250754 by chad garyet in Main branch]
2020-03-18 15:50:13 -04:00
tony wong
5d070fed0d Fortnite: Integrated CL 11895191: IOS Support for linking to non-zipped frameworks and copying dynamic frameworks into app bundle PublicAdditionalFrameworks can no longer be used for specifying System frameworks. PublicFrameworks should be used instead.
#JIRA: None
#rnx
[FYI] Michael.Kirzinger


#ROBOMERGE-OWNER: tony.wong
#ROBOMERGE-AUTHOR: tony.wong
#ROBOMERGE-SOURCE: CL 12249526 via CL 12249529 via CL 12250581
#ROBOMERGE-BOT: (v668-12245121)

[CL 12250582 by tony wong in Main branch]
2020-03-18 15:46:36 -04:00
bob tellez
7dff64fb44 #UE4 Write the target-enabled/disabled plugins lists to the target receipt instead of compiling it into the executable in non-monolitic editor builds. This allows them to be used in shared build environments
#rb Ben.Marsh


#ROBOMERGE-SOURCE: CL 12233987 via CL 12241649
#ROBOMERGE-BOT: (v667-12241502)

[CL 12242840 by bob tellez in Main branch]
2020-03-18 07:04:23 -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
2da9c861ad Remove unused variables causing warnings on Mono.
#jira
#rb none
#rnx

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

[CL 12223696 by ben marsh in Main branch]
2020-03-16 17:07:47 -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
josh adams
1fdc2eb974 Compile fixes after recent stream merges
#rb ryan.vance
#rnx


#ROBOMERGE-SOURCE: CL 12153533
#ROBOMERGE-BOT: (v659-12123632)

[CL 12153537 by josh adams in Main branch]
2020-03-12 15:46:27 -04:00
ryan vance
02bb20415f Copy up from DS to Main
#rb CopyUp



#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ryan.vance
#ROBOMERGE-SOURCE: CL 12149088 via CL 12150247
#ROBOMERGE-BOT: (v659-12123632)

[CL 12150618 by ryan vance in Main branch]
2020-03-12 14:08:52 -04:00
ben marsh
0aa673b5fe UBT: Fix makefile being invalidated by response files updated during the build process. Also fix certain source files excluded from unity builds from triggering makefile invalidation.
Creation time of the makefile was being used to test whether dependencies have been modified, which is valid for external dependencies (since we want to catch any files modified after the build process starts), but not valid for files we create during the makefile building (such as response files).

Code attempting to detect response files was also incorrect, and would find any leaf files not included in a unity blob. Response files are now detected explicitly.

#rb none
#jira

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

[CL 12076084 by ben marsh in Main branch]
2020-03-09 13:20:18 -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
max whitehead
409ce83e35 Fix ModuleRules so PhysX module is never added if Chaos is enabled.
Fixes NonUnity build.
#rb none


#ROBOMERGE-SOURCE: CL 11895309 via CL 11895311 via CL 11895312
#ROBOMERGE-BOT: (v656-11643781)

[CL 11895314 by max whitehead in Main branch]
2020-03-04 08:42:33 -05:00
max whitehead
19b76ff6e1 Remove PhysX module when using Chaos, Guard PhysX code in PHYSICS_INTERFACE_PHYSX so Chaos compiles without it.
Change WITH_PHYSX to always be defined, even with chaos only.
Make Client/Server targets only disable PhysX when Chaos is enabled.
#rb michael.lentine


#ROBOMERGE-OWNER: max.whitehead
#ROBOMERGE-AUTHOR: max.whitehead
#ROBOMERGE-SOURCE: CL 11877480 via CL 11877967 via CL 11878038
#ROBOMERGE-BOT: (v656-11643781)

[CL 11888569 by max whitehead in Main branch]
2020-03-03 17:06:00 -05:00
andrew grant
d9b5eaf2ba Add Thread_UseAllCpuGroups to UnrealBuildTool config to enable UBT to use both CPU groups on high-core systems such as 64-core ThreadRippers.
See - https://docs.microsoft.com/en-us/dotnet/framework/configure-apps/file-schema/runtime/thread-useallcpugroups-element

Also added MaxParallelActions command-line flag to UBT that can be used to restrict the number of cores used for local (e.g. nonxge).

Added -cores=X+Y=Z option to benchmark script for profiling

#rb swarm
[at]ben.marsh
#jira nojira

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

[CL 11845479 by andrew grant in Main branch]
2020-03-02 15:50:41 -05:00
anthony bills
1ef400627b Add support for whitelisting additional plugins and adding additional modules to plugin extensions.
Additionally allow monolithic programs inside platform extensions to ouput to the Binaries directory in the extension.

[at]brian.white, [at]josh.adams, [at]ben.marsh
#jira UE-81798
#rb ben.marsh

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

[CL 11655284 by anthony bills in Main branch]
2020-02-27 10:47:20 -05:00
Ben Marsh
a7ebd68aed Fix exception running IncludeTool due to include path modules no longer being included in JSON export.
#rb none
#jira UE-89475
#robomerge[RELEASE] 4.25

[CL 11645998 by Ben Marsh in Main branch]
2020-02-26 21:06:57 -05:00
ben marsh
2868a46d82 Remove debug code.
#rb none
#rnx
#jira

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

[CL 11631949 by ben marsh in Main branch]
2020-02-26 11:06:01 -05:00
ben marsh
a3cada401a Fix incorrect force included files in intellisense data.
#rb none
#jira UE-89364

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

[CL 11631916 by ben marsh in Main branch]
2020-02-26 11:03:42 -05:00
ben marsh
39179672d2 Output a warning if the root path is longer than 50 characters.
#rb none
#jira UE-88446
[FYI] Martin.Sevigny

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

[CL 11625268 by ben marsh in Main branch]
2020-02-25 21:06:22 -05:00
ben marsh
661248e268 UBT: Output a warning if any intermediate path is > 200 characters under the UE root directory.
#rb none
#jira UE-88446

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

[CL 11624868 by ben marsh in Main branch]
2020-02-25 20:49:06 -05:00
ben marsh
534d943226 UBT: Fix error running UBT with -JsonExport if the target instantiates (but decides not to link) a module.
#rb none
#jira UE-88379

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

[CL 11592338 by ben marsh in Main branch]
2020-02-24 18:46:14 -05:00
ben marsh
0f217338cd Allow single file compile to work with generated cpp files.
#rb none
#jira UE-85511

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

[CL 11592176 by ben marsh in Main branch]
2020-02-24 18:40:49 -05:00
Getty
f1232f1840 PR #6697: Fix wrong setting name in error message of UEBuildTarget.cs (Contributed by Getty)
#jira UE-88831
#rb none
#rnx

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

[CL 11592061 by ben marsh in Main branch]
2020-02-24 18:18:58 -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