forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TProcess.Parameters.Add -> TProcess.Parameters.AddStrings

This commit is contained in:
Basile Burg 2020-07-09 07:34:31 +02:00
parent 1001642f88
commit 446cccbe2a
7 changed files with 21 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/u_common.pas
View File

@ -1250,8 +1250,7 @@ begin
Result := 0; Result := 0;
proc := tprocess.Create(nil); proc := tprocess.Create(nil);
proc.Executable := 'ps'; proc.Executable := 'ps';
proc.Parameters.Add('-C'); proc.Parameters.AddStrings(['-C', Exename]);
proc.Parameters.Add(ExeName);
proc.Options := [poUsePipes, poWaitonexit]; proc.Options := [poUsePipes, poWaitonexit];
try try
proc.Execute; proc.Execute;

32
src/u_dcd.pas
View File

@ -132,10 +132,7 @@ begin
fServer.ShowWindow := swoHIDE; fServer.ShowWindow := swoHIDE;
{$ENDIF} {$ENDIF}
if fCurrentSessionPortNum <> 0 then if fCurrentSessionPortNum <> 0 then
begin fServer.Parameters.AddStrings(['--tcp', fPortAsProcParam]);
fServer.Parameters.Add('--tcp');
fServer.Parameters.Add(fPortAsProcParam);
end;
end; end;
fTempLines := TStringList.Create; fTempLines := TStringList.Create;
fImportCache := TStringHashSet.Create; fImportCache := TStringHashSet.Create;
@ -349,9 +346,7 @@ begin
try try
prc.Options:= [poUsePipes, poNoConsole]; prc.Options:= [poUsePipes, poNoConsole];
prc.Executable := 'netstat'; prc.Executable := 'netstat';
prc.Parameters.Add('-o'); prc.Parameters.AddStrings(['-o', '-a', '-n']);
prc.Parameters.Add('-a');
prc.Parameters.Add('-n');
prc.Execute; prc.Execute;
lst := TStringList.Create; lst := TStringList.Create;
try try
@ -377,10 +372,7 @@ end;
procedure TDcdWrapper.tryAddTcpParams; procedure TDcdWrapper.tryAddTcpParams;
begin begin
if fCurrentSessionPortNum <> 0 then if fCurrentSessionPortNum <> 0 then
begin fClient.Parameters.AddStrings(['--tcp', fPortAsProcParam]);
fClient.Parameters.Add('--tcp');
fClient.Parameters.Add(fPortAsProcParam);
end;
end; end;
procedure TDcdWrapper.killServer; procedure TDcdWrapper.killServer;
@ -499,8 +491,7 @@ begin
terminateClient; terminateClient;
fClient.Parameters.Clear; fClient.Parameters.Clear;
tryAddTcpParams; tryAddTcpParams;
fClient.Parameters.Add('-c'); fClient.Parameters.AddStrings(['-c', intToStr(fDoc.SelStart - 1)]);
fClient.Parameters.Add(intToStr(fDoc.SelStart - 1));
fClient.Execute; fClient.Execute;
writeSourceToInput; writeSourceToInput;
@ -551,8 +542,7 @@ begin
terminateClient; terminateClient;
fClient.Parameters.Clear; fClient.Parameters.Clear;
tryAddTcpParams; tryAddTcpParams;
fClient.Parameters.Add('-c'); fClient.Parameters.AddStrings(['-c', intToStr(fDoc.SelStart - 1)]);
fClient.Parameters.Add(intToStr(fDoc.SelStart - 1));
fClient.Execute; fClient.Execute;
writeSourceToInput; writeSourceToInput;
@ -617,9 +607,7 @@ begin
terminateClient; terminateClient;
fClient.Parameters.Clear; fClient.Parameters.Clear;
tryAddTcpParams; tryAddTcpParams;
fClient.Parameters.Add('-d'); fClient.Parameters.AddStrings(['-d', '-c', intToStr(i - 1)]);
fClient.Parameters.Add('-c');
fClient.Parameters.Add(intToStr(i - 1));
fClient.Execute; fClient.Execute;
writeSourceToInput; writeSourceToInput;
@ -663,9 +651,7 @@ begin
terminateClient; terminateClient;
fClient.Parameters.Clear; fClient.Parameters.Clear;
tryAddTcpParams; tryAddTcpParams;
fClient.Parameters.Add('-l'); fClient.Parameters.AddStrings(['-l', '-c', intToStr(fDoc.SelStart)]);
fClient.Parameters.Add('-c');
fClient.Parameters.Add(intToStr(fDoc.SelStart));
fClient.Execute; fClient.Execute;
writeSourceToInput; writeSourceToInput;
@ -700,9 +686,7 @@ begin
terminateClient; terminateClient;
fClient.Parameters.Clear; fClient.Parameters.Clear;
tryAddTcpParams; tryAddTcpParams;
fClient.Parameters.Add('-u'); fClient.Parameters.AddStrings(['-u', '-c', intToStr(fDoc.SelStart - 1)]);
fClient.Parameters.Add('-c');
fClient.Parameters.Add(intToStr(fDoc.SelStart - 1));
fClient.Execute; fClient.Execute;
writeSourceToInput; writeSourceToInput;

18
src/u_dubproject.pas
View File

@ -1589,8 +1589,7 @@ procedure TDubProject.updateImportPathsFromJson;
Executable := exeFullName('dub' + exeExt); Executable := exeFullName('dub' + exeExt);
Options := Options + [poUsePipes]; Options := Options + [poUsePipes];
ShowWindow:= swoHIDE; ShowWindow:= swoHIDE;
Parameters.Add('fetch'); Parameters.AddStrings(['fetch', n]);
Parameters.Add(n);
Execute; Execute;
while Running do ; while Running do ;
if ExitStatus.equals(0) then if ExitStatus.equals(0) then
@ -1647,9 +1646,7 @@ procedure TDubProject.updateImportPathsFromJson;
Executable := exeFullName('dub' + exeExt); Executable := exeFullName('dub' + exeExt);
Options := Options + [poUsePipes]; Options := Options + [poUsePipes];
ShowWindow:= swoHIDE; ShowWindow:= swoHIDE;
Parameters.Add('fetch'); Parameters.AddStrings(['fetch', n, '--version=' + p]);
Parameters.Add(n);
Parameters.Add('--version=' + p);
Execute; Execute;
while Running do ; while Running do ;
if ExitStatus.equals(0) then if ExitStatus.equals(0) then
@ -1827,16 +1824,7 @@ begin
dub.Executable := 'dub' + exeExt; dub.Executable := 'dub' + exeExt;
dub.Options := [poUsePipes{$IFDEF WINDOWS}, poNewConsole{$ENDIF}]; dub.Options := [poUsePipes{$IFDEF WINDOWS}, poNewConsole{$ENDIF}];
dub.ShowWindow := swoHIDE; dub.ShowWindow := swoHIDE;
dub.CurrentDirectory:= filename.extractFilePath; dub.Parameters.AddStrings(['convert', '-s', '-f', 'json', '--root='+ filename.extractFilePath]);
// need to move because it looks like DUB doesn't use
// the cd specified for the process we launch here.
chdir(dub.CurrentDirectory);
dub.Parameters.Add('convert');
dub.Parameters.Add('-s');
dub.Parameters.Add('-f');
dub.Parameters.Add('json');
dub.Execute; dub.Execute;
processOutputToStrings(dub, str); processOutputToStrings(dub, str);
while dub.Running do; while dub.Running do;

3
src/u_gdb.pas
View File

@ -1981,8 +1981,7 @@ begin
fGdb := TDexedProcess.create(nil); fGdb := TDexedProcess.create(nil);
fGdb.Executable:= gdb; fGdb.Executable:= gdb;
fgdb.Options:= [poUsePipes, poStderrToOutPut]; fgdb.Options:= [poUsePipes, poStderrToOutPut];
fgdb.Parameters.Add(fExe); fgdb.Parameters.AddStrings([fExe, '--interpreter=mi']);
fgdb.Parameters.Add('--interpreter=mi');
fGdb.OnReadData:= @gdboutQuiet; fGdb.OnReadData:= @gdboutQuiet;
fGdb.OnTerminate:= @gdboutJsonize; fGdb.OnTerminate:= @gdboutJsonize;
fgdb.execute; fgdb.execute;

7
src/u_libmaneditor.pas
View File

@ -468,8 +468,7 @@ begin
dub.Executable:= 'dub'; dub.Executable:= 'dub';
dub.Options:= [poUsePipes, poStderrToOutPut]; dub.Options:= [poUsePipes, poStderrToOutPut];
dub.ShowWindow:= swoHIDE; dub.ShowWindow:= swoHIDE;
dub.Parameters.Add('fetch'); dub.Parameters.AddStrings(['fetch', nme]);
dub.Parameters.Add(nme);
if ver = 'master' then if ver = 'master' then
dub.Parameters.Add('--version=~master') dub.Parameters.Add('--version=~master')
else else
@ -520,9 +519,7 @@ begin
dub.Executable:= 'dub'; dub.Executable:= 'dub';
dub.ShowWindow:= swoHIDE; dub.ShowWindow:= swoHIDE;
dub.Options:= [poUsePipes, poStderrToOutPut]; dub.Options:= [poUsePipes, poStderrToOutPut];
dub.Parameters.Add('build'); dub.Parameters.AddStrings(['build', '--build=release', '--force']);
dub.Parameters.Add('--build=release');
dub.Parameters.Add('--force');
dub.Parameters.Add('--compiler=' + getCompilerSelector.getCompilerPath(DubCompiler, false)); dub.Parameters.Add('--compiler=' + getCompilerSelector.getCompilerPath(DubCompiler, false));
dub.CurrentDirectory:= pth; dub.CurrentDirectory:= pth;
dub.Execute; dub.Execute;

17
src/u_main.pas
View File

@ -3396,8 +3396,7 @@ begin
prc.Executable:=pth; prc.Executable:=pth;
prc.Options := [poUsePipes, poStderrToOutPut {$IFDEF WINDOWS}, poNewConsole{$ENDIF}]; prc.Options := [poUsePipes, poStderrToOutPut {$IFDEF WINDOWS}, poNewConsole{$ENDIF}];
prc.ShowWindow:= swoHIDE; prc.ShowWindow:= swoHIDE;
prc.Parameters.Add(fDoc.fileName); prc.Parameters.AddStrings([fDoc.fileName, '-S']);
prc.Parameters.Add('-S');
if not fDscanUnittests then if not fDscanUnittests then
prc.Parameters.Add('--skipTests'); prc.Parameters.Add('--skipTests');
prc.Execute; prc.Execute;
@ -3488,8 +3487,7 @@ begin
fMsgs.message('check menu `Options`, `Compilers Paths`', fDoc, amcEdit, amkHint); fMsgs.message('check menu `Options`, `Compilers Paths`', fDoc, amcEdit, amkHint);
exit; exit;
end; end;
fRunProc.Parameters.add('--compiler=' + d); fRunProc.Parameters.AddStrings(['--compiler=' + d, fDoc.fileName]);
fRunProc.Parameters.Add(fDoc.fileName);
fRunProc.execute; fRunProc.execute;
end; end;
@ -4118,10 +4116,7 @@ begin
fMsgs.message(r[i], fProj, amcProj, amkAuto); fMsgs.message(r[i], fProj, amcProj, amkAuto);
while p.Running do ; while p.Running do ;
p.Parameters.Clear; p.Parameters.Clear;
p.Parameters.Add('submodule'); p.Parameters.AddStrings(['submodule', 'update', '--init', '--recursive']);
p.Parameters.Add('update');
p.Parameters.Add('--init');
p.Parameters.Add('--recursive');
p.Execute; p.Execute;
processOutputToStrings(p,r); processOutputToStrings(p,r);
while p.Running do ; while p.Running do ;
@ -4153,8 +4148,7 @@ begin
begin begin
p.Options := [poUsePipes, poNoConsole, poStderrToOutPut]; p.Options := [poUsePipes, poNoConsole, poStderrToOutPut];
p.ShowWindow:= swoHIDE; p.ShowWindow:= swoHIDE;
p.Parameters.Add('checkout'); p.Parameters.AddStrings(['checkout', b]);
p.Parameters.Add(b);
p.CurrentDirectory:= fProj.basePath; p.CurrentDirectory:= fProj.basePath;
p.Execute; p.Execute;
processOutputToStrings(p,r); processOutputToStrings(p,r);
@ -4195,8 +4189,7 @@ begin
begin begin
p.Options := [poUsePipes, poNoConsole]; p.Options := [poUsePipes, poNoConsole];
p.ShowWindow:= swoHIDE; p.ShowWindow:= swoHIDE;
p.Parameters.Add('branch'); p.Parameters.AddStrings(['branch', '--list']);
p.Parameters.Add('--list');
p.CurrentDirectory:= fProj.basePath; p.CurrentDirectory:= fProj.basePath;
p.Execute; p.Execute;
processOutputToStrings(p,r); processOutputToStrings(p,r);

3
src/u_synmemo.pas
View File

@ -1103,8 +1103,7 @@ begin
fDscanner.Options:=[poUsePipes]; fDscanner.Options:=[poUsePipes];
fDscanner.ShowWindow:=swoHIDE; fDscanner.ShowWindow:=swoHIDE;
fDscanner.OnTerminate:=@dscannerTerminate; fDscanner.OnTerminate:=@dscannerTerminate;
fDscanner.Parameters.add('-S'); fDscanner.Parameters.AddStrings(['-S', 'stdin']);
fDscanner.Parameters.add('stdin');
fDscannerResults:= TDscannerResults.create; fDscannerResults:= TDscannerResults.create;
fKnowsDscanner := fDscanner.Executable.fileExists; fKnowsDscanner := fDscanner.Executable.fileExists;