Commit Graph

1031 Commits

Author SHA1 Message Date
ben marsh
0f0fbfe98e Prevent writing to engine directory in un-promoted installed build, causing errors when creating modules.
#jira
#rb none

#ROBOMERGE-SOURCE: CL 12949395 in //UE4/Release-4.25/... via CL 12949397 via CL 12958413
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12958447 by ben marsh in Main branch]
2020-04-21 14:38:52 -04:00
ben marsh
e2b3bc204b Clear the promoted flag for binaries built with the installed engine build. This fixes issues where a code project will only build once.
#jira UE-91977
#rb none

#ROBOMERGE-SOURCE: CL 12940416 in //UE4/Release-4.25/... via CL 12940429 via CL 12940440
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12940447 by ben marsh in Main branch]
2020-04-20 18:21:51 -04:00
david harvey
c319559887 stage xaudio PDBs if they exist
#jira MTHRL-52
#rb ben.marsh

#ROBOMERGE-SOURCE: CL 12916367 in //UE4/Release-4.25Plus/... via CL 12916376
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12916387 by david harvey in Main branch]
2020-04-20 05:13:58 -04:00
ben marsh
a0b9b35c79 Fix programs under the Engine/Restricted folder not being able to find the correct engine directory.
#jira

#ROBOMERGE-SOURCE: CL 12870520 via CL 12870524 via CL 12870525
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12870526 by ben marsh in Main branch]
2020-04-16 14:56:47 -04:00
ben marsh
2254e7d424 Fix output directory in project files for programs build from extension folders.
#jira

#ROBOMERGE-SOURCE: CL 12862062 via CL 12862070 via CL 12862081
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12862084 by ben marsh in Main branch]
2020-04-16 10:00:42 -04:00
ben marsh
044f34f6cb Change default output folder for targets under restricted folders to also be under restricted folders.
#jira
[FYI] Josh.Adams, Nick.Whiting, Lukasz.Furman, Martin.Wilson

#ROBOMERGE-SOURCE: CL 12797846 via CL 12798053 via CL 12798081
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12798140 by ben marsh in Main branch]
2020-04-15 10:01:23 -04:00
James Hopkin
1edd7720d5 UBT: allow multiple -SingleFile arguments. Now stores SpecifcFilesToCompile list rather than single file reference.
#rb Ben.Marsh

#ROBOMERGE-OWNER: james.hopkin
#ROBOMERGE-AUTHOR: james.hopkin
#ROBOMERGE-SOURCE: CL 12779149 via CL 12779152 via CL 12779160
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12782243 by James Hopkin in Main branch]
2020-04-14 13:31:51 -04:00
josh adams
2976976cb5 - Fixed include paths with UAC enabled (local builds don't have it on by default, so missed these in previous checkin)
[FYI] ben.marsh,bob.tellez
#rb none

#ROBOMERGE-SOURCE: CL 12755164 via CL 12755169 via CL 12755172
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v678-12743200)

[CL 12755178 by josh adams in Main branch]
2020-04-13 10:53:26 -04:00
josh adams
00fb0510ae - Added ability for a module to add additional directories (ConditionalAddModuleDirectory). Used for adding source files in Restricted (without needing the extra Build.cs files the way PlatformExtensions are set up).
#rb ben.marsh

#ROBOMERGE-SOURCE: CL 12754541 via CL 12754548 via CL 12754551
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v678-12743200)

[CL 12754556 by josh adams in Main branch]
2020-04-13 10:18:08 -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
fadca41a7b UBT: Change preference for binary output directories (choose most generic output dir)
#jira

#ROBOMERGE-SOURCE: CL 12682624 via CL 12682644 via CL 12682651
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12682681 by ben marsh in Main branch]
2020-04-08 20:49:09 -04:00
ben marsh
898042dd32 Fix output paths for programs under project directories.
#jira
[FYI] Josh.Adams

#ROBOMERGE-SOURCE: CL 12677640 via CL 12677644 via CL 12677645
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12677649 by ben marsh in Main branch]
2020-04-08 15:52:56 -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
jeff newquist
938e3c1cbb Fixed copy of files required for installed builds into platform directories.
#rb ben.marsh
#jira UE-85318
#rnx

#ROBOMERGE-SOURCE: CL 12657521 in //UE4/Release-4.25/... via CL 12657527 via CL 12657536
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12657540 by jeff newquist in Main branch]
2020-04-07 12:34:20 -04:00
ben marsh
af853a10cf Fix PVS Studio not working in installed engine builds.
#rb none
#jira UE-90605

#ROBOMERGE-SOURCE: CL 12500430 in //UE4/Release-4.25/... via CL 12500432 via CL 12500442
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12500447 by ben marsh in Main branch]
2020-03-31 15:55:02 -04:00
jeff newquist
5870731157 Fixed AdditionalRestrictedFolders not resulting in an array.
#rb david.harvey
#jira UE-85318
#rnx

#ROBOMERGE-SOURCE: CL 12498390 in //UE4/Release-4.25/... via CL 12498411 via CL 12498434
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12498451 by jeff newquist in Main branch]
2020-03-31 13:17:50 -04:00
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