Make sourcePaths work as documented

`sourcePaths` is only default initialized when both top level and configuration level `sourcePaths` is empty. Fixes #1913
dlang · Nov 27, 2020 · 0c4e676 · 0c4e676
1 parent f1815e6
commit 0c4e676
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 38 deletions.
diff --git a/source/dub/package_.d b/source/dub/package_.d
@@ -671,55 +671,62 @@ class Package {
 			}
 		}
 
-		// check for default source folders
-		immutable hasSP = ("" in bs.sourcePaths) !is null;
-		immutable hasIP = ("" in bs.importPaths) !is null;
-		if (!hasSP || !hasIP) {
-			foreach (defsf; ["source/", "src/"]) {
-				if (existsFile(m_path ~ defsf)) {
-					if (!hasSP) bs.sourcePaths[""] ~= defsf;
-					if (!hasIP) bs.importPaths[""] ~= defsf;
-				}
-			}
-		}
-
-		// check for default app_main
-		string app_main_file;
-		auto pkg_name = m_info.name.length ? m_info.name : "unknown";
-		foreach(sf; bs.sourcePaths.get("", null)){
-			auto p = m_path ~ sf;
-			if( !existsFile(p) ) continue;
-			foreach(fil; ["app.d", "main.d", pkg_name ~ "/main.d", pkg_name ~ "/" ~ "app.d"]){
-				if( existsFile(p ~ fil) ) {
-					app_main_file = (NativePath(sf) ~ fil).toNativeString();
-					break;
-				}
-			}
-		}
-
 		// generate default configurations if none are defined
 		if (m_info.configurations.length == 0) {
 			if (bs.targetType == TargetType.executable) {
 				BuildSettingsTemplate app_settings;
 				app_settings.targetType = TargetType.executable;
-				if (bs.mainSourceFile.empty) app_settings.mainSourceFile = app_main_file;
 				m_info.configurations ~= ConfigurationInfo("application", app_settings);
 			} else if (bs.targetType != TargetType.none) {
 				BuildSettingsTemplate lib_settings;
-				lib_settings.targetType = bs.targetType == TargetType.autodetect ? TargetType.library : bs.targetType;
+				lib_settings.targetType = bs.targetType;
+				m_info.configurations ~= ConfigurationInfo("library", lib_settings);
+			}
+		}
 
-				if (bs.targetType == TargetType.autodetect) {
-					if (app_main_file.length) {
-						lib_settings.excludedSourceFiles[""] ~= app_main_file;
+		foreach (ref config; m_info.configurations)
+		{
+			auto confBS = &config.buildSettings;
+			// check for default source folders
+			immutable hasSP = ("" in confBS.sourcePaths) !is null || ("" in bs.sourcePaths) !is null;
+			immutable hasIP = ("" in bs.importPaths) !is null;
+
+			if (!hasSP || !hasIP) {
+				foreach (defsf; ["source/", "src/"]) {
+					if (existsFile(m_path ~ defsf)) {
+						if (!hasSP) confBS.sourcePaths[""] ~= defsf;
+						if (!hasIP) bs.importPaths[""] ~= defsf;
+					}
+				}
+			}
 
-						BuildSettingsTemplate app_settings;
-						app_settings.targetType = TargetType.executable;
-						app_settings.mainSourceFile = app_main_file;
-						m_info.configurations ~= ConfigurationInfo("application", app_settings);
+			// check for default app_main
+			string app_main_file;
+			auto pkg_name = m_info.name.length ? m_info.name : "unknown";
+			auto sourcePathsComb = bs.sourcePaths.get("", null) ~ confBS.sourcePaths.get("", null);
+			foreach(sf; sourcePathsComb){
+				auto p = m_path ~ sf;
+				if( !existsFile(p) ) continue;
+				foreach(fil; ["app.d", "main.d", pkg_name ~ "/main.d", pkg_name ~ "/" ~ "app.d"]){
+					if( existsFile(p ~ fil) ) {
+						app_main_file = (NativePath(sf) ~ fil).toNativeString();
+						break;
 					}
 				}
+			}
 
-				m_info.configurations ~= ConfigurationInfo("library", lib_settings);
+			if (confBS.targetType == TargetType.executable) {
+				if (bs.mainSourceFile.empty && confBS.mainSourceFile.empty)
+					confBS.mainSourceFile = app_main_file;
+			} else if (confBS.targetType == TargetType.autodetect) {
+				if (!bs.mainSourceFile.empty || !app_main_file.empty || !confBS.mainSourceFile.empty) {
+					confBS.targetType = TargetType.executable;
+					if (bs.mainSourceFile.empty && confBS.mainSourceFile.empty)
+						confBS.mainSourceFile = app_main_file;
+					config.name = "application";
+				} else {
+					confBS.targetType = TargetType.library;
+				}
 			}
 		}
 	}

diff --git a/source/dub/recipe/packagerecipe.d b/source/dub/recipe/packagerecipe.d
@@ -276,10 +276,11 @@ struct BuildSettingsTemplate {
  		// collect import files and remove sources
 		import std.algorithm : copy, setDifference;
 
-		auto importFiles = collectFiles(importPaths, "*.{d,di}").sort();
+		auto newImportFiles = collectFiles(importPaths, "*.{d,di}");
+		auto importFiles = (dst.importFiles ~ newImportFiles).sort();
 		immutable nremoved = importFiles.setDifference(sourceFiles).copy(importFiles.release).length;
 		importFiles = importFiles[0 .. $ - nremoved];
-		dst.addImportFiles(importFiles.release);
+		dst.importFiles = importFiles.release;
 
 		dst.addStringImportFiles(collectFiles(stringImportPaths, "*"));
 

diff --git a/test/issue1913-sourcePaths/.no_run b/test/issue1913-sourcePaths/.no_run
diff --git a/test/issue1913-sourcePaths/.no_test b/test/issue1913-sourcePaths/.no_test
diff --git a/test/issue1913-sourcePaths/dub.json b/test/issue1913-sourcePaths/dub.json
@@ -0,0 +1,15 @@
+{
+    "name": "dub-bug",
+    "configurations": [
+        {
+            "name": "app1",
+            "targetName": "bug-app1",
+            "sourcePaths": [ "source/app1" ]
+        },
+        {
+            "name": "app2",
+            "targetName": "bug-app2",
+            "sourcePaths": [ "source/app2" ]
+        }
+    ]
+}
diff --git a/test/issue1913-sourcePaths/source/app1/main.d b/test/issue1913-sourcePaths/source/app1/main.d
@@ -0,0 +1 @@
+void main () {}
diff --git a/test/issue1913-sourcePaths/source/app2/main.d b/test/issue1913-sourcePaths/source/app2/main.d
@@ -0,0 +1 @@
+void main () {}