paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-21 23:19:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

MacOS: Improve external tool execution with an .app application. Issue #36314

Browse Source 
git-svn-id: branches/fixes_2_0@62851 -
This commit is contained in:
mattias 2020-04-02 11:21:05 +00:00
parent 4ec00f8765
commit 851dc814ae
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ide/exttools.pas
View File

@ -983,23 +983,33 @@ begin
debugln(['Error: (lazarus) [TExternalTools.RunToolAndDetach] ',ToolOptions.Title,' failed: missing executable: "',s,'"']);
exit;
end;
if DirectoryExistsUTF8(s) then begin
if DirectoryExistsUTF8(s) {$IFDEF DARWIN}and (ExtractFileExt(s)<>'.app'){$ENDIF} then begin
debugln(['Error: (lazarus) [TExternalTools.RunToolAndDetach] ',ToolOptions.Title,' failed: executable is a directory: "',s,'"']);
exit;
end;
if not FileIsExecutable(s) then begin
if {$IFDEF DARWIN}(ExtractFileExt(s)<>'.app') and{$ENDIF} not FileIsExecutable(s) then begin
debugln(['Error: (lazarus) [TExternalTools.RunToolAndDetach] ',ToolOptions.Title,' failed: executable lacks permission to run: "',s,'"']);
exit;
end;
Proc.Executable:=s;
{$IFDEF DARWIN}
if DirectoryExistsUTF8(s) then
begin
Proc.Executable:='/usr/bin/open';
s:=s+LineEnding+ToolOptions.CmdLineParams;
end
else
{$ENDIF}
begin
Proc.Executable:=s;
s:=ToolOptions.CmdLineParams;
end;
// params
s:=ToolOptions.CmdLineParams;
if ToolOptions.ResolveMacros then begin
if not GlobalMacroList.SubstituteStr(s) then begin
debugln(['Error: (lazarus) [TExternalTools.RunToolAndDetach] ',ToolOptions.Title,' failed: macros in cmd line params "',ToolOptions.CmdLineParams,'"']);
exit;
end;
if ToolOptions.ResolveMacros and not GlobalMacroList.SubstituteStr(s) then begin
debugln(['Error: (lazarus) [TExternalTools.RunToolAndDetach] ',ToolOptions.Title,
' failed: macros in cmd line params "',ToolOptions.CmdLineParams,'"']);
exit;
end;
sl:=TStringList.Create;
try