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

fix, dub projects, the "subpackages" node can be an object

This commit is contained in:
Basile Burg 2021-10-12 18:59:25 +02:00
parent 134c244284
commit 56a9024583
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,3 +1,9 @@
# v3.9.15-dev
## Bugs fixed
- DUB projects, access violation for subpackages entries described using JSON objects.
# v3.9.14 # v3.9.14
- binary files for windows available again (#95) - binary files for windows available again (#95)

14
src/u_dubproject.pas
View File

@ -1408,7 +1408,12 @@ begin
// subpackages // subpackages
if fJSON.findArray('subPackages', arr) then if fJSON.findArray('subPackages', arr) then
for i := 0 to arr.Count-1 do for i := 0 to arr.Count-1 do
tryAddFromFolder(fBasePath + arr.Strings[i]); begin
if arr.JSONType = jtString then
tryAddFromFolder(fBasePath + arr.Strings[i])
else if arr.JSONType = jtObject then
tryAddFromFolder(arr.Objects[i].Strings['name']);
end;
// by config // by config
conf := getCurrentCustomConfig; conf := getCurrentCustomConfig;
if conf.isAssigned then if conf.isAssigned then
@ -1434,7 +1439,12 @@ begin
// subpackages // subpackages
if conf.findArray('subPackages', arr) then if conf.findArray('subPackages', arr) then
for i := 0 to arr.Count-1 do for i := 0 to arr.Count-1 do
tryAddFromFolder(fBasePath + arr.Strings[i]); begin
if arr.JSONType = jtString then
tryAddFromFolder(fBasePath + arr.Strings[i])
else if arr.JSONType = jtObject then
tryAddFromFolder(arr.Objects[i].Strings['name']);
end;
// custom files in current config // custom files in current config
if conf.findArray('sourceFiles', arr) then if conf.findArray('sourceFiles', arr) then
for i := 0 to arr.Count-1 do for i := 0 to arr.Count-1 do