Skip to content
Open
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
8 changes: 8 additions & 0 deletions source/dub/compilers/buildsettings.d
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,14 @@ void getPlatformSettings(in BuildSettingsTemplate this_, ref BuildSettings dst,
// collect source files. Note: D source from 'sourcePaths' and C sources from 'cSourcePaths' are joint into 'sourceFiles'
dst.addSourceFiles(collectFiles(this_.sourcePaths, "*.d"));
dst.addSourceFiles(collectFiles(this_.cSourcePaths, "*.{c,i}"));
version (Windows) {
import std.path : buildNormalizedPath;
import std.algorithm : map;
import std.array : array;
dst.sourceFiles = dst.sourceFiles.map!buildNormalizedPath.array;
if (!dst.mainSourceFile.empty)
dst.mainSourceFile = buildNormalizedPath(dst.mainSourceFile);
}
auto sourceFiles = dst.sourceFiles.sort();

// collect import files and remove sources
Expand Down
8 changes: 8 additions & 0 deletions test/issue3070.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/usr/bin/env bash
# Test for https://github.com/dlang/dub/issues/3070
# Verify mixed path separators don't cause duplicate source file errors.
set -e
. $(dirname "${BASH_SOURCE[0]}")/common.sh
cd ${CURR_DIR}/issue3070
$DUB build --compiler=${DC} 2>&1
echo "PASS: No duplicate source file error with mixed path separators."
7 changes: 7 additions & 0 deletions test/issue3070/dub.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "issue3070",
"description": "Test mixed path separators do not duplicate mainSourceFile",
"targetType": "executable",
"sourcePaths": ["src"],
"mainSourceFile": "src/main.d"
}
1 change: 1 addition & 0 deletions test/issue3070/src/main.d
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
void main() {}
Loading