Commit Graph

200 Commits

Author SHA1 Message Date
Marc Audy
a7f9391231 Merge UE5/Release-Engine-Staging @ 14811410 to UE5/Main
This represents UE4/Main @ 14768117

For ReleaseObjectVersion.h
#lockdown Marcus.Wassmer

[CL 14811440 by Marc Audy in ue5-main branch]
2020-11-24 18:42:39 -04:00
Marc Audy
68150e0be7 Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496
This represents UE4/Main @ 14594913

[CL 14612291 by Marc Audy in ue5-main branch]
2020-10-29 13:38:15 -04:00
Josh Adams
df33c7885f - Added file logging to GenerteProjectFiles (saved to Engine/Programs/UnrealBuildTool/Log_GPF.txt)
- Improved GPF's SDK error printouts, with no more red error text, and just a list of bad platform SDKs, and a link to the log file to get the detailed information if desired
#rb ben.marsh

[CL 14475783 by Josh Adams in ue5-main branch]
2020-10-12 18:14:03 -04:00
Marc Audy
50a3d7d368 Merge Release-Engine-Staging to Main @ CL# 14467590
This represents UE4/Main @ 14432125 + some cherrypick fixes

[CL 14468207 by Marc Audy in ue5-main branch]
2020-10-09 22:42:26 -04:00
Josh Adams
788aad5cb0 - Updated UEBuildPlatform[SDK] to look in DDPI.ini and not bother setting up SDKs for platforms that aren't enabled (no need to print out errors for missing platform SDKs for platforms that aren't valid, like consoles on Mac)
- Streamlined the logs for bad SDK versions, especially when multiple platforms have bad SDKs
- Skip over non-enabled platforms in some Turnkey commands

[CL 14462457 by Josh Adams in ue5-main branch]
2020-10-09 13:20:15 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
Josh Adams
d0daf0380c - Moved valid device software (flash) versions into UEBuildPlatformSDK subclasses to put alongside the SDK version, and made them min-max
- General fixes for some platforms
- DDPI now remembers the SDK version information from Turnkey
- Updated Turnkey Launch menu to have SDK information, including device software versions,
- Moved the initial turnkey query earlier before AutoSDKs are setup so envvars are not blown away for the child process
- Added concept of "Prepare For Debugging", but not enabled on any platforms yet (what it means is per platform, and is somewhere between cooking and packaging)
- VerifySdk Turnkey command now puts its output into a (x=y, z=w) format for easier parsing in C++
- NullCopyProvider now copies large remote files, and remote directories, locally before using

[CL 14377385 by Josh Adams in ue5-main branch]
2020-09-23 11:47:14 -04:00
Ben Marsh
03675533ea Rename UE4Game -> UnrealGame, UE4Client -> UnrealClient, UE4Server -> UnrealServer.
Mostly a find/replace, though I have looked through the changes and attempted to update references to other things as necessary (eg. renaming IOS plist files for IOS). I'm not set up to test on any platforms other than windows, and was hoping to get your blessing to submit and give QA enough time as possible to uncover issues before the next milestone release.

Particular things that I know I'm not sure about:
- Android references /UE4Game/ paths everywhere (for paths on device, I think). I have no idea if I've got them all.
- I've renamed the iOS mobileprovisions, but I don't know if they need regenerating for the new app name.
- Likewise, not sure what needs to be updated for icon bundles on iOS.

Things that have not been changed:
- Windows still uses IDI_UE4ICON for its icon
- UE4CommandLine.txt
- There's still a UE4Game module which is used by content-only projects

#rb none

[CL 14301890 by Ben Marsh in ue5-main branch]
2020-09-11 15:54:42 -04:00
Josh Adams
b7ae971259 - Renamed a poorly named PlatformSDK function for AutoSDK (GetDesiredVersion -> GetMainVersion)
- Now allow AutoSDK directory name and internal version to be separate (Android only using this for now)
- Some code cleanup with associated functions

[CL 14283427 by Josh Adams in ue5-main branch]
2020-09-09 15:45:53 -04:00
Josh Adams
863cc0dfbd - Quick fix for Android SDK detection before bigger re-write in Main
#jira UE-98153
#robomerge release-5.0-m2

[CL 14282340 by Josh Adams in ue5-main branch]
2020-09-09 14:14:12 -04:00
Marc Audy
7379fa99c5 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14229157
[CL 14233282 by Marc Audy in ue5-main branch]
2020-09-01 14:07:48 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00
Josh Adams
8e4048e6ee - Moved Platform SDK classes to their own files to prepare for moving to BuildUtilities
- Deleted some empty subclasses
#fyi ben.marsh

[CL 13736834 by Josh Adams in ue5-main branch]
2020-06-22 16:48:32 -04:00
Josh Adams
ab4a48f566 - Moved UEBuildPlatformSDK into a separate DLL, BuildUtilities (similar to DotNETUtilities), allowing for better sharing of code between UBT and UAT (Turnkey in particular)
- Refactored SDK versioning into more formalized APIs for all platforms. Currently UBT will not error with bad versions, but that is coming.
- Turnkey updated to use new BuildUtilities
#rb ben.marsh

[CL 13733158 by Josh Adams in ue5-main branch]
2020-06-22 14:32:25 -04:00
chris babcock
c8135249c6 Add Opus libraries for Android x86
#jira UE-85785
#ue4
#android
#rb Brandon.Schaefer

#ROBOMERGE-SOURCE: CL 13051799 in //UE4/Release-4.25/... via CL 13051805 via CL 13051811
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13051816 by chris babcock in Main branch]
2020-04-27 17:59:56 -04:00
Florin Pascu
3f0e82dca7 Error if x64 or x86 is only platform and in binarybuild
#jira UE-92455
#rb Chris.Babcock
#fyi Jack.Porter

#ushell-cherrypick of 13034826 by Florin.Pascu

[CL 13035774 by Florin Pascu in Main branch]
2020-04-24 14:18:45 -04:00
chris babcock
87f2079cd0 Remove redundant compiler flags on x86_64 architectures
#ue4
#android
#rb trivial


#ROBOMERGE-SOURCE: CL 13034541 via CL 13034548 via CL 13034550
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v683-13008971)

[CL 13034553 by chris babcock in Main branch]
2020-04-24 12:38:46 -04:00
chris babcock
9696573221 Give a warning if a non-source version of engine tries to compile for x64 on Android
#jira UE-92429
#ue4
#android
[FYI] Jack.Porter
#rb Florin.Pascu

#ROBOMERGE-SOURCE: CL 13024957 in //UE4/Release-4.25/... via CL 13024986 via CL 13025060
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v683-13008971)

[CL 13025129 by chris babcock in Main branch]
2020-04-23 19:37:07 -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
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
af150afdbe Fix path to Android keystore causing build failures.
[FYI] Josh.Adams

#ROBOMERGE-SOURCE: CL 12766499 via CL 12766503 via CL 12766504
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v678-12743200)

[CL 12766506 by ben marsh in Main branch]
2020-04-13 17:31:02 -04:00