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

dub, fix issue with the sourceFiles property

This commit is contained in:
Basile Burg 2016-02-20 06:49:03 +01:00
parent 6a4a72ef90
commit 935012a280
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ce_dubproject.pas
View File

@ -569,6 +569,17 @@ begin
lst.Add(patchPlateformPath(arr.Strings[i])); lst.Add(patchPlateformPath(arr.Strings[i]));
end; end;
end; end;
procedure tryAddRelOrAbsFile(const fname: string);
begin
if not isDlangCompilable(fname.extractFileExt) then
exit;
if fname.fileExists and FilenameIsAbsolute(fname) then
begin
fSrcs.Add(patchPlateformPath(ExtractRelativepath(fBasePath, fname)))
end
else if patchPlateformPath(expandFilenameEx(fBasePath, fname)).fileExists then
fSrcs.Add(fname);
end;
procedure tryAddFromFolder(const pth: string); procedure tryAddFromFolder(const pth: string);
var var
abs: string; abs: string;
@ -616,7 +627,7 @@ begin
begin begin
arr := TJSONArray(item); arr := TJSONArray(item);
for i := 0 to arr.Count-1 do for i := 0 to arr.Count-1 do
fSrcs.Add(patchPlateformPath(ExtractRelativepath(fBasePath, arr.Strings[i]))); tryAddRelOrAbsFile(arr.Strings[i]);
end; end;
conf := getCurrentCustomConfig; conf := getCurrentCustomConfig;
if conf.isNotNil then if conf.isNotNil then
@ -644,7 +655,7 @@ begin
begin begin
arr := TJSONArray(item); arr := TJSONArray(item);
for i := 0 to arr.Count-1 do for i := 0 to arr.Count-1 do
fSrcs.Add(patchPlateformPath(ExtractRelativepath(fBasePath, arr.Strings[i]))); tryAddRelOrAbsFile(arr.Strings[i]);
end; end;
end; end;
deleteDups(fSrcs); deleteDups(fSrcs);