diff --git a/source/dub/commandline.d b/source/dub/commandline.d index 32a110e..587095e 100644 --- a/source/dub/commandline.d +++ b/source/dub/commandline.d @@ -2712,7 +2712,7 @@ foreach (ref subp; recipe.subPackages) if (subp.path.length) { auto sub_path = base_path ~ NativePath(subp.path); - auto pack = prj.packageManager.getOrLoadPackage(sub_path); + auto pack = dub.packageManager.getOrLoadPackage(sub_path); fixPathDependencies(pack.recipe, sub_path); pack.storeInfo(sub_path); } else fixPathDependencies(subp.recipe, base_path); diff --git a/source/dub/generators/build.d b/source/dub/generators/build.d index 7cfc7cf..ed0f5f1 100644 --- a/source/dub/generators/build.d +++ b/source/dub/generators/build.d @@ -61,14 +61,12 @@ class BuildGenerator : ProjectGenerator { private { - PackageManager m_packageMan; NativePath[] m_temporaryFiles; } this(Project project) { super(project); - m_packageMan = project.packageManager; } override void generateTargets(GeneratorSettings settings, in TargetInfo[string] targets) diff --git a/source/dub/generators/visuald.d b/source/dub/generators/visuald.d index 1524a18..6a42633 100644 --- a/source/dub/generators/visuald.d +++ b/source/dub/generators/visuald.d @@ -33,14 +33,12 @@ class VisualDGenerator : ProjectGenerator { private { - PackageManager m_pkgMgr; string[string] m_projectUuids; } this(Project project) { super(project); - m_pkgMgr = project.packageManager; } override void generateTargets(GeneratorSettings settings, in TargetInfo[string] targets) diff --git a/source/dub/project.d b/source/dub/project.d index d2496bf..5826101 100644 --- a/source/dub/project.d +++ b/source/dub/project.d @@ -135,6 +135,7 @@ @property inout(SelectedVersions) selections() inout { return m_selections; } /// Package manager instance used by the project. + deprecated("Use `Dub.packageManager` instead") @property inout(PackageManager) packageManager() inout { return m_packageManager; } /** Determines if all dependencies necessary to build have been collected.