Update platform target names for UE5

This commit is contained in:
Steve Streeting 2022-04-20 16:18:35 +01:00
parent a643712a0a
commit 94885e028c
2 changed files with 12 additions and 6 deletions

View File

@ -47,7 +47,8 @@ function Get-Package-Client-Dir {
param ( param (
[PackageConfig]$config, [PackageConfig]$config,
[string]$versionNumber, [string]$versionNumber,
[string]$variantName [string]$variantName,
[string]$ueVersion
) )
$root = Get-Package-Dir -config:$config -versionNumber:$versionNumber -variantName:$variantName $root = Get-Package-Dir -config:$config -versionNumber:$versionNumber -variantName:$variantName
@ -56,12 +57,14 @@ function Get-Package-Client-Dir {
if (-not $variant) { if (-not $variant) {
throw "Unknown variant $variantName" throw "Unknown variant $variantName"
} }
$isUE5 = $ueVersion.StartsWith("5.")
# Note, currently only supporting "Game" platform type, not separate client / server # Note, currently only supporting "Game" platform type, not separate client / server
$subfolder = switch ($variant.Platform) { $subfolder = switch ($variant.Platform) {
"Win32" { "WindowsNoEditor" } "Win32" { if ($isUE5) { "Windows" } else { "WindowsNoEditor" } }
"Win64" { "WindowsNoEditor" } "Win64" { if ($isUE5) { "Windows" } else { "WindowsNoEditor" } }
"Linux" { "LinuxNoEditor" } "Linux" { if ($isUE5) { "Linux" } else { "LinuxNoEditor" } }
"Mac" { "MacNoEditor" } "Mac" { if ($isUE5) { "Mac" } else { "MacNoEditor" } }
Default { throw "Unsupported platform $($variant.Platform)" } Default { throw "Unsupported platform $($variant.Platform)" }
} }

View File

@ -70,6 +70,9 @@ try {
# Import config # Import config
$config = Read-Package-Config -srcfolder:$src $config = Read-Package-Config -srcfolder:$src
$projfile = Get-Uproject-Filename -srcfolder:$src -config:$config
$proj = Read-Uproject $projfile
$ueVersion = Get-UE-Version $proj
if ($latest) { if ($latest) {
$version = Get-Project-Version $src $version = Get-Project-Version $src
@ -90,7 +93,7 @@ try {
foreach ($variantConfig in $variantConfigs) { foreach ($variantConfig in $variantConfigs) {
# Get source dir # Get source dir
$sourcedir = Get-Package-Client-Dir -config:$config -versionNumber:$version -variantName:$variantConfig.Name $sourcedir = Get-Package-Client-Dir -config:$config -versionNumber:$version -variantName:$variantConfig.Name -ueVersion:$ueVersion
if (-not (Test-Path $sourcedir -PathType Container)) { if (-not (Test-Path $sourcedir -PathType Container)) {
Write-Error "Release folder $sourcedir does not exist, skipping" Write-Error "Release folder $sourcedir does not exist, skipping"