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

fix #179 - Disable internal handling of DUB excludedSourcesFiles

This commit is contained in:
Basile Burg 2017-08-08 06:21:34 +02:00
parent 493b1fbdc5
commit 5e9c0f206b
No known key found for this signature in database
GPG Key ID: 1868039F415CB8CF
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ce_dubproject.pas
View File

@ -712,8 +712,6 @@ var
confs: TJSONArray; confs: TJSONArray;
begin begin
result := nil; result := nil;
if fConfigIx = 0 then
exit;
if fJSON.findArray('configurations', confs) and (fConfigIx < confs.Count) then if fJSON.findArray('configurations', confs) and (fConfigIx < confs.Count) then
result := confs.Objects[fConfigIx]; result := confs.Objects[fConfigIx];
end; end;
@ -786,7 +784,7 @@ var
item: TJSONData; item: TJSONData;
conf: TJSONObject; conf: TJSONObject;
arr: TJSONArray; arr: TJSONArray;
i, j: integer; i{, j}: integer;
procedure getExclusion(from: TJSONObject); procedure getExclusion(from: TJSONObject);
var var
i: integer; i: integer;
@ -821,7 +819,7 @@ begin
end; end;
var var
pth: string; pth: string;
glb: TRegExpr; //glb: TRegExpr;
begin begin
fSrcs.Clear; fSrcs.Clear;
if not assigned(fJSON) then if not assigned(fJSON) then
@ -863,8 +861,9 @@ begin
if conf.findArray('sourceFiles', arr) then for i := 0 to arr.Count-1 do if conf.findArray('sourceFiles', arr) then for i := 0 to arr.Count-1 do
tryAddRelOrAbsFile(arr.Strings[i]); tryAddRelOrAbsFile(arr.Strings[i]);
end; end;
// exclusions // exclusions : not managed anymore because of other IDE features that rely
lst.Clear; // on the full list (scan TODOs, <CPFS>, search in project, etc)
{lst.Clear;
getExclusion(fJSON); getExclusion(fJSON);
conf := getCurrentCustomConfig; conf := getCurrentCustomConfig;
if conf.isNotNil then if conf.isNotNil then
@ -888,7 +887,7 @@ begin
finally finally
glb.Free; glb.Free;
end; end;
end; end;}
finally finally
lst.Free; lst.Free;
end; end;