allow to specify ddox tool

- can be used to customize the ddox tool (and it's output)
- assumes similar commands/behavior

source/dub/dub.d

@@ -734,54 +734,52 @@ class Dub {
 	{
 		if (m_dryRun) return;
 
-		auto ddox_pack = m_packageManager.getBestPackage("ddox", ">=0.0.0");
-		if (!ddox_pack) ddox_pack = m_packageManager.getBestPackage("ddox", "~master");
-		if (!ddox_pack) {
-			logInfo("DDOX is not present, getting it and storing user wide");
-			ddox_pack = fetch("ddox", Dependency(">=0.0.0"), defaultPlacementLocation, FetchOptions.none);
+		// allow to choose a custom ddox tool
+		auto tool = m_project.rootPackage.info.ddoxTool;
+		if (tool.empty) tool = "ddox";
+
+		auto tool_pack = m_packageManager.getBestPackage(tool, ">=0.0.0");
+		if (!tool_pack) tool_pack = m_packageManager.getBestPackage(tool, "~master");
+		if (!tool_pack) {
+			logInfo("% is not present, getting and storing it user wide", tool);
+			tool_pack = fetch(tool, Dependency(">=0.0.0"), defaultPlacementLocation, FetchOptions.none);
 		}
 
-		version(Windows) auto ddox_exe = "ddox.exe";
-		else auto ddox_exe = "ddox";
+		auto ddox_dub = new Dub(m_packageSuppliers);
+		ddox_dub.loadPackage(tool_pack.path);
+		ddox_dub.upgrade(UpgradeOptions.select);
 
-		if( !existsFile(ddox_pack.path~ddox_exe) ){
-			logInfo("DDOX in %s is not built, performing build now.", ddox_pack.path.toNativeString());
+		auto compiler_binary = this.defaultCompiler;
 
-			auto ddox_dub = new Dub(m_packageSuppliers);
-			ddox_dub.loadPackage(ddox_pack.path);
-			ddox_dub.upgrade(UpgradeOptions.select);
+		GeneratorSettings settings;
+		settings.config = "application";
+		settings.compiler = getCompiler(compiler_binary); // TODO: not using --compiler ???
+		settings.platform = settings.compiler.determinePlatform(settings.buildSettings, compiler_binary);
+		settings.buildType = "debug";
+		settings.run = true;
 
-			auto compiler_binary = this.defaultCompiler;
-
-			GeneratorSettings settings;
-			settings.config = "application";
-			settings.compiler = getCompiler(compiler_binary);
-			settings.platform = settings.compiler.determinePlatform(settings.buildSettings, compiler_binary);
-			settings.buildType = "debug";
-			ddox_dub.generateProject("build", settings);
+		auto filterargs = m_project.rootPackage.info.ddoxFilterArgs.dup;
+		if (filterargs.empty) filterargs = ["--min-protection=Protected", "--only-documented"];
 
-			//runCommands(["cd "~ddox_pack.path.toNativeString()~" && dub build -v"]);
-		}
+		settings.runArgs = "filter" ~ filterargs ~ "docs.json";
+		ddox_dub.generateProject("build", settings);
 
-		auto p = ddox_pack.path;
+		auto p = tool_pack.path;
 		p.endsWithSlash = true;
-		auto dub_path = p.toNativeString();
-
-		string[] commands;
-		string[] filterargs = m_project.rootPackage.info.ddoxFilterArgs.dup;
-		if (filterargs.empty) filterargs = ["--min-protection=Protected", "--only-documented"];
-		commands ~= dub_path~"ddox filter "~filterargs.join(" ")~" docs.json";
-		if (!run) {
-			commands ~= dub_path~"ddox generate-html --navigation-type=ModuleTree docs.json docs";
-			version(Windows) commands ~= "xcopy /S /D "~dub_path~"public\\* docs\\";
-			else commands ~= "rsync -ru '"~dub_path~"public/' docs/";
-		}
-		runCommands(commands);
+		auto tool_path = p.toNativeString();
 
 		if (run) {
-			auto proc = spawnProcess([dub_path~"ddox", "serve-html", "--navigation-type=ModuleTree", "docs.json", "--web-file-dir="~dub_path~"public"]);
+			settings.runArgs = ["serve-html", "--navigation-type=ModuleTree", "docs.json", "--web-file-dir="~tool_path~"public"];
 			browse("http://127.0.0.1:8080/");
-			wait(proc);
+		} else {
+			settings.runArgs = ["generate-html", "--navigation-type=ModuleTree", "docs.json", "docs"];
+		}
+		ddox_dub.generateProject("build", settings);
+
+		if (!run) {
+			// TODO: ddox should copy those files itself
+			version(Windows) runCommand("xcopy /S /D "~tool_path~"public\\* docs\\");
+			else runCommand("rsync -ru '"~tool_path~"public/' docs/");
 		}
 	}
 

source/dub/internal/utils.d

@@ -155,6 +155,11 @@ bool existsDirectory(Path path) {
 	return fi.isDirectory;
 }
 
+void runCommand(string command, string[string] env = null)
+{
+	runCommands((&command)[0 .. 1], env);
+}
+
 void runCommands(in string[] commands, string[string] env = null)
 {
 	import std.stdio : stdin, stdout, stderr, File;

source/dub/recipe/json.d

@@ -42,6 +42,7 @@ void parseJson(ref PackageRecipe recipe, Json json, string parent_name)
 				}
 				break;
 			case "-ddoxFilterArgs": recipe.ddoxFilterArgs = deserializeJson!(string[])(value); break;
+			case "-ddoxTool": recipe.ddoxTool = value.get!string; break;
 		}
 	}
 

source/dub/recipe/packagerecipe.d

@@ -71,6 +71,7 @@ struct PackageRecipe {
 	string copyright;
 	string license;
 	string[] ddoxFilterArgs;
+	string ddoxTool;
 	BuildSettingsTemplate buildSettings;
 	ConfigurationInfo[] configurations;
 	BuildSettingsTemplate[string] buildTypes;

source/dub/recipe/sdl.d

@@ -48,6 +48,7 @@ void parseSDL(ref PackageRecipe recipe, Tag sdl, string parent_name)
 				recipe.buildTypes[name] = bt;
 				break;
 			case "x:ddoxFilterArgs": recipe.ddoxFilterArgs ~= n.stringArrayTagValue; break;
+			case "x:ddoxTool": recipe.ddoxTool = n.stringTagValue; break;
 		}
 	}
 
@@ -357,7 +358,7 @@ lflags "lf3"
 }
 
 unittest { // test platform identifiers
-	auto sdl = 
+	auto sdl =
 `name "testproject"
 dflags "-a" "-b" platform="windows-x86"
 dflags "-c" platform="windows-x86"
@@ -391,8 +392,8 @@ unittest { // test single value fields
 		`name "hello" {
 			world
 		}`, null, "testfile"));
-	assertThrown!Exception(parseSDL(rec, 
+	assertThrown!Exception(parseSDL(rec,
 		`name ""
 		versions "hello" 10`
 		, null, "testfile"));
-}
+}

test/ddox.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e -o pipefail
+
+(cd $CURR_DIR/ddox/default && $DUB build -b ddox)
+grep -qF ddox_project $CURR_DIR/ddox/default/docs/index.html
+
+$DUB add-local $CURR_DIR/ddox/custom-tool
+(cd $CURR_DIR/ddox/custom && $DUB build -b ddox)
+grep -qF custom-tool $CURR_DIR/ddox/custom/docs/custom_tool_output
+diff $CURR_DIR/ddox/custom-tool/public/copied $CURR_DIR/ddox/custom/docs/copied
+$DUB remove-local $CURR_DIR/ddox/custom-tool

test/ddox.sh.min_frontend

@@ -0,0 +1 @@
+2.065

test/ddox/custom-tool/.gitignore

@@ -0,0 +1,6 @@
+.dub
+docs.json
+__dummy.html
+*.o
+*.obj
+custom-tool

test/ddox/custom-tool/dub.sdl

@@ -0,0 +1,4 @@
+name "custom-tool"
+description "A minimal D application."
+copyright "Copyright © 2015, dawg"
+authors "dawg"

test/ddox/custom-tool/public/copied

@@ -0,0 +1 @@
+content

test/ddox/custom-tool/source/app.d

@@ -0,0 +1,9 @@
+import std.file, std.stdio, std.string;
+
+void main(string[] args)
+{
+	if (args[1] != "generate-html")
+		return;
+	mkdirRecurse(args[$-1]);
+	File(args[$-1]~"/custom_tool_output", "w").writeln(args.join(" "));
+}

test/ddox/custom/.gitignore

@@ -0,0 +1,6 @@
+.dub
+docs
+docs.json
+__dummy.html
+*.o
+*.obj

test/ddox/custom/dub.sdl

@@ -0,0 +1,2 @@
+name "ddox-project"
+x:ddoxTool "custom-tool"

test/ddox/custom/source/ddox_project.d

@@ -0,0 +1,5 @@
+///
+module ddox_project;
+
+/// docstring
+int foo;

test/ddox/default/.gitignore

@@ -0,0 +1,6 @@
+.dub
+docs
+docs.json
+__dummy.html
+*.o
+*.obj

test/ddox/default/dub.sdl

@@ -0,0 +1 @@
+name "ddox-project"

test/ddox/default/source/ddox_project.d

@@ -0,0 +1,5 @@
+///
+module ddox_project;
+
+/// docstring
+int foo;

test/run-unittest.sh

@@ -26,11 +26,13 @@ CURR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 for script in $(ls $CURR_DIR/*.sh); do
     if [ "$script" = "$(readlink -f ${BASH_SOURCE[0]})" ]; then continue; fi
+    if [ -e $script.min_frontend ] && [ ! -z "$FRONTEND" -a "$FRONTEND" \< $(cat $script.min_frontend) ]; then continue; fi
     log "Running $script..."
     DUB=$DUB COMPILER=$COMPILER CURR_DIR="$CURR_DIR" $script || die "Script failure."
 done
 
 for pack in $(ls -d $CURR_DIR/*/); do
+    if [ -e $pack/.min_frontend ] && [ ! -z "$FRONTEND" -a "$FRONTEND" \< $(cat $pack/.min_frontend) ]; then continue; fi
     # First we build the packages
     if [ ! -e $pack/.no_build ]; then # For sourceLibrary
         if [ -e $pack/.fail_build ]; then