diff --git a/source/dub/dub.d b/source/dub/dub.d index 3a52028..5ba6df6 100644 --- a/source/dub/dub.d +++ b/source/dub/dub.d @@ -287,7 +287,7 @@ /// Generate project files for a specified IDE. /// Any existing project files will be overridden. void generateProject(string ide, GeneratorSettings settings) { - auto generator = createProjectGenerator(ide, m_project, m_packageManager); + auto generator = createProjectGenerator(ide, m_project); if (m_dryRun) return; // TODO: pass m_dryRun to the generator generator.generate(settings); } @@ -309,7 +309,7 @@ if (!config.length) config = m_project.getDefaultConfiguration(settings.platform, true); } - auto generator = createProjectGenerator("build", m_project, m_packageManager); + auto generator = createProjectGenerator("build", m_project); auto test_config = format("__test__%s__", config); diff --git a/source/dub/generators/build.d b/source/dub/generators/build.d index f0b9f08..e7b057a 100644 --- a/source/dub/generators/build.d +++ b/source/dub/generators/build.d @@ -35,10 +35,10 @@ Path[] m_temporaryFiles; } - this(Project app, PackageManager mgr) + this(Project project) { - super(app); - m_packageMan = mgr; + super(project); + m_packageMan = project.packageManager; } override void generateTargets(GeneratorSettings settings, in TargetInfo[string] targets) diff --git a/source/dub/generators/generator.d b/source/dub/generators/generator.d index ecba595..e1bf8df 100644 --- a/source/dub/generators/generator.d +++ b/source/dub/generators/generator.d @@ -250,9 +250,9 @@ /** Creates a project generator of the given type for the specified project. */ -ProjectGenerator createProjectGenerator(string generator_type, Project app, PackageManager mgr) +ProjectGenerator createProjectGenerator(string generator_type, Project project) { - assert(app !is null && mgr !is null, "Project and package manager needed to create a generator."); + assert(project !is null, "Project instance needed to create a generator."); generator_type = generator_type.toLower(); switch(generator_type) { @@ -260,12 +260,12 @@ throw new Exception("Unknown project generator: "~generator_type); case "build": logDebug("Creating build generator."); - return new BuildGenerator(app, mgr); + return new BuildGenerator(project); case "mono-d": throw new Exception("The Mono-D generator has been removed. Use Mono-D's built in DUB support instead."); case "visuald": logDebug("Creating VisualD generator."); - return new VisualDGenerator(app, mgr); + return new VisualDGenerator(project); } } diff --git a/source/dub/generators/visuald.d b/source/dub/generators/visuald.d index 21fa661..5a6a216 100644 --- a/source/dub/generators/visuald.d +++ b/source/dub/generators/visuald.d @@ -37,10 +37,10 @@ string[string] m_projectUuids; } - this(Project app, PackageManager mgr) + this(Project project) { - super(app); - m_pkgMgr = mgr; + super(project); + m_pkgMgr = project.packageManager; } override void generateTargets(GeneratorSettings settings, in TargetInfo[string] targets)