paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-15 14:02:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

ide: Run without Debugging: use process instead of tool. Issue #29832

Browse Source 
git-svn-id: trunk@51935 -
This commit is contained in:
ondrej 2016-03-14 09:59:58 +00:00
parent 2ae6dc4a61
commit c53ffab2f5
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ide/main.pp
View File

@ -154,7 +154,7 @@ uses
CleanDirDlg, CodeContextForm, AboutFrm, CompatibilityRestrictions,
RestrictionBrowser, ProjectWizardDlg, IDECmdLine, IDEGuiCmdLine, CodeExplOpts,
EditorMacroListViewer, SourceFileManager, EditorToolbarStatic,
IDEInstances,
IDEInstances, process,
// main ide
MainBar, MainIntf, MainBase;
@ -6895,7 +6895,7 @@ end;
function TMainIDE.DoRunProjectWithoutDebug: TModalResult;
var
Tool: TIDEExternalToolOptions;
Process: TProcessUTF8;
ExeCmdLine, ExeWorkingDirectory: string;
ExeFileEnd, ExeFileStart: Integer;
begin
@ -6906,7 +6906,7 @@ begin
if Result <> mrOK then
Exit;
Tool := TIDEExternalToolOptions.Create;
Process := TProcessUTF8.Create(nil);
try
ExeCmdLine := MainBuildBoss.GetRunCommandLine;
if ExeCmdLine='' then
@ -6928,13 +6928,13 @@ begin
ExeFileEnd := Length(ExeCmdLine)+1;
end;
Tool.Executable := Copy(ExeCmdLine, ExeFileStart, ExeFileEnd-ExeFileStart);
Tool.CmdLineParams := Copy(ExeCmdLine, ExeFileEnd+ExeFileStart, High(Integer));
if not FileIsExecutable(Tool.Executable) then
Process.Executable := Copy(ExeCmdLine, ExeFileStart, ExeFileEnd-ExeFileStart);
Process.Parameters.Text := Copy(ExeCmdLine, ExeFileEnd+ExeFileStart, High(Integer));
if not FileIsExecutable(Process.Executable) then
begin
IDEMessageDialog(lisLaunchingApplicationInvalid,
Format(lisTheLaunchingApplicationDoesNotExistsOrIsNotExecuta,
[Tool.Executable, LineEnding, LineEnding+LineEnding]),
[Process.Executable, LineEnding, LineEnding+LineEnding]),
mtError, [mbOK]);
Exit(mrNone);
end;
@ -6944,21 +6944,21 @@ begin
ExeWorkingDirectory := '';
if ExeWorkingDirectory = '' then
ExeWorkingDirectory := ExtractFilePath(Tool.Executable);
Tool.WorkingDirectory := ExeWorkingDirectory;
ExeWorkingDirectory := ExtractFilePath(Process.Executable);
Process.CurrentDirectory := ExeWorkingDirectory;
if not DirectoryExists(Tool.WorkingDirectory) then
if not DirectoryExists(Process.CurrentDirectory) then
begin
IDEMessageDialog(lisUnableToRun,
Format(lisTheWorkingDirectoryDoesNotExistPleaseCheckTheWorki,
[Tool.WorkingDirectory, LineEnding]),
[Process.CurrentDirectory, LineEnding]),
mtError,[mbCancel]);
Exit(mrNone);
end;
RunExternalTool(Tool);
Process.Execute;
finally
Tool.Free;
Process.Free;
end;
end;