Skip to content

[release/7.0] Workaround MacCatalyst .app output path change in cmake 3.25 #79097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlossanlop merged 1 commit into from
Jan 4, 2023
Merged

[release/7.0] Workaround MacCatalyst .app output path change in cmake 3.25 #79097

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Workaround MacCatalyst .app output path change in cmake 3.25 
Since AzDO macOS builders where updated to cmake 3.25 we're seeing failures because the .app doesn't end up in the expected output path anymore.
Apply a workaround to move it back to the old location.

Fixes #78778
  • Loading branch information
@akoeplinger
akoeplinger authored and github-actions committed Dec 1, 2022
commit ac4efb4fdf33570dfc4d75b84dd1ee04cfc4fb71
11 changes: 9 additions & 2 deletions src/tasks/AppleAppBuilder/Xcode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,8 +524,15 @@ public string BuildAppBundle(

Utils.RunProcess(Logger, "xcodebuild", args.ToString(), workingDir: Path.GetDirectoryName(xcodePrjPath));

string appPath = Path.Combine(Path.GetDirectoryName(xcodePrjPath)!, config + "-" + sdk,
Path.GetFileNameWithoutExtension(xcodePrjPath) + ".app");
string appDirectory = Path.Combine(Path.GetDirectoryName(xcodePrjPath)!, config + "-" + sdk);
if (!Directory.Exists(appDirectory))
{
// cmake 3.25.0 seems to have changed the output directory for MacCatalyst, move it back to the old format
string appDirectoryWithoutSdk = Path.Combine(Path.GetDirectoryName(xcodePrjPath)!, config);
Directory.Move(appDirectoryWithoutSdk, appDirectory);
}

string appPath = Path.Combine(appDirectory, Path.GetFileNameWithoutExtension(xcodePrjPath) + ".app");

if (destination != null)
{
Expand Down