Merge pull request #2200 from wilzbach/win32

[unbreak nightlies] Run the full chmgen script to avoid regressions

Author: andralex

chm-nav.dd

@@ -68,6 +68,7 @@ MODULE=
         {"t":"$1","a":"$2$(JOIN_LINE_TAIL $+).html"},
 PACKAGE=[$1$(ITEMIZE $+)
 PACKAGE_NAME={"t":"$1"},
+CHANGELOG_VERSION_NIGHTLY=
 CHANGELOG_VERSION_PRE={"t":"$1","a":"$1_pre.html"},
 CHANGELOG_VERSION={"t":"$1","a":"$1.html"},
 ESCAPES=/"/\"/

ddoc_preprocessor.d

@@ -264,7 +264,7 @@ auto genChangelogVersion(string fileName, string fileText)
 {
     import std.regex;
     static re = regex(`^[0-9]\.[0-9][0-9][0-9](\.[0-9])?(_pre)?\.dd$`);
-    if (fileName.dirName.baseName == "changelog")
+    if (fileName.dirName.baseName == "changelog" || fileName.endsWith("chm-nav.dd"))
     {
         string macros = "\nCHANGELOG_VERSIONS=";
         macros ~= "$(CHANGELOG_VERSION_NIGHTLY)\n";
@@ -308,10 +308,7 @@ auto genSwitches(string fileText)
         // flags links should be unique
         auto swKey = flag[0 .. flagEndPos < 0 ? $ : flagEndPos];
         if (auto v = swKey in seen)
-        {
             swNameMacro = "B";
-            swKey.writeln;
-        }
         seen[swKey] = 1;
 
         if (flagEndPos < 0)

posix.mak

@@ -819,14 +819,14 @@ ${STABLE_DMD} ${STABLE_RDMD} ${DUB}: ${STABLE_DMD_ROOT}/.downloaded
 ################################################################################
 
 # testing menu generation
-chm-nav-latest.json : $(DDOC) std.ddoc spec/spec.ddoc ${GENERATED}/modlist-${LATEST}.ddoc changelog/changelog.ddoc chm-nav.dd $(DMD)
-	$(DMD) -conf= -c -o- -Df$@ $(filter-out $(DMD),$^)
+chm-nav-latest.json : $(DDOC) std.ddoc spec/spec.ddoc ${GENERATED}/modlist-${LATEST}.ddoc changelog/changelog.ddoc chm-nav.dd $(DMD) $(DDOC_BIN)
+	$(DDOC_BIN_DMD) -conf= -c -o- -Df$@ $(filter-out $(DMD) $(DDOC_BIN),$^)
 
-chm-nav-release.json : $(DDOC) std.ddoc spec/spec.ddoc ${GENERATED}/modlist-release.ddoc changelog/changelog.ddoc chm-nav.dd $(DMD)
-	$(DMD) -conf= -c -o- -Df$@ $(filter-out $(DMD),$^)
+chm-nav-release.json : $(DDOC) std.ddoc spec/spec.ddoc ${GENERATED}/modlist-release.ddoc changelog/changelog.ddoc chm-nav.dd $(DMD) $(DDOC_BIN)
+	$(DDOC_BIN_DMD) -conf= -c -o- -Df$@ $(filter-out $(DMD) $(DDOC_BIN),$^)
 
-chm-nav-prerelease.json : $(DDOC) std.ddoc spec/spec.ddoc ${GENERATED}/modlist-prerelease.ddoc changelog/changelog.ddoc chm-nav.dd $(DMD)
-	$(DMD) -conf= -c -o- -Df$@ $(filter-out $(DMD),$^)
+chm-nav-prerelease.json : $(DDOC) std.ddoc spec/spec.ddoc ${GENERATED}/modlist-prerelease.ddoc changelog/changelog.ddoc chm-nav.dd $(DMD) $(DDOC_BIN)
+	$(DDOC_BIN_DMD) -conf= -c -o- -Df$@ $(filter-out $(DMD) $(DDOC_BIN),$^)
 
 ################################################################################
 # Dman tags
@@ -836,10 +836,10 @@ d-latest.tag d-tags-latest.json : chmgen.d $(STABLE_DMD) $(ALL_FILES) phobos-lat
 	$(STABLE_RDMD) chmgen.d --root=$W --only-tags --target latest
 
 d-release.tag d-tags-release.json : chmgen.d $(STABLE_DMD) $(ALL_FILES) phobos-release druntime-release chm-nav-release.json
-	$(STABLE_RDMD) chmgen.d --root=$W --only-tags --target release
+	$(STABLE_RDMD) chmgen.d --root=$W --target release
 
 d-prerelease.tag d-tags-prerelease.json : chmgen.d $(STABLE_DMD) $(ALL_FILES) phobos-prerelease druntime-prerelease chm-nav-prerelease.json
-	$(STABLE_RDMD) chmgen.d --root=$W --only-tags --target prerelease
+	$(STABLE_RDMD) chmgen.d --root=$W --target prerelease
 
 ################################################################################
 # Assert -> writeln magic

std.ddoc

@@ -32,6 +32,9 @@ MODULE2=$(MODULE $2, $1, $+)
 MODULE3=$(MODULE $3, $1, $+)
 MODULE4=$(MODULE $4, $1, $+)
 MODULE5=$(MODULE $5, $1, $+)
+MODULE6=$(MODULE $6, $1, $+)
+MODULE7=$(MODULE $7, $1, $+)
+MODULE8=$(MODULE $8, $1, $+)
 PACKAGE=$1$(ITEMIZE $+)
 PACKAGE_NAME=$(T h7,$(D $1))
 JOIN_LINE_TAIL=$(JOIN_LINE $+)