Commit Graph

206 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Rolando Caloca
f63a3e857e Merging //UE4/Main@11178322 to Dev-RenderPlat-Staging
#rnx
#rb none

[CL 11195678 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2020-01-31 10:34:10 -05:00
Juan Canada
2ecf4f9708 Merging //UE4/Dev-Main@10877709 to Dev-RenderPlat-Staging(//UE4/Dev-Rendering)
#rnx
#rb none

[CL 10895568 by Juan Canada in Dev-RenderPlat-Staging branch]
2020-01-07 13:45:01 -05:00
ben marsh
03ae195b79 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536 via CL 10870955
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v624-10872983)

[CL 10876681 by ben marsh in Dev-Build branch]
2020-01-05 17:24:44 -05:00
Ryan Durand
9ef3748747 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536
#ROBOMERGE-BOT: FORTNITE (Main -> Dev-EngineMerge) (v613-10869866)

[CL 10870955 by Ryan Durand in Main branch]
2019-12-26 23:01:54 -05:00
Ben Marsh
6b88e2ae98 Merging CL 10078845: Added AdditionalRootDirectories to project file. This allows projects to compile modules from source code stored in shared directories.
#rb none
#rnx

[CL 10078924 by Ben Marsh in Dev-Build branch]
2019-11-07 21:01:48 -05:00
Ben Marsh
b56ebcae04 UBT: Fix single-file compile option modifying response files for files other than the one being built. Causes more files to be rebuilt in the next regular build than necessary.
#rb none
#fyi Johan.Torp

[CL 8572161 by Ben Marsh in Dev-Build branch]
2019-09-09 10:16:08 -04:00
Josh Adams
fc35abd711 - Support for UHT to generate headers in platform extension modules (they are put in the project's main Intermediate directory along with the other headers)
#rb ben.marsh,jeff.newquist
#jira none

[CL 8115591 by Josh Adams in Dev-Build branch]
2019-08-19 11:48:28 -04:00
DecoyRS
9333dbbcfa PR #6063: Rider Project Model generation v 1.0 (Contributed by DecoyRS)
#rb none

[CL 8095590 by Ben Marsh in Dev-Build branch]
2019-08-16 13:41:27 -04:00
Joakim Lindqvist
5dfc711a1f Add warning when referencing a module without a fully qualifed path, doing so will break the incremental building of it.
Added SystemLibrary list you can use if you actually need to add a module without a fully qualified path and dont want to see this warning (should not be needed in most cases)

Also updated the android toolchain to filter paths to a library in the same way a additional library search path is filtered enabling us to just specify the full path to multiple libraries for different architectures.

#jira UE-54890
#review-7867830 ben.marsh
#rb none

[CL 7918850 by Joakim Lindqvist in Dev-Build branch]
2019-08-09 03:47:21 -04:00
Ben Marsh
adaaeff8d7 UBT: Rename the bOutputPublicallyDistributable setting to reduce confusion. Now called ModuleRules.bLegalToDistributeObjectCode and TargetRules.bLegalToDistributeBinary.
#rb none
#rnx

[CL 7651516 by Ben Marsh in Dev-Build branch]
2019-07-29 15:00:54 -04:00
ben marsh
1ea35c89ef Output each extracted framework to a different directory to fix contention when unzipping multiple frameworks in parallel.
#rb none
#jira UE-77294

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 7311377 in //UE4/Release-4.23/... via CL 7311378
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v371-7306989)

[CL 7359427 by ben marsh in Dev-Build branch]
2019-07-17 02:08:49 -04:00
chris gagnon
72ba51c5bd Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
#rb none


#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 6838042 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v366-6836689)

[CL 6874679 by chris gagnon in Dev-Build branch]
2019-06-07 05:27:42 -04:00
Josh Adams
1e4b186150 - Big update to platforms: PlatformExtensions
- This allows for Confidential platforms to exist outside of the engine, and insert themselves in as needed
- Directory structure is, where .... mirrors the directory structure for Engine and projects
     - /Platforms/XXX/....
- Moving to more data driven approach for ShaderPlatforms and PlatformInfo, where they can be read from DataDrivenPlatformInfo.ini files that live in the platform config folders
- Removed platform mentions from UBT, by way of changing some enums to partial classes with static members (see UnrealTargetPlatform)
- Various other UBT/UAT modifications to allow for looking in other locations for files
- THIS IS NOT A COMPLETE AND FINAL SOLUTION. WE WILL CONTINUE WORK IN DEV-BUILD BEFORE ITS READY FOR PRIMETIME
#rb ben.marsh

[CL 6271418 by Josh Adams in Dev-Build branch]
2019-05-03 08:03:23 -04:00