Pass Phobos Ddoc files through DDOC_BIN

Author: wilzbach

ddoc.d

@@ -16,7 +16,7 @@ Author: Sebastian Wilzbach
 */
 import std.algorithm, std.array, std.ascii, std.conv, std.file, std.functional,
         std.meta, std.path, std.range, std.string, std.typecons;
-import std.stdio : writeln, writefln;
+import std.stdio;
 
 struct Config
 {
@@ -25,40 +25,55 @@ struct Config
 }
 Config config;
 
-int main(string[] args)
+auto findAndReplace(alias pred)(ref string[] args, string replacement)
+{
+    auto pos = args.countUntil!pred;
+    string ret;
+    if (pos >= 0)
+    {
+        ret = args[pos];
+        args = args[0..pos].chain(replacement.only, args[pos..$].dropOne).array;
+    }
+    return ret;
+}
+
+int main(string[] rootArgs)
 {
     import std.getopt;
     auto helpInformation = getopt(
-        args,
+        rootArgs, std.getopt.config.passThrough,
         "compiler", "Compiler to use", &config.dmdBinPath,
-        "o|output", "Output file", &config.outputFile,
     );
-
-    assert(config.outputFile, "An output file is required.");
-    assert(args.length > 1, "An input file is required.");
-
     if (helpInformation.helpWanted)
     {
 `DDoc wrapper
 ./ddoc <file>...
 `.defaultGetoptPrinter(helpInformation.options);
         return 1;
     }
-
-    import std.file : readText;
-    auto text = args[$ - 1].readText;
+    auto args = rootArgs[1 .. $];
+    auto inputFile = args.findAndReplace!(a => a.endsWith(".dd", ".d") > 0)("-");
+    assert(inputFile, "An input file (.d or .dd) must be provided");
+    auto text = inputFile.readText;
+    // TODO:
+    if (inputFile.endsWith("package.d"))
+        return 0;
 
     // transform and extend the ddoc page
     text = genHeader(text);
 
-    return compile(text, args[1 .. $ - 1]);
+    return compile(text, args);
 }
 
 auto compile(R)(R buffer, string[] arguments)
 {
     import std.process : pipeProcess, Redirect, wait;
-    auto args = [config.dmdBinPath, "-c", "-Df"~config.outputFile, "-o-"] ~ arguments;
-    args ~= "-";
+    auto args = [config.dmdBinPath] ~ arguments;
+    foreach (arg; ["-c", "-o-", "-"])
+    {
+        if (!args.canFind(arg))
+            args ~= arg;
+    }
     auto pipes = pipeProcess(args, Redirect.stdin);
     pipes.stdin.write(buffer);
     pipes.stdin.close;

posix.mak

@@ -468,7 +468,7 @@ $W/changelog/%.html : changelog/%.dd $(CHANGELOG_DDOC) $(DMD)
 	$(DMD) -conf= -c -o- -Df$@ $(CHANGELOG_DDOC) $<
 
 $W/spec/%.html : spec/%.dd $(SPEC_DDOC) $(DMD) $(DDOC_BIN)
-	$(DDOC_BIN) --compiler=$(DMD) -o$@ $(SPEC_DDOC) $<
+	$(DDOC_BIN) --compiler=$(DMD) -Df$@ $(SPEC_DDOC) $<
 
 $W/404.html : 404.dd $(DDOC) $(DMD)
 	$(DMD) -conf= -c -o- -Df$@ $(DDOC) errorpage.ddoc $<
@@ -665,14 +665,17 @@ $W/phobos-prerelease/object.verbatim : $(DMD) $G/changelog/next-version
 ################################################################################
 
 .PHONY: phobos-prerelease
-phobos-prerelease : ${PHOBOS_FILES} druntime-target $(STD_DDOC_PRERELEASE)
-	$(MAKE) --directory=$(PHOBOS_DIR) -f posix.mak html $(DDOC_VARS_PRERELEASE_HTML)
+phobos-prerelease : ${PHOBOS_FILES} druntime-target $(STD_DDOC_PRERELEASE) $(DDOC_BIN) $(DMD)
+	$(MAKE) --directory=$(PHOBOS_DIR) -f posix.mak html $(DDOC_VARS_PRERELEASE_HTML) \
+		DMD="$(abspath $(DDOC_BIN)) --compiler=$(DMD)"
 
-phobos-release : ${PHOBOS_FILES} druntime-target $(STD_DDOC_RELEASE)
-	$(MAKE) --directory=$(PHOBOS_DIR) -f posix.mak html $(DDOC_VARS_RELEASE_HTML)
+phobos-release : ${PHOBOS_FILES} druntime-target $(STD_DDOC_RELEASE) $(DDOC_BIN) $(DMD)
+	$(MAKE) --directory=$(PHOBOS_DIR) -f posix.mak html $(DDOC_VARS_RELEASE_HTML) \
+		DMD="$(abspath $(DDOC_BIN)) --compiler=$(DMD)"
 
-phobos-latest : ${PHOBOS_LATEST_FILES} druntime-latest-target $(STD_DDOC_LATEST)
-	$(MAKE) --directory=$(PHOBOS_LATEST_DIR) -f posix.mak html $(DDOC_VARS_LATEST_HTML)
+phobos-latest : ${PHOBOS_LATEST_FILES} druntime-latest-target $(STD_DDOC_LATEST) $(DDOC_BIN) $(DMD)
+	$(MAKE) --directory=$(PHOBOS_LATEST_DIR) -f posix.mak html $(DDOC_VARS_LATEST_HTML) \
+		DMD="$(abspath $(DDOC_BIN)) --compiler=$(DMD)"
 
 phobos-prerelease-verbatim : ${PHOBOS_FILES} druntime-target \
 		$W/phobos-prerelease/index.verbatim