Skip to content

Commit 193c642

Browse files
committed
fix release doc build with ENABLE_RELEASE=1
- set ENABLE_RELEASE=1 in release target and rerun makefile - use same ENABLE_RELEASE variable as dmd and create_dmd_release - Need both a target and a variable to be set for the build to work with dlang.org's current makefile architecture (deps in variables). The workaround is messy and separate targets should be used instead of variables that affect file lists.
1 parent f084e35 commit 193c642

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ jobs:
1818
name: Clone DMD + DRuntime + Phobos
1919
- run:
2020
command: ./.circleci/run.sh run-make
21-
name: Run the Makefile in RELEASE=1 mode
21+
name: Make the release target

.circleci/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ run_make()
109109
make -v
110110
111111
# -j1 is used for a better error log
112-
make -f posix.mak -j1 RELEASE=1 DIFFABLE=1 release
112+
make -f posix.mak -j1 DIFFABLE=1 release
113113
}
114114
115115
case $1 in

posix.mak

Lines changed: 7 additions & 5 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
# --------------------------------
@@ -73,7 +73,6 @@
7373
# Commonly used options include:
7474
#
7575
# DIFFABLE=1 Removes inclusion of all dynamic content and timestamps
76-
# RELEASE=1 Release build (needs to be set for the `release` target)
7776
# CSS_MINIFY=1 Minify the CSS via an online service
7877
# DOC_OUTPUT_DIR Folder to build the documentation (default: `web`)
7978
#
@@ -320,7 +319,7 @@ SPEC_ROOT=$(addprefix spec/, \
320319
SPEC_DD=$(addsuffix .dd,$(SPEC_ROOT))
321320

322321
CHANGELOG_FILES:=$(basename $(subst _pre.dd,.dd,$(wildcard changelog/*.dd))) changelog/release-schedule
323-
ifneq (1,$(RELEASE))
322+
ifneq (1,$(ENABLE_RELEASE))
324323
CHANGELOG_FILES+=changelog/pending
325324
endif
326325

@@ -347,7 +346,7 @@ PAGES_ROOT=$(SPEC_ROOT) 404 acknowledgements areas-of-d-usage $(ARTICLE_FILES) \
347346

348347
# The contributors listing is dynamically generated
349348
ifneq (1,$(DIFFABLE))
350-
ifneq (1,$(RELEASE))
349+
ifneq (1,$(ENABLE_RELEASE))
351350
PAGES_ROOT+=foundation/contributors
352351
endif
353352
endif
@@ -365,7 +364,10 @@ ALL_FILES = $(ALL_FILES_BUT_SITEMAP) $W/sitemap.html
365364

366365
all : docs html
367366

368-
ifeq (1,$(RELEASE))
367+
ifneq (1,$(ENABLE_RELEASE))
368+
release :
369+
$(MAKE) -f $(MAKEFILE) ENABLE_RELEASE=1 release
370+
else
369371
release : html dmd-release druntime-release phobos-release d-release.tag
370372
endif
371373

0 commit comments

Comments
 (0)