diff --git a/source/dub/commandline.d b/source/dub/commandline.d index 81eefb0..0d2ef0c 100644 --- a/source/dub/commandline.d +++ b/source/dub/commandline.d @@ -406,7 +406,6 @@ "Generates project files using one of the supported generators:", "", "visuald - VisualD project files", - "visuald-combined - VisualD single project file", "build - Builds the package directly", "", "An optional package name can be given to generate a different package than the root/CWD package." @@ -478,6 +477,11 @@ gensettings.rdmd = m_rdmd; logDiagnostic("Generating using %s", m_generator); + if (m_generator == "visuald-combined") { + gensettings.combined = true; + m_generator = "visuald"; + logWarn(`The generator "visuald-combined" is deprecated, please use the --combined switch instead.`); + } dub.generateProject(m_generator, gensettings); if (m_build_type == "ddox") dub.runDdox(gensettings.run); return 0; diff --git a/source/dub/generators/generator.d b/source/dub/generators/generator.d index ad5e147..962d9e9 100644 --- a/source/dub/generators/generator.d +++ b/source/dub/generators/generator.d @@ -181,10 +181,7 @@ 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, false); - case "visuald-combined": - logDebug("Creating VisualD generator (combined project)."); - return new VisualDGenerator(app, mgr, true); + return new VisualDGenerator(app, mgr); } } diff --git a/source/dub/generators/visuald.d b/source/dub/generators/visuald.d index 4285251..ff7c4d2 100644 --- a/source/dub/generators/visuald.d +++ b/source/dub/generators/visuald.d @@ -34,20 +34,16 @@ private { PackageManager m_pkgMgr; string[string] m_projectUuids; - bool m_combinedProject; } - this(Project app, PackageManager mgr, bool combined_project) + this(Project app, PackageManager mgr) { super(app); - m_combinedProject = combined_project; m_pkgMgr = mgr; } override void generateTargets(GeneratorSettings settings, in TargetInfo[string] targets) { - if (settings.combined) m_combinedProject = true; - auto bs = targets[m_project.name].buildSettings; prepareGeneration(bs); logDebug("About to generate projects for %s, with %s direct dependencies.", m_project.mainPackage().name, m_project.mainPackage().dependencies().length);