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

fix #213, DUB mainSourceFile property is not interpreted correctly

This commit is contained in:
Basile Burg 2017-12-28 10:26:21 +01:00
parent 7ed7d51e27
commit 2220f9e070
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ce_dubproject.pas
View File

@ -838,7 +838,13 @@ begin
try
// auto folders & files
if fJSON.findAny('mainSourceFile', item) then
fSrcs.Add(patchPlateformPath(ExtractRelativepath(fBasePath, item.AsString)));
begin
pth := item.AsString;
if pth.fileExists then
fSrcs.Add(patchPlateformPath(ExtractRelativepath(fBasePath, pth)))
else if expandFilenameEx(fBasePath, pth).fileExists then
fSrcs.Add(pth);
end;
tryAddFromFolder(fBasePath + 'src');
tryAddFromFolder(fBasePath + 'source');
// custom folders
@ -857,7 +863,13 @@ begin
if conf.isNotNil then
begin
if conf.findAny('mainSourceFile', item) then
fSrcs.Add(patchPlateformPath(ExtractRelativepath(fBasePath, item.AsString)));
begin
pth := item.AsString;
if pth.fileExists then
fSrcs.Add(patchPlateformPath(ExtractRelativepath(fBasePath, pth)))
else if expandFilenameEx(fBasePath, pth).fileExists then
fSrcs.Add(pth);
end;
// custom folders in current config
if conf.findArray('sourcePaths', arr) then for i := 0 to arr.Count-1 do
begin