Commit Graph

4484 Commits

Author SHA1 Message Date
ben marsh
80bced1121 Fix issues with mismatched solution/project configurations.
* Every C++ project now has an "invalid" configuration. Trying to build any solution configuration which does not apply to the project will now build that, which prints an error rather than building a completely different configuration.
* Available configurations are now parsed from C# files, so the "Release" configuration will now be used if "Development" is not available, and platforms are supported correctly.
* Programs are now built in game and editor configurations.

#rb none
#jira UE-59288

#ROBOMERGE-SOURCE: CL 4432766 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4432767 by ben marsh in Staging-4.21 branch]
2018-10-05 14:20:40 -04:00
chad garyet
55945b99dc Integrating changes from dev-build over to release-4.21
- Add win64 host support to DDC Group Linux
- Change project params split to remove empty entries
- Change BuildDerivedDataCache to skip building a feature pack if there are no project specific platforms for it out of the available targetplatforms
#jira UE-62311
#rb ben.marsh

#ROBOMERGE-SOURCE: CL 4431926 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4431927 by chad garyet in Staging-4.21 branch]
2018-10-05 11:15:17 -04:00
ben marsh
d35a845858 Output Visual Studio project files in the same format as Visual Studio, and use StringBuilders everywhere to avoid large numbers of string copies.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 4431637 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4431638 by ben marsh in Staging-4.21 branch]
2018-10-05 10:26:06 -04:00
ben marsh
fc6c3b51f9 Fix issues with running DsymExporter remotely from a PC, and reorder engine filters to reduce the amount of junk which has to be re-transferred every time.
#rb none
#jira UE-63883

#ROBOMERGE-SOURCE: CL 4430761 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4430762 by ben marsh in Staging-4.21 branch]
2018-10-04 21:12:36 -04:00
pluranium
f9186e8277 PR #5151: Fix BuildPlugin automation command to include Shaders folder (Contributed by pluranium)
#rb none
#jira UE-64781

#ROBOMERGE-SOURCE: CL 4430050 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4430051 by ben marsh in Staging-4.21 branch]
2018-10-04 17:37:57 -04:00
ben marsh
e5a7d268c3 UBT: Fix generating and checking for UHT manifest in the wrong location. If a target does not have a script plugin, the manifest should not be stored in the project binaries directory.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 4430037 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4430039 by ben marsh in Staging-4.21 branch]
2018-10-04 17:33:49 -04:00
ben marsh
6058e336c8 Fix warning about missing expat libs when generating projects from installed build on Mac.
#rb none
#jira UE-64740

#ROBOMERGE-SOURCE: CL 4428729 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4428731 by ben marsh in Staging-4.21 branch]
2018-10-04 15:31:36 -04:00
peter sauerbrei
b2e1cf0f89 deprecate IOS 9
#jira UE-64018
#rb john.mauney

#ROBOMERGE-SOURCE: CL 4427716 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4427717 by peter sauerbrei in Staging-4.21 branch]
2018-10-04 11:45:28 -04:00
ben marsh
f36fe54542 Remove natvis file from UE4 project.
#rb none
[FYI] Steve.Robb
#jira

#ROBOMERGE-SOURCE: CL 4426983 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4426984 by ben marsh in Staging-4.21 branch]
2018-10-04 08:02:05 -04:00
ben marsh
49f4bbe06b Fix UAT compile error.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 4426571 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4426572 by ben marsh in Staging-4.21 branch]
2018-10-03 22:08:11 -04:00
ben marsh
2275966409 UnrealVS: Fix single-file compile not working for foreign projects where the engine folder contains a space.
#rb none
#jira UE-64752

#ROBOMERGE-SOURCE: CL 4426569 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4426570 by ben marsh in Staging-4.21 branch]
2018-10-03 22:05:35 -04:00
ben marsh
dbc5a8aa25 Various fixes/improvements to program plugins.
* Runtime plugins are no longer loaded for every program (as was the case in 4.20)
* If a module is whitelisted for a specific program, it will be enabled regardless of whether the Type is  "Program" or not.
* The bCanBeUsedWithUnrealHeaderTool flag in the plugin descriptor is now translated into support for the "UnrealHeaderTool" program on load.
* Restored support for the RuntimeAndProgram module type.
* Plugins are now enabled in UHT by passing the project on the command line, rather than passing explicit plugins to enable.

#rb none
#jira UE-64247, UE-64595

#ROBOMERGE-SOURCE: CL 4426529 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4426530 by ben marsh in Staging-4.21 branch]
2018-10-03 21:30:01 -04:00
ben marsh
f715abf901 Fix extra blank line at the end of ManagedProcess output.
#rb none
#jira UE-64780

#ROBOMERGE-SOURCE: CL 4426400 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4426401 by ben marsh in Staging-4.21 branch]
2018-10-03 20:07:01 -04:00
phillip kavan
58ce1ce9e2 Fix UBT warnings when building/packaging with Blueprint nativization enabled.
- Mirrored from //UE4/Dev-Framework (4352144).

#jira UE-62946, UE-63311
#rb Marc.Audy

#ROBOMERGE-SOURCE: CL 4425408 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4425418 by phillip kavan in Staging-4.21 branch]
2018-10-03 17:30:04 -04:00
ben marsh
0438a9ed86 Include the Visual Studio .natvis file as a solution item, to fix problems with VS2017 15.8.5 not finding it in a makefile project.
#rb none
#jira UE-64733

#ROBOMERGE-SOURCE: CL 4424584 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4424586 by ben marsh in Staging-4.21 branch]
2018-10-03 16:58:30 -04:00
Ben Marsh
3e061df43f Undo //UE4/Release-4.21/Engine/... changelist 4420563 (due to builders not having .NET 4.6.2)
#rb none
#jira

#ROBOMERGE-SOURCE: CL 4421165 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4421247 by Ben Marsh in Staging-4.21 branch]
2018-10-03 11:50:00 -04:00
Ben Marsh
6cad1b2f62 Update C# projects to NET framework 4.6.2, and add manifest entry for long filename support.
#rb none
#jira UE-63120

#ROBOMERGE-SOURCE: CL 4420563 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4421236 by Ben Marsh in Staging-4.21 branch]
2018-10-03 11:47:13 -04:00
ben marsh
bb0aadef47 UBT: Detect changes to source directories and invalidate the makefile if they are newer. Forces the makefile to be rebuilt when files are added or removed.
#rb none
#jira UE-42601

#ROBOMERGE-SOURCE: CL 4420198 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4420201 by ben marsh in Staging-4.21 branch]
2018-10-03 10:42:55 -04:00
ben marsh
f4f56d2f82 UBT: Determine the correct user directory when remote compiling on Mac, rather than inferring it from the user name. The user name can be changed after an account is created.
#rb none
#jira UE-64071

#ROBOMERGE-SOURCE: CL 4419646 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4419647 by ben marsh in Staging-4.21 branch]
2018-10-03 09:21:19 -04:00
ben marsh
3518fef950 Allow plugins specified on the command line to override engine plugins.
#rb none
#jira UE-64685

#ROBOMERGE-SOURCE: CL 4419034 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4419035 by ben marsh in Staging-4.21 branch]
2018-10-02 23:00:09 -04:00
chris babcock
7746b96f3d Fix for x86 and x86_64 Android architectures with NDK14b
#jira UE-64708
#ue4
#android
#rb trivial

#ROBOMERGE-SOURCE: CL 4418817 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4418818 by chris babcock in Staging-4.21 branch]
2018-10-02 20:18:11 -04:00
ben marsh
b6f543a44d Fix compile warning when converting a blueprint project to native.
#rb none
#jira UE-63802

#ROBOMERGE-SOURCE: CL 4417362 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4417364 by ben marsh in Staging-4.21 branch]
2018-10-02 15:50:00 -04:00
marcin undak
0b79200740 UAT: Aways create directory before saving encryption parameters
#rb Graeme.Thornton
[FYI] Graeme.Thornton
#jira none

#ROBOMERGE-SOURCE: CL 4415592 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4415594 by marcin undak in Staging-4.21 branch]
2018-10-02 11:52:00 -04:00
jason bestimt
6357f1d598 Merging CL 4347297 from Dev-VR - Swapping double to single quote to fix Mac Editor packaging for Lumin
#RB: ben.marsh
#JIRA: UE-63556

#ROBOMERGE-SOURCE: CL 4413142 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4413143 by jason bestimt in Staging-4.21 branch]
2018-10-01 16:13:20 -04:00
jason bestimt
210df791fc Merging CL 4336998 from Dev-VR - Splitting game and client platform info
#RB:josh.adams
#JIRA: UE-63529


#ROBOMERGE-SOURCE: CL 4413107 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4413128 by jason bestimt in Staging-4.21 branch]
2018-10-01 16:12:16 -04:00