From 671ed3c2fec816d243e30cd8856ecdec423e7e15 Mon Sep 17 00:00:00 2001 From: Alexandre Wilhelm Date: Thu, 12 Nov 2015 11:59:00 -0800 Subject: [PATCH] Fixed: memory leak in XcodeCapp due to NSAppleScript. We now use osascript --- Tools/XcodeCapp/XcodeCapp/XcodeProjectCloser.m | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Tools/XcodeCapp/XcodeCapp/XcodeProjectCloser.m b/Tools/XcodeCapp/XcodeCapp/XcodeProjectCloser.m index d6d8f165d..4f87baf41 100644 --- a/Tools/XcodeCapp/XcodeCapp/XcodeProjectCloser.m +++ b/Tools/XcodeCapp/XcodeCapp/XcodeProjectCloser.m @@ -28,12 +28,18 @@ static const char *kCloseXcodeProjectScript = @implementation XcodeProjectCloser + (void)closeXcodeProjectForProject:(NSString *)projectPath -{ - NSString *format = @(kCloseXcodeProjectScript); - NSString *source = [NSString stringWithFormat:format, projectPath]; - NSAppleScript *script = [[NSAppleScript alloc] initWithSource:source]; - - [script executeAndReturnError:nil]; +{ + NSString *format = @(kCloseXcodeProjectScript); + NSString *source = [NSString stringWithFormat:format, projectPath]; + NSString *arguments = [NSString stringWithFormat:@"-e %@", source]; + NSTask *task = [[NSTask alloc] init]; + + [task setLaunchPath:@"/usr/bin/osascript"]; + [task setArguments:[NSArray arrayWithObjects:arguments, nil]]; + [task launch]; + [task waitUntilExit]; + + DDLogVerbose(@"Osascript launched for the project %@", projectPath); } @end