Commit Graph

88 Commits

Author SHA1 Message Date
jack porter
49ebca3d46 Back out CL5935374 for UE-72100 as it causes 3 other issues
#jira UE-73066
#jira UE-73067
#jira UE-73073
#rb John.Mauney
#lockdown Cristina.Riveron

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 6042758 in //UE4/Release-4.22/... via CL 6042759
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 6044669 by jack porter in Dev-Build branch]
2019-04-22 21:10:42 -04:00
cosmin sulea
a16403d53b UE-72100 - tvOS For Distribution packages fail with Code Signing Error if made after a Development Build
#jira UE-72100
#rb Jack.Porter
#lockdown Cristina.Riveron

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5935374 in //UE4/Release-4.22/... via CL 5935375
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5949288 by cosmin sulea in Dev-Build branch]
2019-04-17 14:00:25 -04:00
sorin gradinaru
53c4740675 UE-72058 tvOS: Project Packaged with CloudKit Support Crashes on Launch Due to Malformed Value in the Entitlement
#jira UE-72058
#tvOS
#4.22.1
#rb Jack.Porter

Manually integrated (robomerge errors) from CL5731997

When building on Mac, the packaging &  signing rely on the entitlements file.

- the values should correspond to those in the entitlements (take into account syntax differences). Fixed problems related to icloud-container-identifiers, ubiquity-container-identifiers and com.apple.developer.icloud-services
- ICloudContainerIdentifier added to the tvOS plist (previously it was added on iOS)
- added com.apple.developer.icloud-container-environment to the entitlements file, needed when signing the package
- shipping build with CloudKit should also have the push notifications enabled
- fixed an issue with com.apple.developer.associated-domains when the value is a string, not an array
- addding CODE_SIGN_ENTITLEMENTS in the project file

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: sorin.gradinaru
#ROBOMERGE-SOURCE: CL 5732468 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5735338 by sorin gradinaru in Dev-Build branch]
2019-04-04 09:07:10 -04:00
Ben Marsh
6cecf89d14 UBT: Expose all the options for configuring the project file generator to the BuildConfiguration.xml files.
#rb none
#fyi Donal.MacCarthy

[CL 5708626 by Ben Marsh in Dev-Build branch]
2019-04-03 09:11:22 -04:00
cosmin sulea
fc607b3956 ROBOMERGE conflict 5630547 resolved UE-71953 - Blueprint iOS projects can't package For Distribution
#jira UE-71953
#rb Jack.Porter

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5630708 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5635359 by cosmin sulea in Dev-Build branch]
2019-03-28 16:59:47 -04:00
Ben Marsh
305c1e8512 UBT: Exclude any source files in a ThirdParty folder from the generated solution, not just those under Engine/Source/ThirdParty. There are a lot of large third party modules in engine plugins.
#rb none

[CL 5618127 by Ben Marsh in Dev-Build branch]
2019-03-27 20:04:42 -04:00
jules blok
feb7fa5a31 Escape all paths when generating VS project filter files
#jira UE-71727
#rb Jack.Porter

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jules.blok
#ROBOMERGE-SOURCE: CL 5439949 in //UE4/Release-4.22/... via CL 5439986
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5457983 by jules blok in Dev-Build branch]
2019-03-19 14:52:29 -04:00
Ben Marsh
07e535411b Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 5435186 by Ben Marsh in Dev-Build branch]
2019-03-18 16:38:36 -04:00
Ben Marsh
03ccbeb0a1 UBT: Exclude projects with temporary targets from generated project files by default. Can be re-enabled by passing -IncludeTempTargets to GenerateProjectFiles.bat.
#rb none
#jira UE-71318

[CL 5359427 by Ben Marsh in Dev-Build branch]
2019-03-11 10:57:27 -04:00
josh adams
73ede1d104 - Changed how framework signing for dylibs works. Remove the framework searching from Xcode into UBT (likely a placeholder spot until we overhaul some things)
- This keeps Mac from failing with SG_Com because now it only signs what has been staged via UBT/UAT
#rb michael.trepka (well, the concept, i had to get this in today, and he is OOO, but he will look at this tomorrow)
[FYI] michael.trepka

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 5290031 via CL 5294615 via CL 5294617
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5302055 by josh adams in Dev-Build branch]
2019-03-05 15:30:59 -05:00
ben marsh
c58bb3b972 UBT: Include other files in the project directory within the generated projects.
#rb none
#rnx
#jira

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5271663 in //UE4/Release-4.22/... via CL 5271664
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5274379 by ben marsh in Dev-Build branch]
2019-03-01 21:00:43 -05:00
josh adams
b3cc809913 - Merging Dev-Kairos/Engine/... to Main/Engine/...
- Brings over the necessary engine changes for embedding UE4 mobile as a dylib/so in native mobile app
- Various changes for facial animation, screen recording, others
- ARKit and ARCore plugins were removed, as deemed "not ready"
#rb many people

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 5201138 via CL 5203024 via CL 5226277
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5243833 by josh adams in Dev-Build branch]
2019-02-28 17:02:41 -05:00
Ben Marsh
dece8de2d2 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 5095547 by Ben Marsh in Dev-Build branch]
2019-02-20 15:06:37 -05:00
Ben Marsh
0f79d0e564 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4979967 by Ben Marsh in Dev-Build branch]
2019-02-12 21:08:26 -05:00
Ben Marsh
ef2c7066f2 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4957620 by Ben Marsh in Dev-Build branch]
2019-02-09 14:49:54 -05:00
Ben Marsh
84420696fe Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4830875 by Ben Marsh in Dev-Build branch]
2019-01-29 08:56:46 -05:00
Ben Marsh
a3e87004d6 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4783611 by Ben Marsh in Dev-Build branch]
2019-01-23 10:59:53 -05:00
Ben Marsh
3e14e12a73 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4737894 by Ben Marsh in Dev-Build branch]
2019-01-16 19:30:43 -05:00
Ben Marsh
0883dab58a Fix various issues building code projects from an installed engine build on Windows.
#rb none
#jira UE-68366
#rnx

[CL 4713026 by Ben Marsh in Dev-Build branch]
2019-01-11 15:33:57 -05:00
Ben Marsh
129aac0526 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4706788 by Ben Marsh in Dev-Build branch]
2019-01-10 20:03:35 -05:00
Ben Marsh
c09b6d7f18 Merge from //UE4/Main.
#rb none
#rnx

[CL 4701155 by Ben Marsh in Dev-Build branch]
2019-01-10 11:10:29 -05:00
Ben Marsh
6bef1a9def UBT: Remove code to add the -Monolithic option when generating intellisense data. This only exists to prevent intellisense errors because the DLLEXPORT and DLLIMPORT macros are mismatched for the project containing all modules; we can achieve this by explicitly modifying the macros instead.
#rb none
#rnx

[CL 4686059 by Ben Marsh in Dev-Build branch]
2019-01-07 15:09:52 -05:00
Ben Marsh
973932605e UBT: Fix project file generator including all projects in the workspace in the solution, even if a specific project file is specified.
#rb none
#rnx

[CL 4685376 by Ben Marsh in Dev-Build branch]
2019-01-07 12:21:18 -05:00
Ben Marsh
7ad281502a UBT: Don't assume the default architecture for a platform is the empty string. It's not on Linux, which causes warnings when generating project files.
#rb none
#jira UE-68019
#rnx

[CL 4682487 by Ben Marsh in Dev-Build branch]
2019-01-04 14:51:43 -05:00
Ben Marsh
53467c22ef UBT: Deprecate Visual Studio 2015. Still technically supported from source if explicitly selected as the compiler for a particular target, but will not be automatically detected by UBT for building.
#rb none

[CL 4681677 by Ben Marsh in Dev-Build branch]
2019-01-04 11:35:38 -05:00