paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-07 10:40:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Switch path delimiters only for filenames better for TCompilationToolOptions.Command. Issue #34476, patch from Pascal Riekenberg.

Browse Source 
git-svn-id: trunk@59396 -
This commit is contained in:
juha 2018-10-30 21:07:34 +00:00
parent 137181c237
commit ae5a1b5992
1 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
ide/compileroptions.pp
View File

@ -4275,25 +4275,48 @@ end;
procedure TCompilationToolOptions.LoadFromXMLConfig(XMLConfig: TXMLConfig;
const Path: string; DoSwitchPathDelims: boolean);
var
ParamList: TStringList;
Cmd, Param: String;
i: Integer;
Params: TStrings;
param, cmd: String;
p, p2, i, j: Integer;
begin
//debugln(['TCompilationToolOptions.LoadFromXMLConfig ',Command,' Path=',Path,' DoSwitchPathDelims=',DoSwitchPathDelims]);
Cmd:=XMLConfig.GetValue(Path+'Command/Value','');
ParamList:=TStringList.Create;
try
SplitCmdLineParams(Cmd, ParamList);
for i:=0 to ParamList.Count-1 do
begin // Try to switch path delimiters only for filenames.
Param:=ParamList[i]; // Example: "cmd /C \\server\path\executable.exe"
if (Length(Param)<>2) or (Param[1]<>'/') then
ParamList[i]:=SwitchPathDelims(Param,DoSwitchPathDelims);
Command:=XMLConfig.GetValue(Path+'Command/Value','');
if DoSwitchPathDelims then begin
if (Command<>'')
and (PathDelim='\') then begin
// specialhandling on windows to not switch path delimiters in options
Params:=TStringList.Create;
try
SplitCmdLineParams(Command,Params);
cmd:=SwitchPathDelims(Params[0],True);
for i:=1 to Params.Count-1 do begin
param:=Params[i];
p:=-1;
p2:=-1;
for j:=1 to length(param) do
if p>1 then
break
else if param[j]='/' then
p:=j
else if param[j]=':' then
p2:=j;
if p=1 then
// param is option (the only / is at pos 1)
if p2<>-1 then
// potential filename after colon in option
cmd+=' '+copy(param,1,p2)+SwitchPathDelims(Copy(param,p2+1,length(param)-p2),True)
else
cmd+=' '+param
else
cmd+=' '+SwitchPathDelims(param,True);
end;
Command:=cmd;
finally
Params.Free;
end;
end else begin
Command:=SwitchPathDelims(Command,DoSwitchPathDelims);
end;
ParamList.Delimiter:=' ';
Command:=ParamList.DelimitedText;
finally
ParamList.Free;
end;
LoadStringList(XMLConfig,Parsers,Path+'Parsers/');
if Parsers.Count=0 then begin