Merge pull request #3096 from kinke/merge_stable

Merge stable

Author: kinke

changelog/add-dest.dd

@@ -50,7 +50,7 @@ class LDCCompiler : Compiler {
 		tuple(BuildOption.color, ["-enable-color"]),
 
 		tuple(BuildOption._docs, ["-Dd=docs"]),
-		tuple(BuildOption._ddox, ["-Xf=docs.json", "-Dd=__dummy_docs"]),
+		tuple(BuildOption._ddox, ["-Xf=docs.json", "-Dd=__dummy_docs", "-oq"]),
 	];
 
 	@property string name() const { return "ldc"; }

changelog/add-frameworks.dd

@@ -621,7 +621,7 @@ class Dub {
 		enforce(recipe.buildSettings.cSourcePaths.length == 0, "Single-file packages are not allowed to specify C source paths.");
 		enforce(recipe.buildSettings.importPaths.length == 0, "Single-file packages are not allowed to specify import paths.");
 		enforce(recipe.buildSettings.cImportPaths.length == 0, "Single-file packages are not allowed to specify C import paths.");
-		recipe.buildSettings.sourceFiles[""] = [path.toNativeString()];
+		recipe.buildSettings.sourceFiles[""] = [];
 		recipe.buildSettings.sourcePaths[""] = [];
 		recipe.buildSettings.cSourcePaths[""] = [];
 		recipe.buildSettings.importPaths[""] = [];

changelog/fix-cimport-paths.dd

@@ -744,7 +744,13 @@ class Project {
 				} else {
 					auto subconf = pack.package_.getSubConfiguration(c, packages[dp].package_, platform);
 					if (!subconf.empty) setConfigs(only(subconf));
-					else setConfigs(packages[dp].package_.getPlatformConfigurations(platform));
+					else {
+						setConfigs(packages[dp].package_.getPlatformConfigurations(platform));
+						if (depconfigs[dp].length == 0) {
+							// Try with the executables too
+							setConfigs(packages[dp].package_.getPlatformConfigurations(platform, true));
+						}
+					}
 				}
 
 				// if no valid configuration was found for a dependency, don't include the
@@ -786,7 +792,7 @@ class Project {
 			if (auto pc = pack.name in m_overriddenConfigs)
 				determineDependencyConfigs(pack_idx, *pc);
 			else
-				foreach (c; pack.package_.getPlatformConfigurations(platform, pack.package_ is m_rootPackage && allow_non_library))
+				foreach (c; pack.package_.getPlatformConfigurations(platform, allow_non_library))
 					determineDependencyConfigs(pack_idx, c);
 		}
 

changelog/selections_from_parent_dir.dd

@@ -1,2 +1,2 @@
 module dub.version_;
-enum dubVersion = "v1.39.0-rc.1";
+enum dubVersion = "v1.41.0";