Skip to content

Commit 49c7974

Browse files
committed
Use an articles.ddoc file to fix ROOT_DIR
1 parent 0f73c7a commit 49c7974

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

dlang.org.ddoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,10 @@ $(SUBNAV_TEMPLATE
474474
$(ROOT_DIR)articles/templates-revisited.html, Templates Revisited,
475475
$(ROOT_DIR)articles/ctarguments.html, Compile-time Argument Lists,
476476
$(ROOT_DIR)articles/variadic-function-templates.html, Variadic Templates,
477-
$(ROOT_DIR)articles/d-array-article.html, D Slices
477+
$(ROOT_DIR)articles/d-array-article.html, D Slices,
478+
$(ROOT_DIR)articles/cppcontracts.html, D's Contract Programming,
479+
$(ROOT_DIR)articles/template-comparison.html, Template Comparison,
480+
$(ROOT_DIR)articles/dll-linux.html, Writing Shared Libraries
478481
))
479482
)
480483
SUBNAV_FOUNDATION=

posix.mak

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -348,23 +348,24 @@ endif
348348

349349
MAN_PAGE=docs/man/man1/dmd.1
350350

351+
ARTICLE_FILES=$(addprefix articles/, index builtin code_coverage const-faq \
352+
cpptod ctarguments ctod d-array-article d-floating-point \
353+
exception-safe faq hijack intro-to-datetime lazy-evaluation \
354+
migrate-to-shared mixin pretod rationale regular-expression \
355+
safed templates-revisited variadic-function-templates warnings \
356+
cppcontracts template-comparison dll-linux \
357+
)
358+
351359
# Website root filenames. They have extension .dd in the source
352360
# and .html in the generated HTML. Save for the expansion of
353361
# $(SPEC_ROOT), the list is sorted alphabetically.
354-
PAGES_ROOT=$(SPEC_ROOT) 404 acknowledgements areas-of-d-usage \
362+
PAGES_ROOT=$(SPEC_ROOT) 404 acknowledgements areas-of-d-usage $(ARTICLE_FILES) \
355363
ascii-table bugstats builtin $(CHANGELOG_FILES) community comparison concepts \
356364
cppcontracts D1toD2 deprecate dmd dmd-freebsd dmd-linux dmd-osx dmd-windows \
357365
documentation download dstyle forum-template gpg_keys glossary \
358366
gsoc2011 gsoc2012 gsoc2012-template howto-promote htod index install \
359367
menu mixin orgs-using-d overview rationale rdmd resources search tuple wc windbg \
360368
$(addprefix foundation/, index about donate sponsors upb-scholarship)
361-
$(addprefix articles/, index.dd builtin.dd code_coverage.dd const-faq.dd
362-
cpptod.dd ctarguments.dd ctod.dd d-array-article.dd d-floating-point.dd \
363-
exception-safe.dd faq.dd hijack.dd intro-to-datetime.dd lazy-evaluation.dd \
364-
migrate-to-shared.dd mixin.dd pretod.dd rationale.dd regular-expression.dd \
365-
safed.dd templates-revisited.dd variadic-function-templates.dd warnings.dd \
366-
cppcontracts template-comparison dll-linux
367-
)
368369

369370
# The contributors listing is dynamically generated
370371
ifneq (1,$(DIFFABLE))
@@ -478,6 +479,9 @@ $W/404.html : 404.dd $(DDOC) $(DMD)
478479
$(DOC_OUTPUT_DIR)/contributors.html: contributors.dd $G/contributors_list.ddoc $(DDOC) $(DMD)
479480
$(DMD) -conf= -c -o- -Df$@ $(DDOC) $(word 2, $^) $<
480481

482+
$W/articles/%.html : articles/%.dd $(DDOC) $(DMD) $(DDOC_BIN) articles/articles.ddoc
483+
$(DDOC_BIN) --compiler=$(DMD) -conf= -c -o- -Df$@ $(DDOC) $< articles/articles.ddoc
484+
481485
$W/foundation/%.html : foundation/%.dd $(DDOC) $(DMD) $(DDOC_BIN) foundation/foundation.ddoc
482486
$(DDOC_BIN) --compiler=$(DMD) -conf= -c -o- -Df$@ $(DDOC) $< foundation/foundation.ddoc
483487

0 commit comments

Comments
 (0)