Commit Graph

3496 Commits

Author SHA1 Message Date
jack porter
1efbcbe91c Fixed incorrect target receipt path breaking iOS packaing on Mac
Fixed incorrect storyboard image copy for blueprint projects
#jira UE-92322
#lockdown Cristina.Riveron
#rb Josh.Adams

#ROBOMERGE-SOURCE: CL 12980186 in //UE4/Release-4.25/... via CL 12980202 via CL 12980223
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12980238 by jack porter in Main branch]
2020-04-22 14:24:51 -04:00
Ryan Durand
e3665d1269 Adding toolchain test builds.
#rnx
#rb ben.marsh
#jira UE-91215

[CL 12972250 by Ryan Durand in Main branch]
2020-04-21 22:15:27 -04:00
axel riffard
b61853d38a Fix Windows Remote Build iOS for Storyboards
Copy correct LaunchScreenIOS on tvOS
#rb jack.porter
#jira UE-91824
#lockdown christina.riveron

#ROBOMERGE-SOURCE: CL 12954632 in //UE4/Release-4.25/... via CL 12954646 via CL 12958981
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12959841 by axel riffard in Main branch]
2020-04-21 15:23:15 -04:00
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
jules blok
5e5a890137 Workaround bug in Lumin clang toolchain
#jira UE-91990
#rb none
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 12945747 in //UE4/Release-4.25/... via CL 12945751 via CL 12958399
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12958421 by jules blok in Main branch]
2020-04-21 14:38:03 -04:00
chris babcock
f1931debe2 Update SetupAndroid scripts to install Android NDK 21b with fixed clang for x86_64
#jira UE-89957
#ue4
[FYI] Jack.Porter
#android
#rb Trevor.Stone

#ROBOMERGE-SOURCE: CL 12941104 in //UE4/Release-4.25/... via CL 12941110 via CL 12941115
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12941120 by chris babcock in Main branch]
2020-04-20 19:56:37 -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
ben marsh
facbcfe389 Exclude binary files from generated projects.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 12940403 in //UE4/Release-4.25/... via CL 12940407 via CL 12940415
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12940419 by ben marsh in Main branch]
2020-04-20 18:20:30 -04:00
jack porter
7519ea6db6 Fix crash on tvOS startup due to missing storyboard
#jira UE-92212
#rb Axel.Riffard
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 12921925 in //UE4/Release-4.25/... via CL 12921931 via CL 12921949
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12921959 by jack porter in Main branch]
2020-04-20 09:35:33 -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
eb7cfe44b8 Clear out the INCLUDE environment variable before building. Since the IncludePath property from the Visual C++ project files gets propagated to this environment variable, it gets convered into /I arguments by the compiler driver. That results in a long argument list, which causes an error in Visual Studio 2017.
#jira

#ROBOMERGE-SOURCE: CL 12911467 via CL 12911468 via CL 12911475
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12911478 by ben marsh in Main branch]
2020-04-19 15:02:33 -04:00
ben marsh
61d897c732 Another attempt at fixing Visual Studio memory uses. Now sets the most common include paths, up to 24k, in the IncludePath property, and the remainder on individual items.
#jira UE-92188

#ROBOMERGE-SOURCE: CL 12911340 via CL 12911341 via CL 12911342
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12911343 by ben marsh in Main branch]
2020-04-19 13:25:35 -04:00
ben marsh
4a56b51501 Temporarily revert change to set IncludePaths variable, since it causes an error setting the INCLUDE environment variable when building large projects.
#jira

#ROBOMERGE-SOURCE: CL 12911196 via CL 12911197 via CL 12911198
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12911202 by ben marsh in Main branch]
2020-04-19 10:50:32 -04:00
ben marsh
5dbe78ca68 Change the property used to set include paths for Visual Studio project file. This signifantly reduces memory usage in the IDE (measured ~1,100mb before, ~500mb after) without changing intellisense results, because the property isn't propagated to each item. Also remove unnecessary force included files in non-C++ items.
#rb none
#jira UE-92188

#ROBOMERGE-SOURCE: CL 12905889 in //UE4/Release-4.25/... via CL 12905891 via CL 12905893
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12908019 by ben marsh in Main branch]
2020-04-18 16:10:23 -04:00
chris babcock
5f70ec1e68 Fix typo
#jira none
#ue4
#android
#rb trivial

#ROBOMERGE-SOURCE: CL 12900348 in //UE4/Release-4.25/... via CL 12900366 via CL 12900380
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12907100 by chris babcock in Main branch]
2020-04-18 15:55:56 -04:00
chris babcock
b42f704352 Allow -armv7 etc on -architectures for Android in UBT
#jira UE-92110
#ue4
#android
#rb Florin.Pascu

#ROBOMERGE-SOURCE: CL 12900306 in //UE4/Release-4.25/... via CL 12900310 via CL 12900312
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12907099 by chris babcock in Main branch]
2020-04-18 15:55:54 -04:00
chris babcock
826d93d62e Check for change in active plugins on Android and clean Intermediate/Android if necessary to prevent packaging failures
#jira UE-92126
#ue4
#android
#rb Brandon.Schaefer

#ROBOMERGE-SOURCE: CL 12873795 in //UE4/Release-4.25/... via CL 12873798 via CL 12873801
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12873807 by chris babcock in Main branch]
2020-04-16 17:27:12 -04:00
chris babcock
55b8d1e0fc Set a new minimum SDK level for Android using Gradle
#jira UE-92113
#ue4
#android
#rb John.Mauney

#ROBOMERGE-SOURCE: CL 12871574 in //UE4/Release-4.25/... via CL 12871581 via CL 12871589
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12871595 by chris babcock in Main branch]
2020-04-16 15:48:20 -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
306377ee32 Fixed UBT warnings due to missing documentation comment.
#rb none
[FYI] Jack.Porter
#jira

#ROBOMERGE-SOURCE: CL 12852440 in //UE4/Release-4.25/... via CL 12852453 via CL 12852468
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12852495 by ben marsh in Main branch]
2020-04-16 08:06:27 -04:00
axel riffard
5b625e05ae Check presence of view controller ID when copying the LaunchScreen
#rb jack.porter
#jira UE-92003
#lockdown christina.riveron

#ROBOMERGE-SOURCE: CL 12852296 in //UE4/Release-4.25/... via CL 12852302 via CL 12852318
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12852340 by axel riffard in Main branch]
2020-04-16 08:03:21 -04:00
david harvey
e3b5f26803 Manifest string resource helper function returns the manifest string reference too.
#rb trivial
#jira none

#ROBOMERGE-SOURCE: CL 12850545 in //UE4/Release-4.25Plus/... via CL 12850613
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12850662 by david harvey in Main branch]
2020-04-16 07:26:01 -04:00
david harvey
642e0a7364 Helper function to add a debug string to the manifest localised string resources.
#jira MTHRL-96
#rb eric.mcdaniel

#ROBOMERGE-SOURCE: CL 12849359 in //UE4/Release-4.25Plus/... via CL 12849372
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12849391 by david harvey in Main branch]
2020-04-16 06:58:06 -04:00
jack porter
f2bbf8161a Fixed a number of cases where code was assuming Client targets are always named the same as the game target with "Client" appended.
#jira UE-77351
#rb Florin.Pascu
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 12841919 in //UE4/Release-4.25/... via CL 12841963 via CL 12842002
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12842018 by jack porter in Main branch]
2020-04-16 02:01:03 -04:00