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

fixup HEAD^1, importPaths must be used for DCD 

module names can mismatch with sourcePaths
This commit is contained in:
Basile Burg 2022-07-15 05:15:00 +02:00
parent e73d226dba
commit accb025ac7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/u_dubproject.pas
View File

@ -1374,8 +1374,6 @@ begin
begin begin
lst.Clear; lst.Clear;
listFiles(lst, pth, true); listFiles(lst, pth, true);
if lst.Count > 0 then
fImportPaths.Add(pth);
for abs in lst do for abs in lst do
if isDlangCompilable(abs.extractFileExt) then if isDlangCompilable(abs.extractFileExt) then
fSrcs.Add(patchPlateformPath(ExtractRelativepath(fBasePath, abs))); fSrcs.Add(patchPlateformPath(ExtractRelativepath(fBasePath, abs)));
@ -1396,6 +1394,15 @@ begin
else else
tryAddFromFolder(expandFilenameEx(fBasePath, p)); tryAddFromFolder(expandFilenameEx(fBasePath, p));
end; end;
if o.findArray('importPaths', a) then
for i := 0 to a.Count-1 do
begin
p := TrimRightSet(a.Strings[i], ['/','\']);
if p.dirExists and FilenameIsAbsolute(p) then
fImportPaths.Add(p)
else
fImportPaths.Add(expandFilenameEx(fBasePath, p));
end;
end; end;
procedure trySubpPackages(a: TJSONArray); procedure trySubpPackages(a: TJSONArray);
var var