Skip to content

Commit 7303ac6

Browse files
authored
Merge pull request #2378 from MartinNowak/fix_enable_release
make relase target independent of RELEASE=1 variable
2 parents 9451885 + f7f0ac8 commit 7303ac6

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

posix.mak

Lines changed: 6 additions & 9 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=1 release
27+
# make -f posix.mak release
2828
#
2929
# Individual documentation targets
3030
# --------------------------------
@@ -319,10 +319,7 @@ 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/release-schedule
323-
ifneq (1,$(RELEASE))
324-
CHANGELOG_FILES+=changelog/pending
325-
endif
322+
CHANGELOG_FILES:=$(basename $(subst _pre.dd,.dd,$(wildcard changelog/*.dd))) changelog/pending changelog/release-schedule
326323

327324
MAN_PAGE=docs/man/man1/dmd.1
328325

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

348345
# The contributors listing is dynamically generated
349346
ifneq (1,$(DIFFABLE))
350-
ifneq (1,$(RELEASE))
351347
PAGES_ROOT+=foundation/contributors
352348
endif
353-
endif
354349

355350
TARGETS=$(addsuffix .html,$(PAGES_ROOT))
356351

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

366361
all : docs html
367362

368-
ifeq (1,$(RELEASE))
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))
369367
release : html dmd-release druntime-release phobos-release d-release.tag
370-
endif
371368

372369
docs-latest: dmd-latest druntime-latest phobos-latest apidocs-latest
373370
docs-prerelease: dmd-prerelease druntime-prerelease phobos-prerelease apidocs-prerelease

0 commit comments

Comments
 (0)