Skip to content

Commit

Permalink
fix #2587
Browse files Browse the repository at this point in the history
  • Loading branch information
WebFreak001 committed Feb 12, 2023
1 parent ee09d81 commit 5925682
Show file tree
Hide file tree
Showing 15 changed files with 117 additions and 1 deletion.
2 changes: 1 addition & 1 deletion source/dub/dub.d
Original file line number Diff line number Diff line change
Expand Up @@ -1631,7 +1631,7 @@ private class DependencyVersionResolver : DependencyResolver!(Dependency, Depend
protected override Dependency[] getSpecificConfigs(string pack, TreeNodes nodes)
{
if (!nodes.configs.path.empty || !nodes.configs.repository.empty) {
if (getPackage(pack, nodes.configs)) return [nodes.configs];
if (getPackage(nodes.pack, nodes.configs)) return [nodes.configs];
else return null;
}
else return null;
Expand Down
9 changes: 9 additions & 0 deletions test/issue2587-subpackage-dependency-resolution.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env bash

set -e

. $(dirname "${BASH_SOURCE[0]}")/common.sh
cd "${CURR_DIR}/issue2587-subpackage-dependency-resolution/a"

rm -f dub.selections.json
$DUB upgrade -v
Empty file.
Empty file.
Empty file.
16 changes: 16 additions & 0 deletions test/issue2587-subpackage-dependency-resolution/a/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.dub
docs.json
__dummy.html
docs/
/a
a.so
a.dylib
a.dll
a.a
a.lib
a-test-*
*.exe
*.pdb
*.o
*.obj
*.lst
11 changes: 11 additions & 0 deletions test/issue2587-subpackage-dependency-resolution/a/dub.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"authors": [
"webfreak"
],
"description": "A minimal D application.",
"license": "proprietary",
"name": "a",
"dependencies": {
"b": {"path":"../b"}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import std.stdio;

void main()
{
writeln("Edit source/app.d to start your project.");
}
16 changes: 16 additions & 0 deletions test/issue2587-subpackage-dependency-resolution/b/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.dub
docs.json
__dummy.html
docs/
/b
b.so
b.dylib
b.dll
b.a
b.lib
b-test-*
*.exe
*.pdb
*.o
*.obj
*.lst
20 changes: 20 additions & 0 deletions test/issue2587-subpackage-dependency-resolution/b/dub.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"authors": [
"webfreak"
],
"description": "A minimal D application.",
"license": "proprietary",
"name": "b",
"dependencies": {
"b:sub":"*"
},
"subPackages": ["sub"],
"subPackagescomment": [
{
"name": "sub",
"dependencies": {
"c": {"path":"../c"}
}
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import std.stdio;

void main()
{
writeln("Edit source/app.d to start your project.");
}
2 changes: 2 additions & 0 deletions test/issue2587-subpackage-dependency-resolution/b/sub/dub.sdl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name "sub"
dependency "c" path="../../c"
16 changes: 16 additions & 0 deletions test/issue2587-subpackage-dependency-resolution/c/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.dub
docs.json
__dummy.html
docs/
/c
c.so
c.dylib
c.dll
c.a
c.lib
c-test-*
*.exe
*.pdb
*.o
*.obj
*.lst
8 changes: 8 additions & 0 deletions test/issue2587-subpackage-dependency-resolution/c/dub.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"authors": [
"webfreak"
],
"description": "A minimal D application.",
"license": "proprietary",
"name": "c"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import std.stdio;

void main()
{
writeln("Edit source/app.d to start your project.");
}

0 comments on commit 5925682

Please sign in to comment.