Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion posix.mak
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ ${DOC_OUTPUT_DIR}/phobos-prerelease/index.verbatim : verbatim.ddoc \
# phobos and druntime, latest released build and current build (DDOX version)
################################################################################

apidocs-prerelease : ${DOC_OUTPUT_DIR}/library-prerelease/sitemap.xml ${DOC_OUTPUT_DIR}/library-prerelease/.htaccess
apidocs-prerelease : ${DOC_OUTPUT_DIR}/library-prerelease/sitemap.xml ${DOC_OUTPUT_DIR}/library-prerelease/.htaccess ${DOC_OUTPUT_DIR}/library-prerelease/upcoming.html
apidocs-release : ${DOC_OUTPUT_DIR}/library/sitemap.xml ${DOC_OUTPUT_DIR}/library/.htaccess
apidocs-serve : docs-prerelease.json
${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 \
Expand Down Expand Up @@ -472,6 +472,15 @@ docs-prerelease.json : ${DMD} ${DRUNTIME_DIR} \
--only-documented $(MOD_EXCLUDES_RELEASE)
rm .prerelease-files.txt .prerelease-dummy.html

${GENERATED}/upcoming.dd: | ${GENERATED}
$(STABLE_RDMD) ../tools/build_changelog.d ../phobos/changelog --without-macros > $@
$(STABLE_RDMD) ../tools/changed.d v2.071.0..upstream/master -o ${GENERATED}/changlog.tmp
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it would be nicer if the changed.d could output to stdout, but this should work too ;-)

cat ${GENERATED}/changlog.tmp >> $@
rm ${GENERATED}/changlog.tmp

$(DOC_OUTPUT_DIR)/library-prerelease/upcoming.html: ${GENERATED}/upcoming.dd $(CHANGELOG_DDOC) $(DMD)
$(DMD) -conf= -c -o- -Df$@ $(CHANGELOG_DDOC) $<

################################################################################
# binary targets for DDOX
################################################################################
Expand Down
4 changes: 3 additions & 1 deletion std_navbar-prerelease.ddoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ $(SUBNAV_TEMPLATE
$(DIVC head,
$(H2 Library Reference)
$(P $(SPANC smallprint, pre-release version $(SPANC separator, $(BR))
$(LINK2 ../phobos/index.html, switch to version $(LATEST))))
$(LINK2 ../phobos/index.html, switch to version $(LATEST))
$(BR)
$(LINK2 ../library-prerelease/upcoming.html, show upcoming changes)))
$(P $(LINK2 index.html, overview))
)
$(UL $(MODULE_MENU))
Expand Down