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.

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

Revert "Mutually exclude mainSourceFile of different configurations" #2134

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 0 additions & 25 deletions source/dub/package_.d
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ class Package {

checkDubRequirements();
fillWithDefaults();
mutuallyExcludeMainFiles();
}

/** Searches the given directory for package recipe files.
Expand Down Expand Up @@ -750,30 +749,6 @@ class Package {
cnames[c.name] = true;
}
}

/// Exclude files listed in mainSourceFile for other configurations unless they are listed in sourceFiles
private void mutuallyExcludeMainFiles()
{
string[] allMainFiles;
foreach (ref config; m_info.configurations)
if (!config.buildSettings.mainSourceFile.empty())
allMainFiles ~= config.buildSettings.mainSourceFile;

if (allMainFiles.length == 0)
return;

foreach (ref config; m_info.configurations) {
import std.algorithm.searching : canFind;
auto bs = &config.buildSettings;
auto otherMainFiles = allMainFiles.filter!(elem => (elem != bs.mainSourceFile)).array;

if (bs.sourceFiles.length == 0)
bs.excludedSourceFiles[""] ~= otherMainFiles;
else
foreach (suffix, arr; bs.sourceFiles)
bs.excludedSourceFiles[suffix] ~= otherMainFiles.filter!(elem => !canFind(arr, elem)).array;
}
}
}

private string determineVersionFromSCM(NativePath path)
Expand Down
Empty file removed test/mutex-main-1/.no_run
Empty file.
Empty file removed test/mutex-main-1/.no_test
Empty file.
24 changes: 0 additions & 24 deletions test/mutex-main-1/dub.json

This file was deleted.

8 changes: 0 additions & 8 deletions test/mutex-main-1/source/app.d

This file was deleted.

8 changes: 0 additions & 8 deletions test/mutex-main-1/source/app2.d

This file was deleted.

Empty file removed test/mutex-main-2/.no_run
Empty file.
Empty file removed test/mutex-main-2/.no_test
Empty file.
24 changes: 0 additions & 24 deletions test/mutex-main-2/dub.json

This file was deleted.

8 changes: 0 additions & 8 deletions test/mutex-main-2/source/app.d

This file was deleted.

8 changes: 0 additions & 8 deletions test/mutex-main-2/source/app2.d

This file was deleted.

Empty file removed test/mutex-main-3/.fail_build
Empty file.
Empty file removed test/mutex-main-3/.no_run
Empty file.
Empty file removed test/mutex-main-3/.no_test
Empty file.
24 changes: 0 additions & 24 deletions test/mutex-main-3/dub.json

This file was deleted.

8 changes: 0 additions & 8 deletions test/mutex-main-3/source/app.d

This file was deleted.

8 changes: 0 additions & 8 deletions test/mutex-main-3/source/app2.d

This file was deleted.