Skip to content

Commit 5e2b390

Browse files
committed
Revert "Merge pull request #2378 from MartinNowak/fix_enable_release"
This reverts commit 7303ac6, reversing changes made to 9451885.
1 parent 7303ac6 commit 5e2b390

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

posix.mak

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#
2525
# To build `release` docs:
2626
#
27-
# make -f posix.mak release
27+
# make -f posix.mak RELEASE=1 release
2828
#
2929
# Individual documentation targets
3030
# --------------------------------
@@ -319,7 +319,10 @@ SPEC_ROOT=$(addprefix spec/, \
319319
abi simd betterc)
320320
SPEC_DD=$(addsuffix .dd,$(SPEC_ROOT))
321321

322-
CHANGELOG_FILES:=$(basename $(subst _pre.dd,.dd,$(wildcard changelog/*.dd))) changelog/pending changelog/release-schedule
322+
CHANGELOG_FILES:=$(basename $(subst _pre.dd,.dd,$(wildcard changelog/*.dd))) changelog/release-schedule
323+
ifneq (1,$(RELEASE))
324+
CHANGELOG_FILES+=changelog/pending
325+
endif
323326

324327
MAN_PAGE=docs/man/man1/dmd.1
325328

@@ -344,8 +347,10 @@ PAGES_ROOT=$(SPEC_ROOT) 404 acknowledgements areas-of-d-usage $(ARTICLE_FILES) \
344347

345348
# The contributors listing is dynamically generated
346349
ifneq (1,$(DIFFABLE))
350+
ifneq (1,$(RELEASE))
347351
PAGES_ROOT+=foundation/contributors
348352
endif
353+
endif
349354

350355
TARGETS=$(addsuffix .html,$(PAGES_ROOT))
351356

@@ -360,11 +365,9 @@ ALL_FILES = $(ALL_FILES_BUT_SITEMAP) $W/sitemap.html
360365

361366
all : docs html
362367

363-
# Avoid running additional scripts when building release (tarball)
364-
# docs for the sake of stability and reproducibility.
365-
release : CHANGELOG_FILES:=$(filter-out changelog/pending,$(CHANGELOG_FILES))
366-
release : PAGES_ROOT:=$(filter-out foundation/contributors,$(PAGES_ROOT))
368+
ifeq (1,$(RELEASE))
367369
release : html dmd-release druntime-release phobos-release d-release.tag
370+
endif
368371

369372
docs-latest: dmd-latest druntime-latest phobos-latest apidocs-latest
370373
docs-prerelease: dmd-prerelease druntime-prerelease phobos-prerelease apidocs-prerelease

0 commit comments

Comments
 (0)