Commit Graph

3297 Commits

Author SHA1 Message Date
chris babcock
6df461dc0d Provide more control over OBB selection
#jira UE-89810
#ue4
#android
#rb Brandon.Schaefer

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

[CL 11792949 by chris babcock in Main branch]
2020-02-28 20:20:36 -05:00
anthony bills
f573ba06f6 Add missing null checks to PluginDescriptor.cs
- Previously this would have been handled by WriteArray, now Plugins and Modules are a List and ToArray is called, the check needs to be moved up.

#rb rob.cannaday
[FYI] ben.marsh
#jira none

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

[CL 11723343 by anthony bills in Main branch]
2020-02-27 22:21:28 -05:00
ben marsh
e03ee48fbd Fix exception due to directory not existing when creating VSCode project.
#rb none
#jira UE-89684
#rnx

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

[CL 11661659 by ben marsh in Main branch]
2020-02-27 11:44:52 -05:00
ben marsh
ffd2f1ede7 Fix detection of engine modules being out of date.
#rb none
#jira UE-88824, UE-89676

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

[CL 11658322 by ben marsh in Main branch]
2020-02-27 11:10:22 -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
chris babcock
c3e14aa762 Add option to force use of legacy ld instead of lld for Android
#jira UE-89634
#ue4
#android
#rb Jack.Porter


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

[CL 11646391 by chris babcock in Main branch]
2020-02-26 22:08:53 -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
chris babcock
acfe9391e3 Fix NDK20 fallback tool paths for some architectures and disable ld.gold for ARM64
#jira UE-89658
#ue4
#android
#rb trivial

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

[CL 11645565 by chris babcock in Main branch]
2020-02-26 20:48:49 -05:00
ben marsh
a26431c2ab UBT: Produce an error if any output path is longer than MAX_PATH on Windows.
#rb none
#jira UE-75445

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

[CL 11638504 by ben marsh in Main branch]
2020-02-26 13:44:50 -05:00
ben marsh
628a79285c Don't allow UBT to try and compile engine modules when the engine is already running.
#rb none
#jira UE-88824

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

[CL 11637942 by ben marsh in Main branch]
2020-02-26 13:33:44 -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
8031d00cef UBT: Remove read-only files when cleaning a target.
#rb none
#jira UE-89548

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

[CL 11631049 by ben marsh in Main branch]
2020-02-26 09:56:11 -05:00
ben marsh
1402b8eb9b Ignore check for active Live Coding session if the -NoHotReloadFromIDE argument is present. Allows creating a new C++ project while Live Coding is active.
#rb none
#jira UE-82398

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

[CL 11630926 by ben marsh in Main branch]
2020-02-26 09:50:01 -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
5688548c44 Fix UBT always writing logs to user folder, rather than just in installed builds.
#rb none
#rnx
#jira

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

[CL 11624754 by ben marsh in Main branch]
2020-02-25 20:44:14 -05:00
ben marsh
592183f442 Prevent writing compiled assemblies to installed engine directory. Write them to the AppData folder instead.
#jira
#rb none

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

[CL 11619492 by ben marsh in Main branch]
2020-02-25 16:49:43 -05: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
0f201db161 Add support for UAT script projects using foreign engine builds, and for game projects to output binaries under their own project directory.
* UAT will now read each *.Automation.csproj file to determine the output path, and load from there rather than just loading anything under Engine\Binaries\AutomationScripts.
* When compiling *.Automation.csproj files, UAT will set the $(EngineDir) directory to the current engine directory, allowing the project to resolve assembly references to the correct location.
* When generating project files, UBT will create an *.Automation.csproj.props file next to the project containing the path to the engine directory, allowing the assembly to be compiled correctly from Visual Studio.

#rb none
#jira UE-77934

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

[CL 11601659 by ben marsh in Main branch]
2020-02-25 09:26:12 -05:00
ben marsh
0af8f199e1 UBT: Fix log file being written to Engine directory, even in installed builds.
#rb none
#jira
UE-87654

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

[CL 11592466 by ben marsh in Main branch]
2020-02-24 19:03:20 -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