Ensure mainSourceFile is deduplicated properly #1410
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks for your pull request, @s-ludwig! |
s-ludwig
force-pushed
the
issue_1407_duplicate_main_source_file
branch
from
dbf5649
to
972f3a3
Compare
wilzbach
approved these changes
Mar 12, 2018
source/dub/recipe/packagerecipe.d
Outdated
| auto p = NativePath(this.mainSourceFile); | ||
| p.normalize(); | ||
| dst.mainSourceFile = p.toNativeString(); | ||
| dst.addSourceFiles(p.toNativeString()); |
There was a problem hiding this comment.
I doubt it matters but the result of toNativeString could be cached.
There was a problem hiding this comment.
I'll simply use dst.mainSourceFile.
BTW, would be good to get #1409 in, so that this one can be rebased on top before adding a change log entry.
s-ludwig
force-pushed
the
issue_1407_duplicate_main_source_file
branch
from
972f3a3
to
304b6df
Compare
This forces the mainSourceFile to be normalized and converted to the native path format before being added to sourceFiles, so that when adding files later on with collectFiles matches up properly.
s-ludwig
force-pushed
the
issue_1407_duplicate_main_source_file
branch
from
304b6df
to
f3d0fc3
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This forces the mainSourceFile to be normalized and converted to the native path format before being added to sourceFiles, so that when adding files later on with collectFiles matches up properly.
Fixes #1407.