diff --git a/source/dub/dependency.d b/source/dub/dependency.d index 7b88b57..c5e8b3c 100644 --- a/source/dub/dependency.d +++ b/source/dub/dependency.d @@ -537,7 +537,7 @@ return this.m_version < other.m_version ? -1 : 1; } - return compareVersions(isMaster ? MAX_VERS : m_version, other.isMaster ? MAX_VERS : other.m_version); + return compareVersions(m_version, other.m_version); } int opCmp(in Version other) const { return opCmp(other); } diff --git a/source/dub/generators/generator.d b/source/dub/generators/generator.d index b98261f..541efd6 100644 --- a/source/dub/generators/generator.d +++ b/source/dub/generators/generator.d @@ -478,6 +478,8 @@ env["DUB_BUILD_MODE"] = to!string(settings.buildMode); env["DUB_PACKAGE"] = pack.name; env["DUB_PACKAGE_DIR"] = pack.path.toNativeString(); + env["DUB_ROOT_PACKAGE"] = proj.rootPackage.name; + env["DUB_ROOT_PACKAGE_DIR"] = proj.rootPackage.path.toNativeString(); env["DUB_COMBINED"] = settings.combined? "TRUE" : ""; env["DUB_RUN"] = settings.run? "TRUE" : "";