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

IDE, startlazarus, buildlazarus: Ensure params (long vs short version) from command-line override lazarus.cfg (last given on command line will be taken). Issue #0034069

Browse Source 
git-svn-id: trunk@58696 -
This commit is contained in:
martin 2018-08-12 15:22:54 +00:00
parent aa9cfe7f1a
commit 9c5d04d5dc
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ide/idecmdline.pas
View File

@ -108,6 +108,19 @@ begin
end;
function GetParamsAndCfgFile: TStrings;
procedure CleanDuplicates(ACurParam, AMatch, AClean: String);
var
i: Integer;
begin
if LowerCase(copy(ACurParam, 1, Length(AMatch))) = LowerCase(AMatch) then begin
i := ParamsAndCfgFileContent.Count - 1;
while i >= 0 do begin
if LowerCase(copy(ParamsAndCfgFileContent[i], 1, Length(AClean))) = LowerCase(AClean) then
ParamsAndCfgFileContent.Delete(i);
dec(i);
end;
end;
end;
var
Cfg: TStrings;
i: Integer;
@ -146,8 +159,20 @@ begin
end;
end;
for i := 1 to Paramcount do
ParamsAndCfgFileContent.Add(ParamStrUTF8(i));
for i := 1 to Paramcount do begin
s := ParamStrUTF8(i);
CleanDuplicates(s, PrimaryConfPathOptLong, PrimaryConfPathOptLong);
CleanDuplicates(s, PrimaryConfPathOptLong, PrimaryConfPathOptShort);
CleanDuplicates(s, PrimaryConfPathOptShort, PrimaryConfPathOptLong);
CleanDuplicates(s, PrimaryConfPathOptShort, PrimaryConfPathOptShort);
CleanDuplicates(s, SecondaryConfPathOptLong, SecondaryConfPathOptLong);
CleanDuplicates(s, SecondaryConfPathOptLong, SecondaryConfPathOptShort);
CleanDuplicates(s, SecondaryConfPathOptShort, SecondaryConfPathOptLong);
CleanDuplicates(s, SecondaryConfPathOptShort, SecondaryConfPathOptShort);
CleanDuplicates(s, LanguageOpt, LanguageOpt);
CleanDuplicates(s, LazarusDirOpt, LazarusDirOpt);
ParamsAndCfgFileContent.Add(s);
end;
Result := ParamsAndCfgFileContent;
end;