add --deep flag to dub build

source/dub/commandline.d

@@ -1198,6 +1198,7 @@ class GenerateCommand : PackageBuildCommand {
 	protected {
 		string m_generator;
 		bool m_printPlatform, m_printBuilds, m_printConfigs;
+		bool m_deep; // only set in BuildCommand
 	}
 
 	this() @safe pure nothrow
@@ -1274,6 +1275,7 @@ class GenerateCommand : PackageBuildCommand {
 		gensettings.runArgs = app_args;
 		// legacy compatibility, default working directory is always CWD
 		gensettings.overrideToolWorkingDirectory = getWorkingDirectory();
+		gensettings.buildDeep = m_deep;
 
 		logDiagnostic("Generating using %s", m_generator);
 		dub.generateProject(m_generator, gensettings);
@@ -1316,6 +1318,9 @@ class BuildCommand : GenerateCommand {
 		args.getopt("n|non-interactive", &m_nonInteractive, [
 			"Don't enter interactive mode."
 		]);
+		args.getopt("d|deep", &m_deep, [
+			"Build all dependencies, even when main target is a static library."
+		]);
 		super.prepare(args);
 		m_generator = "build";
 	}

source/dub/generators/build.d

@@ -89,6 +89,17 @@ class BuildGenerator : ProjectGenerator {
 			settings.buildType.color(Color.magenta), settings.platform.compilerBinary,
 			settings.platform.architecture);
 
+		if (settings.rdmd || (rootTT == TargetType.staticLibrary && !settings.buildDeep)) {
+			// Only build the main target.
+			// RDMD always builds everything at once and static libraries don't need their
+			// dependencies to be built, unless --deep flag is specified
+			NativePath tpath;
+			buildTarget(settings, root_ti.buildSettings.dup, m_project.rootPackage, root_ti.config, root_ti.packages, null, tpath);
+			return;
+		}
+
+		// Recursive build starts here
+
 		bool any_cached = false;
 
 		NativePath[string] target_paths;
@@ -158,15 +169,6 @@ class BuildGenerator : ProjectGenerator {
 			target_paths[target] = tpath;
 		}
 
-		// build all targets
-		if (settings.rdmd || rootTT == TargetType.staticLibrary) {
-			// RDMD always builds everything at once and static libraries don't need their
-			// dependencies to be built
-			NativePath tpath;
-			buildTarget(settings, root_ti.buildSettings.dup, m_project.rootPackage, root_ti.config, root_ti.packages, null, tpath);
-			return;
-		}
-
 		buildTargetRec(m_project.rootPackage.name);
 
 		if (dynamicLibDepsFilesToCopy.length) {

source/dub/generators/generator.d

@@ -824,6 +824,9 @@ struct GeneratorSettings {
 	/// single file dub package
 	bool single;
 
+	/// build all dependencies for static libraries
+	bool buildDeep;
+
 	string[] runArgs;
 	void delegate(int status, string output) compileCallback;
 	void delegate(int status, string output) linkCallback;

test/pr2647-build-deep/.gitignore

@@ -0,0 +1,2 @@
+dubhome/
+pr2647-build-deep

test/pr2647-build-deep/dub.sdl

@@ -0,0 +1,2 @@
+name "pr2647-build-deep";
+targetType "executable";

test/pr2647-build-deep/pack/dub.sdl

@@ -0,0 +1,3 @@
+name "pack"
+targetType "staticLibrary"
+dependency "urld" version="==2.1.1"

test/pr2647-build-deep/pack/source/lib.d

@@ -0,0 +1,14 @@
+module lib;
+
+import url;
+
+string getDlangUrl()
+{
+    URL url;
+    with(url)
+    {
+        scheme = "https";
+        host = "dlang.org";
+    }
+    return url.toString();
+}

test/pr2647-build-deep/source/test_build_deep.d

@@ -0,0 +1,53 @@
+module test_build_deep;
+
+import std.array;
+import std.file;
+import std.path;
+import std.process;
+import std.stdio;
+
+void main()
+{
+    const dubhome = __FILE_FULL_PATH__.dirName().dirName().buildNormalizedPath("dubhome");
+    const packdir = __FILE_FULL_PATH__.dirName().dirName().buildNormalizedPath("pack");
+    const dub = absolutePath(environment["DUB"]);
+
+    if (exists(dubhome))
+    {
+        rmdirRecurse(dubhome);
+    }
+
+    scope (success)
+    {
+        // leave dubhome in the tree for analysis in case of failure
+        rmdirRecurse(dubhome);
+    }
+
+    const string[string] env = [
+        "DUB_HOME": dubhome,
+    ];
+
+    // testing the regular way first: `dub build` only builds what is needed
+    // (urld is downloaded but not built)
+    const dubBuildProg = [dub, "build"];
+    writefln("running %s ...", dubBuildProg.join(" "));
+    auto dubBuild = spawnProcess(dubBuildProg, stdin, stdout, stderr, env, Config.none, packdir);
+    wait(dubBuild);
+    assert(exists(buildPath(dubhome, "cache", "pack")));
+    assert(isDir(buildPath(dubhome, "cache", "pack")));
+    assert(exists(buildPath(dubhome, "packages", "urld")));
+    assert(isDir(buildPath(dubhome, "packages", "urld")));
+    assert(!exists(buildPath(dubhome, "cache", "urld")));
+
+    // now testing the --deep switch: `dub build --deep` will build urld
+    const dubBuildDeepProg = [dub, "build", "--deep"];
+    writefln("running %s ...", dubBuildDeepProg.join(" "));
+    auto dubBuildDeep = spawnProcess(dubBuildDeepProg, stdin, stdout, stderr, env, Config.none, packdir);
+    wait(dubBuildDeep);
+    assert(exists(buildPath(dubhome, "cache", "pack")));
+    assert(isDir(buildPath(dubhome, "cache", "pack")));
+    assert(exists(buildPath(dubhome, "packages", "urld")));
+    assert(isDir(buildPath(dubhome, "packages", "urld")));
+    assert(exists(buildPath(dubhome, "cache", "urld")));
+    assert(isDir(buildPath(dubhome, "cache", "urld")));
+}