diff --git a/inc/filetools.ps1 b/inc/filetools.ps1 index 9ce5d06..811b59d 100644 --- a/inc/filetools.ps1 +++ b/inc/filetools.ps1 @@ -47,7 +47,8 @@ function Get-Package-Client-Dir { param ( [PackageConfig]$config, [string]$versionNumber, - [string]$variantName + [string]$variantName, + [string]$ueVersion ) $root = Get-Package-Dir -config:$config -versionNumber:$versionNumber -variantName:$variantName @@ -56,12 +57,14 @@ function Get-Package-Client-Dir { if (-not $variant) { throw "Unknown variant $variantName" } + + $isUE5 = $ueVersion.StartsWith("5.") # Note, currently only supporting "Game" platform type, not separate client / server $subfolder = switch ($variant.Platform) { - "Win32" { "WindowsNoEditor" } - "Win64" { "WindowsNoEditor" } - "Linux" { "LinuxNoEditor" } - "Mac" { "MacNoEditor" } + "Win32" { if ($isUE5) { "Windows" } else { "WindowsNoEditor" } } + "Win64" { if ($isUE5) { "Windows" } else { "WindowsNoEditor" } } + "Linux" { if ($isUE5) { "Linux" } else { "LinuxNoEditor" } } + "Mac" { if ($isUE5) { "Mac" } else { "MacNoEditor" } } Default { throw "Unsupported platform $($variant.Platform)" } } diff --git a/ue-release.ps1 b/ue-release.ps1 index 82ae7ac..8a0f0ea 100644 --- a/ue-release.ps1 +++ b/ue-release.ps1 @@ -70,6 +70,9 @@ try { # Import config $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) { $version = Get-Project-Version $src @@ -90,7 +93,7 @@ try { foreach ($variantConfig in $variantConfigs) { # 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)) { Write-Error "Release folder $sourcedir does not exist, skipping"