@@ -166,7 +166,8 @@ DOC_OUTPUT_DIR:=$(PWD)/web
166
166
W: =$(DOC_OUTPUT_DIR )
167
167
GIT_HOME =https://github.com/dlang
168
168
DPL_DOCS_PATH =dpl-docs
169
- DPL_DOCS =$(DPL_DOCS_PATH ) /dpl-docs --DRT-gcopt=parallel:0
169
+ DPL_DOCS =$(DPL_DOCS_PATH ) /dpl-docs
170
+ DPL_DOCS_FLAGS=--DRT-gcopt =parallel:0
170
171
REMOTE_DIR =d-programming@digitalmars.com:data
171
172
TMP? =/tmp
172
173
GENERATED =.generated
@@ -687,20 +688,20 @@ $(PHOBOS_LIB): $(DMD)
687
688
apidocs-prerelease : $W/library-prerelease/sitemap.xml $W/library-prerelease/.htaccess
688
689
apidocs-latest : $W/library/sitemap.xml $W/library/.htaccess
689
690
apidocs-serve : $G/docs-prerelease.json
690
- ${DPL_DOCS} serve-html --std-macros=html.ddoc --std-macros=dlang.org.ddoc --std-macros=std.ddoc --std-macros=macros.ddoc --std-macros=std-ddox.ddoc \
691
+ ${DPL_DOCS} ${DPL_DOCS_FLAGS} serve-html --std-macros=html.ddoc --std-macros=dlang.org.ddoc --std-macros=std.ddoc --std-macros=macros.ddoc --std-macros=std-ddox.ddoc \
691
692
--override-macros=std-ddox-override.ddoc --package-order=std \
692
693
--git-target=master --web-file-dir=. $<
693
694
694
695
$W/library-prerelease/sitemap.xml : $G/docs-prerelease.json
695
696
@mkdir -p $(dir $@ )
696
- ${DPL_DOCS} generate-html --file-name-style=lowerUnderscored --std-macros=html.ddoc --std-macros=dlang.org.ddoc --std-macros=std.ddoc --std-macros=macros.ddoc --std-macros=std-ddox.ddoc \
697
+ ${DPL_DOCS} ${DPL_DOCS_FLAGS} generate-html --file-name-style=lowerUnderscored --std-macros=html.ddoc --std-macros=dlang.org.ddoc --std-macros=std.ddoc --std-macros=macros.ddoc --std-macros=std-ddox.ddoc \
697
698
--override-macros=std-ddox-override.ddoc --package-order=std \
698
699
--git-target=master $(DPL_DOCS_PATH_RUN_FLAGS ) \
699
700
$< $W /library-prerelease
700
701
701
702
$W/library/sitemap.xml : $G/docs-latest.json
702
703
@mkdir -p $(dir $@ )
703
- ${DPL_DOCS} generate-html --file-name-style=lowerUnderscored --std-macros=html.ddoc --std-macros=dlang.org.ddoc --std-macros=std.ddoc --std-macros=macros.ddoc --std-macros=std-ddox.ddoc \
704
+ ${DPL_DOCS} ${DPL_DOCS_FLAGS} generate-html --file-name-style=lowerUnderscored --std-macros=html.ddoc --std-macros=dlang.org.ddoc --std-macros=std.ddoc --std-macros=macros.ddoc --std-macros=std-ddox.ddoc \
704
705
--override-macros=std-ddox-override.ddoc --package-order=std \
705
706
--git-target=v${LATEST} $(DPL_DOCS_PATH_RUN_FLAGS ) \
706
707
$< $W /library
@@ -724,7 +725,7 @@ $G/docs-latest.json : ${DMD_LATEST} ${DMD_LATEST_DIR} \
724
725
${DMD_LATEST} -J$(DMD_LATEST_DIR ) /src/dmd/res -J$(dir $(DMD_LATEST ) ) -c -o- -version=CoreDdoc \
725
726
-version=MARS -version=CoreDdoc -version=StdDdoc -Df$G /.latest-dummy.html \
726
727
-Xf$@ -I${PHOBOS_LATEST_DIR} @$G /.latest-files.txt
727
- ${DPL_DOCS} filter $@ --min-protection=Protected \
728
+ ${DPL_DOCS} ${DPL_DOCS_FLAGS} filter $@ --min-protection=Protected \
728
729
--only-documented $(MOD_EXCLUDES_LATEST )
729
730
rm -f $G /.latest-files.txt $G /.latest-dummy.html
730
731
@@ -738,7 +739,7 @@ $G/docs-prerelease.json : ${DMD} ${DMD_DIR} ${DRUNTIME_DIR} | dpl-docs
738
739
${DMD} -J$(DMD_DIR ) /res -J$(DMD_DIR ) /compiler/src/dmd/res -J$(dir $(DMD ) ) -c -o- -version=MARS -version=CoreDdoc \
739
740
-version=StdDdoc -Df$G /.prerelease-dummy.html \
740
741
-Xf$@ -I${PHOBOS_DIR} @$G /.prerelease-files.txt
741
- ${DPL_DOCS} filter $@ --min-protection=Protected \
742
+ ${DPL_DOCS} ${DPL_DOCS_FLAGS} filter $@ --min-protection=Protected \
742
743
--only-documented $(MOD_EXCLUDES_PRERELEASE )
743
744
rm -f $G /.prerelease-files.txt $G /.prerelease-dummy.html
744
745
0 commit comments