Commit Graph

37 Commits

Author SHA1 Message Date
josh adams
1386a55120 - Enabling UAT built on Windows to run on Linux, by pulling WinForms stuff out into a premade assembly (UnrealWindowsForms.dll)
- Note that for Windows to work, the AutomationTool.exe needs to be marked as a Desktop app, so when running on Linux, this command is needed one time: sed -i 's/WindowsDesktop/NETCore/' AutomationTool.runtimeconfig.json
- Removed some platform-specific checks for the platform building it, and #if WINDOWS type checks (not all gone, but getting better)
#rb jonathan.adamczewski
#preflight 6195a7de841fa7e69d5964d4
[FYI] graeme.thornton

#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 18237766 via CL 18242422 via CL 18242492 via CL 18242564 via CL 18244551 via CL 18244617
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18244669 by josh adams in ue5-release-engine-test branch]
2021-11-18 16:57:11 -05:00
aurel cordonnier
fc542f6cfd Merge from Release-Engine-Staging @ 18081189 to Release-Engine-Test
This represents UE4/Main @18073326, Release-5.0 @18081140 and Dev-PerfTest @18045971

[CL 18081471 by aurel cordonnier in ue5-release-engine-test branch]
2021-11-07 23:43:01 -05:00
david harvey
fe2267f110 verify directory access permission on Windows before expanding wildcards in Turnkey.
#jira none
#rnx
#rb nuno.leiria

#ROBOMERGE-SOURCE: CL 17080840 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v853-17066230)

[CL 17080851 by david harvey in ue5-release-engine-test branch]
2021-08-06 04:51:29 -04:00
david harvey
3e6835eded Added GetUserConfirmation to Turnkey IO provider, allowing better Yes/No prompts.
#jira UE-118572
#rb nuno.leiria
#rnx

#ROBOMERGE-SOURCE: CL 16771619 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v836-16769935)

[CL 16771644 by david harvey in ue5-release-engine-test branch]
2021-06-24 08:56:32 -04:00
david harvey
a271002525 In-Editor UI for Turnkey.
#jira UE-118572
#rb Josh.Adams, Nuno.Leiria
#rnx

#ROBOMERGE-SOURCE: CL 16754815 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v835-16672529)

[CL 16754816 by david harvey in ue5-release-engine-test branch]
2021-06-23 05:38:57 -04:00
nuno leiria
679b499b1b Move Turnkey editor dialog to an ApartmentState.STA thread so it doesn't deadlock on shutdown
#jira UE-113400
#rb luke.thatcher
#fyi josh.adams

[CL 16146151 by nuno leiria in ue5-main branch]
2021-04-28 13:32:35 -04:00
josh adams
98aadf5c36 - Categorized Turnkey commands
- Added ability to have input list options be headers (prefix with ;)
#rb nuno.leiria

#ROBOMERGE-SOURCE: CL 15472185 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15472224 by josh adams in ue5-main branch]
2021-02-19 11:59:55 -04:00
jeff newquist
e50c1cb474 Avoid matching trashed files when searching google drive.
#rb josh.adams,brian.white
#jira none
#rnx

[CL 15250393 by jeff newquist in ue5-main branch]
2021-01-28 17:03:46 -04:00
brian white
76666ef361 [Turnkey] Add the ability to print a message before installing and SDK. Add 'PauseForUser' action to facilitate displaying a message (without capturing input). It displays a prompt to the user and waits for acknowledgement.
#rb Josh.Adams
#rnx

[CL 15149541 by brian white in ue5-main branch]
2021-01-20 19:02:02 -04:00
Josh Adams
c7360895de - Fixed Turnkey menu not respecting the platform configuration/target platform selections
- Improvements for ExecuteBuild - mostly around project selection, where it will give you options, cache last used project, etc
- Added search/replace modifier to the {....} syntax in the build spec (useful mainly for inivalue basically)
- Editor now just runs -command=ExecuteBuild -build=XYZ instead of parsing the XYZ build params and running UAT directly
- Deleted old #if 0'd code. Can go back in p4 history to find it later.
- Setup VisualStyles in Turnkey so that the project selector looks good on HiDPI
#rb self/turnkey

[CL 15014143 by Josh Adams in ue5-main branch]
2021-01-07 15:27:48 -04:00
Ben Marsh
6f927647b1 Changing C# code over to using EpicGames.Core over DotNETCommon.
#rb none
#rnx

[CL 14962096 by Ben Marsh in ue5-main branch]
2020-12-21 23:07:37 -04:00
Josh Adams
72f6ecef4a - Updated default AutoSDK install location to work across host platforms better
#rb brandon.schaefer

[CL 14897939 by Josh Adams in ue5-main branch]
2020-12-10 11:01:54 -04:00
Joakim Lindqvist
e7039d3d35 UBT and UAT now use .NET Core instead of Framework and Mono. This means that we use the same runtime on Windows, Linux and Mac. Further benefits including newer C# features and a lot of intresting features for the future around AOT and Tiered compilation.
Some behavior changes:
Output paths - Both tools are now output to a subdirectory of Binaries/Dotnet, I believe most hardcoded paths have been fixed up but there may be tools that will fail because of this.
UAT Plugin Building - As .NET Core does not support AppDomain unloading, how we build the plugins has changed quite a bit, these are now built before UAT is started rather then by UAT itself. If you just start UAT via RunUAT.bat/sh this should just continue to work.

#rb ben.marsh

[CL 14834347 by Joakim Lindqvist in ue5-main branch]
2020-12-02 06:57:13 -04:00
Brandon Schaefer
b85212d00a Fix Linux for turnkey.
Assume p4 is in the $PATH somewhere

#jira none
#rb Josh.Adams

[CL 14831290 by Brandon Schaefer in ue5-main branch]
2020-12-01 17:42:21 -04:00
Josh Adams
9314095bc6 - Fixed linux crash in Turnkey in GDI mono
#rb brandon.schaefer
#jira UE-103152

[CL 14823307 by Josh Adams in ue5-main branch]
2020-11-30 16:42:33 -04:00
brian white
19c266e185 [Turnkey] When using cached files in GoogleDriveCopyProvider, don't overwrite OutputPath with the last file path if a wildcard is used.
#rb Josh.Adams

[CL 14739772 by brian white in ue5-main branch]
2020-11-12 18:08:17 -04:00
brian white
5c53ff0809 [Turnkey] Ignore files in google drive that are trashed.
#rb Josh.Adams

[CL 14738473 by brian white in ue5-main branch]
2020-11-12 16:39:25 -04:00
Josh Adams
61898204da - Worked around p4.exe having a bad interaction with Windows parsing the commandline with a * in it in a server path, by passing commands with a * in the parameters through in a file and the -x global option. (Windows would treat //UE4/Main as \\UE4\Main and take forever to timeout looking for a server named UE4)
#rb brandon.schaefer

[CL 14666987 by Josh Adams in ue5-main branch]
2020-11-05 14:23:24 -04:00
Joakim Lindqvist
f90e40ffb0 UAT can now build as a netcore application.
Added a NET_CORE define to allow us to have changes side by side.
The AWS S3 changes are required due to us requiring to upgrade the S3 assembly version to get net core support (which made all methods async).
The ACL checks for files are not available in the system libraries of net core, as such the api is a bit different.

AutomationToolLauncher now just spawns a subprocess when used in netcore, as netcore does not support custom AppDomains and shadow copying. We will generally need to revisit this for netcore as this whole feature of building the source for UAT in UAT is not really possible.

To enable this set environment variable "UE_USE_DOTNET=1", note that with netcore all applications change their output path so this will likely break a bit of tooling when enabled.

#rb ben.marsh

[CL 14572339 by Joakim Lindqvist in ue5-main branch]
2020-10-26 06:08:59 -04:00
Josh Adams
0f3de44fbd - Added Turnkey Studio setting for GoogleDrive app name, and added a log to show user that they may need to check their web browser for Google authentication
[CL 14472507 by Josh Adams in ue5-main branch]
2020-10-12 11:57:22 -04:00
Josh Adams
57691b9c28 - Locally copied remote files are now remembered so won't be re-downloaded within one run of Turnkey (helps if updating multiple devkits with windows share sources)
- Don't attempt to install an flash SDK on a device that can't be connected to

[CL 14386709 by Josh Adams in ue5-main branch]
2020-09-24 10:31:16 -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
Josh Adams
0a24db7bbe - Fixed some turnkey ios profile sorting issues
- Allow clearing of Turnkey User settings, or setting to empty string
#jira UE-98200
#robomerge release-5.0-m2

[CL 14291953 by Josh Adams in ue5-main branch]
2020-09-10 15:35:38 -04:00
Josh Adams
de850319ff Turnkey:
- Added SDK installation pre/post-ambles so the platform can give user more
information on what's happening, and what to do on a failure (or a success)
- Added some defaults for Studio settings in TurnkeyManifest.xml, to show how to set in a studio's .xml file
- Added/updated some Studio settings/names
- Added bCanConnect flag to DeviceInfo (in case a platform can list devices even if they are unable to flash/run/etc - in which case the fields may or may not be correct)
- Added $(AllPlatforms) and $(AutoSDKPlatforms) built-in variables

[CL 14219769 by Josh Adams in ue5-main branch]
2020-08-31 12:05:23 -04:00
Josh Adams
d6a9409268 - Updated some turnkey installations
- Removed BuildSource type, and just use the generic FileSource for finding builds
- Improved support for $[x] captures

[CL 14170018 by Josh Adams in ue5-main branch]
2020-08-24 08:54:52 -04:00