diff --git a/source/dub/commandline.d b/source/dub/commandline.d index a19a8f4..5ea3af3 100644 --- a/source/dub/commandline.d +++ b/source/dub/commandline.d @@ -563,8 +563,8 @@ "Builds the specified configuration. Configurations can be defined in dub.json" ]); args.getopt("override-config", &m_overrideConfigs, [ - "Uses the specified configuration for a certain dependency (format: --override-config /).", - "Can be specified multiple fimes." + "Uses the specified configuration for a certain dependency. Can be specified multiple times.", + "Format: --override-config=/" ]); args.getopt("compiler", &m_compilerName, [ "Specifies the compiler binary to use (can be a path).", diff --git a/source/dub/project.d b/source/dub/project.d index c366470..7ce41a8 100644 --- a/source/dub/project.d +++ b/source/dub/project.d @@ -51,7 +51,7 @@ Package[][Package] m_dependees; SelectedVersions m_selections; bool m_hasAllDependencies; - string[string] m_overridenConfigs; + string[string] m_overriddenConfigs; } /** Loads a project. @@ -218,7 +218,7 @@ Params: package_ = The package for which to force selecting a certain dependency - config = Name of the configuration to force. + config = Name of the configuration to force */ void overrideConfiguration(string package_, string config) { @@ -227,7 +227,7 @@ format("Package '%s', marked for configuration override, is not present in dependency graph.", package_)); enforce(p.configurations.canFind(config), format("Package '%s' does not have a configuration named '%s'.", package_, config)); - m_overridenConfigs[package_] = config; + m_overriddenConfigs[package_] = config; } /** Performs basic validation of various aspects of the package. @@ -404,7 +404,7 @@ foreach (i, v; configs) if (v.pack == pack && v.config == config) return i; - assert(pack !in m_overridenConfigs || config == m_overridenConfigs[pack]); + assert(pack !in m_overriddenConfigs || config == m_overriddenConfigs[pack]); logDebug("Add config %s %s", pack, config); configs ~= Vertex(pack, config); return configs.length-1; @@ -462,7 +462,7 @@ if (!dp) continue; string[] cfgs; - if (auto pc = dp.name in m_overridenConfigs) cfgs = [*pc]; + if (auto pc = dp.name in m_overriddenConfigs) cfgs = [*pc]; else { auto subconf = p.getSubConfiguration(c, dp, platform); if (!subconf.empty) cfgs = [subconf]; @@ -502,7 +502,7 @@ } // for each configuration, determine the configurations usable for the dependencies - if (auto pc = p.name in m_overridenConfigs) + if (auto pc = p.name in m_overriddenConfigs) determineDependencyConfigs(p, *pc); else foreach (c; p.getPlatformConfigurations(platform, p is m_rootPackage && allow_non_library))