Commit Graph

216 Commits

Author SHA1 Message Date
Ben Marsh
7d3da16a4f UBT: Allow the project file generator to correctly handle multiple modules in programs.
#rb none

[CL 6378395 by Ben Marsh in Dev-Build branch]
2019-05-08 16:24:18 -04:00
Josh Adams
07078cf3a3 - Fixed a file missing from .ini hierarchy
- Fixed some more CIS errors
#rb none

[CL 6355693 by Josh Adams in Dev-Build branch]
2019-05-07 21:04:03 -04:00
Josh Adams
88064dd544 - Fixed Mac build and project gneeration errors
#rb none

[CL 6354508 by Josh Adams in Dev-Build branch]
2019-05-07 19:27:43 -04:00
brian zaugg
fb0643b50a #ocn - Hotfix from 6258862 to fix iOS link failing with argument list too long.
#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: brian.zaugg
#ROBOMERGE-SOURCE: CL 6265085 via CL 6265224 via CL 6265383
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 6279778 by brian zaugg in Dev-Build branch]
2019-05-03 17:14:15 -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
brian zaugg
5790d3ec3f #ocn - Hotfix from 6258862 to fix iOS link failing with argument list too long.
#ROBOMERGE-SOURCE: CL 6265085 via CL 6265224

[CL 6265383 by brian zaugg in Main branch]
2019-05-02 17:58:53 -04:00
Ben Marsh
4d27210c01 UBT: Remove global function for determining whether a file is under an engine directory. This is now done via a trait that is propagated through construction of individual modules.
#rb none
#rnx
#fyi Josh.Adams

[CL 6076546 by Ben Marsh in Dev-Build branch]
2019-04-24 08:31:23 -04:00
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
jack porter
9df2286d36 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: robert.manuszewski
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 6042758 in //UE4/Release-4.22/... via CL 6042759
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 6044651 by jack porter in Dev-Core branch]
2019-04-22 21:10:36 -04:00
jack porter
a847d4ba9f 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-SOURCE: CL 6042758 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 6042759 by jack porter in Main branch]
2019-04-22 19:39:57 -04:00
cosmin sulea
3ec6b8dfcf 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: robert.manuszewski
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5935374 in //UE4/Release-4.22/... via CL 5935375
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5949980 by cosmin sulea in Dev-Core branch]
2019-04-17 14:02:51 -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
cosmin sulea
4dfd8f5ac7 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-SOURCE: CL 5935374 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5935375 by cosmin sulea in Main branch]
2019-04-17 06:05:55 -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
sorin gradinaru
43888bb83b 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: robert.manuszewski
#ROBOMERGE-AUTHOR: sorin.gradinaru
#ROBOMERGE-SOURCE: CL 5732468 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5735336 by sorin gradinaru in Dev-Core branch]
2019-04-04 09:07:09 -04:00
Sorin Gradinaru
97135fa96e 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

[CL 5732468 by Sorin Gradinaru in Main branch]
2019-04-04 07:18:29 -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
Cosmin Sulea
50b9f22efc ROBOMERGE conflict 5630547 resolved UE-71953 - Blueprint iOS projects can't package For Distribution
#jira UE-71953
#rb Jack.Porter

[CL 5630708 by Cosmin Sulea in Main branch]
2019-03-28 12:09:05 -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
jules blok
d2d37aa911 Escape all paths when generating VS project filter files
#jira UE-71727
#rb Jack.Porter

#ROBOMERGE-SOURCE: CL 5439949 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5439986 by jules blok in Main branch]
2019-03-18 20:15:53 -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
02e4eddc0f UBT: Fix generated config files not being read by UBT, or being considered when determining if makefiles are out of date.
#rb none
#jira UE-71501

#ROBOMERGE-SOURCE: CL 5392870 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5392891 by ben marsh in Main branch]
2019-03-13 17:39:17 -04:00
cosmin sulea
742c057b03 UE-70358 - Failure to sign when packaging for iOS Distribution when using Remote Compile from a code project on Windows
#jira UE-70358
#rb Ben.Marsh

#ROBOMERGE-SOURCE: CL 5382950 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5383321 by cosmin sulea in Main branch]
2019-03-13 11:41:55 -04:00