Merge stable

source/dub/compilers/ldc.d

@@ -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"; }

source/dub/dub.d

@@ -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[""] = [];

source/dub/project.d

@@ -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);
 		}
 

source/dub/version_.d

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

test/issue3029_subpack_exe_default_conf/dub.json

@@ -0,0 +1,10 @@
+{
+	"name": "issue3029_subpack_exe_default_conf",
+	"targetType": "none",
+	"subPackages": [
+		"sub"
+	],
+	"dependencies": {
+		":sub": "*"
+	}
+}

test/issue3029_subpack_exe_default_conf/sub/dub.json

@@ -0,0 +1,18 @@
+{
+	"name": "sub",
+	"targetType": "executable",
+	"configurations": [
+		{
+			"name": "default",
+			"versions": [
+				"special"
+			]
+		}
+	],
+	"postBuildCommands-windows": [
+		"$DUB_TARGET_NAME"
+	],
+	"postBuildCommands-posix": [
+		"./$DUB_TARGET_NAME"
+	]
+}

test/issue3029_subpack_exe_default_conf/sub/source/app.d

@@ -0,0 +1,15 @@
+module app;
+
+int main()
+{
+    version (special)
+    {
+        // Expected.
+		return 0;
+    }
+    else
+    {
+        // Failure.
+		return 1;
+    }
+}

test/issue595-subpack-exe-subconfig/dub.json

@@ -0,0 +1,13 @@
+{
+	"name": "issue595-subpack-exe-subconfig",
+	"targetType": "none",
+	"subPackages": [
+		"sub"
+	],
+	"dependencies": {
+		":sub": "*"
+	},
+	"subConfigurations": {
+		"issue595-subpack-exe-subconfig:sub": "special"
+	}
+}

test/issue595-subpack-exe-subconfig/sub/dub.json

@@ -0,0 +1,15 @@
+{
+	"name": "sub",
+	"targetType": "executable",
+	"configurations": [
+		{
+			"name": "default"
+		},
+		{
+			"name": "special",
+			"versions": [
+				"special"
+			]
+		}
+	]
+}

test/issue595-subpack-exe-subconfig/sub/source/app.d

@@ -0,0 +1,13 @@
+import std.stdio;
+
+void main()
+{
+    version (special)
+    {
+        writeln("Special version");
+    }
+    else
+    {
+        writeln("Standard version");
+    }
+}