Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

getDefaultConfiguration(): Accept a const BuildPlatform argument #2304

Merged
merged 2 commits into from
Jul 14, 2022
Merged

getDefaultConfiguration(): Accept a const BuildPlatform argument #2304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
adb907d
getDefaultConfiguration(): Accept a const BuildPlatform argument
kinke Jul 14, 2022
281ee32
Make Project.addTestRunnerConfiguration() accept a const GeneratorSet…
kinke Jul 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/dub/dub.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ class Dub {
This forwards to `Project.getDefaultConfiguration` and requires a
project to be loaded.
*/
string getDefaultConfiguration(BuildPlatform platform, bool allow_non_library_configs = true) const { return m_project.getDefaultConfiguration(platform, allow_non_library_configs); }
string getDefaultConfiguration(in BuildPlatform platform, bool allow_non_library_configs = true) const { return m_project.getDefaultConfiguration(platform, allow_non_library_configs); }

/** Attempts to upgrade the dependency selection of the loaded project.

Expand Down
2 changes: 1 addition & 1 deletion source/dub/generators/build.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ string getObjSuffix(const scope ref BuildPlatform platform)
return platform.isWindows() ? ".obj" : ".o";
}

string computeBuildName(string config, GeneratorSettings settings, const string[][] hashing...)
string computeBuildName(string config, in GeneratorSettings settings, const string[][] hashing...)
{
import std.digest;
import std.digest.md;
Expand Down
6 changes: 3 additions & 3 deletions source/dub/project.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ class Project {
possible configuration instead of the first "executable"
configuration.
*/
string getDefaultConfiguration(BuildPlatform platform, bool allow_non_library_configs = true)
string getDefaultConfiguration(in BuildPlatform platform, bool allow_non_library_configs = true)
const {
auto cfgs = getPackageConfigs(platform, null, allow_non_library_configs);
return cfgs[m_rootPackage.name];
Expand Down Expand Up @@ -231,7 +231,7 @@ class Project {
Returns:
Name of the added test runner configuration, or null for base configurations with target type `none`
*/
string addTestRunnerConfiguration(GeneratorSettings settings, bool generate_main = true, string base_config = "", NativePath custom_main_file = NativePath())
string addTestRunnerConfiguration(in GeneratorSettings settings, bool generate_main = true, string base_config = "", NativePath custom_main_file = NativePath())
{
if (base_config.length == 0) {
// if a custom main file was given, favor the first library configuration, so that it can be applied
Expand All @@ -244,7 +244,7 @@ class Project {
if (!base_config.length) base_config = getDefaultConfiguration(settings.platform, true);
}

BuildSettings lbuildsettings = settings.buildSettings;
BuildSettings lbuildsettings = settings.buildSettings.dup;
addBuildSettings(lbuildsettings, settings, base_config, null, true);

if (lbuildsettings.targetType == TargetType.none) {
Expand Down