Skip to content

Commit 7b8b5d8

Browse files
CyberShadowCyberShadow
authored
Merge pull request #1682 from CyberShadow/pull-20170607-233420
Revert some PRs, fix master
2 parents 333c99e + f0d4325 commit 7b8b5d8

File tree

2 files changed

+36
-38
lines changed

2 files changed

+36
-38
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ css/cssmenu.css
3232
*.min.*
3333

3434
deleteme.*
35+
docs-prerelease.json
36+
docs.json
3537
.dub/
3638
dpl-docs/dpl-docs
3739
modlist-release.ddoc

‎posix.mak‎

Lines changed: 34 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,13 @@ TMP?=/tmp
4040

4141
# Last released versions
4242
DMD_STABLE_DIR=${DMD_DIR}-${LATEST}
43-
DMD_STABLE=$(DMD_STABLE_DIR)/generated/$(OS)/release/$(MODEL)/dmd
43+
DMD_REL=$(DMD_STABLE_DIR)/src/dmd
4444
DRUNTIME_STABLE_DIR=${DRUNTIME_DIR}-${LATEST}
4545
PHOBOS_STABLE_DIR=${PHOBOS_DIR}-${LATEST}
4646

4747
################################################################################
4848
# Automatically generated directories
4949
GENERATED=.generated
50-
G=$(GENERATED)
5150
PHOBOS_DIR_GENERATED=$(GENERATED)/phobos-prerelease
5251
PHOBOS_STABLE_DIR_GENERATED=$(GENERATED)/phobos-release
5352
# The assert_writeln_magic tool transforms all source files from Phobos. Hence
@@ -219,10 +218,10 @@ ${GENERATED}/${LATEST}.ddoc :
219218
mkdir -p $(dir $@)
220219
echo "LATEST=${LATEST}" >$@
221220

222-
${GENERATED}/modlist-${LATEST}.ddoc : modlist.d ${STABLE_DMD} $(DRUNTIME_STABLE_DIR) $(PHOBOS_STABLE_DIR) $(DMD_STABLE_DIR)
221+
${GENERATED}/modlist-${LATEST}.ddoc : modlist.d ${STABLE_DMD} $(DRUNTIME_STABLE_DIR) $(PHOBOS_STABLE_DIR)
223222
mkdir -p $(dir $@)
224-
$(STABLE_RDMD) modlist.d $(DRUNTIME_STABLE_DIR) $(PHOBOS_STABLE_DIR) $(DMD_STABLE_DIR) $(MOD_EXCLUDES_RELEASE) \
225-
$(addprefix --dump , object std etc core ddmd) >$@
223+
$(STABLE_RDMD) modlist.d $(DRUNTIME_STABLE_DIR) $(PHOBOS_STABLE_DIR) $(MOD_EXCLUDES_RELEASE) \
224+
$(addprefix --dump , object std etc core) >$@
226225

227226
${GENERATED}/modlist-prerelease.ddoc : modlist.d ${STABLE_DMD} $(DRUNTIME_DIR) $(PHOBOS_DIR)
228227
mkdir -p $(dir $@)
@@ -371,11 +370,11 @@ ${DMD_DIR} ${DRUNTIME_DIR} ${PHOBOS_DIR} ${TOOLS_DIR} ${INSTALLER_DIR}:
371370
$(DMD) : ${DMD_DIR}
372371
${MAKE} --directory=${DMD_DIR}/src -f posix.mak AUTO_BOOTSTRAP=1
373372

374-
$(DMD_STABLE) : ${DMD_STABLE_DIR}
373+
$(DMD_REL) : ${DMD_STABLE_DIR}
375374
${MAKE} --directory=${DMD_STABLE_DIR}/src -f posix.mak AUTO_BOOTSTRAP=1
376375

377376
dmd-release : $(STD_DDOC) $(DMD_DIR) $(DMD)
378-
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_STABLE_DIR) -f posix.mak html \
377+
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_DIR) -f posix.mak html \
379378
STDDOC="$(addprefix `pwd`/, $(STD_DDOC))" \
380379
DOC_OUTPUT_DIR="${DOC_OUTPUT_DIR}/phobos" \
381380
DOCSRC="$(realpath .)"
@@ -407,9 +406,9 @@ druntime-prerelease : ${DRUNTIME_DIR} $(DMD) $(STD_DDOC_PRE)
407406
DOCDIR=${DOC_OUTPUT_DIR}/phobos-prerelease \
408407
DOCFMT="$(addprefix `pwd`/, $(STD_DDOC_PRE))"
409408

410-
druntime-release : ${DRUNTIME_STABLE_DIR} $(DMD_STABLE) $(STD_DDOC)
409+
druntime-release : ${DRUNTIME_STABLE_DIR} $(DMD_REL) $(STD_DDOC)
411410
${MAKE} --directory=${DRUNTIME_STABLE_DIR} -f posix.mak target doc \
412-
DMD=$(DMD_STABLE) \
411+
DMD=$(DMD_REL) \
413412
DOCDIR=${DOC_OUTPUT_DIR}/phobos \
414413
DOCFMT="$(addprefix `pwd`/, $(STD_DDOC))"
415414

@@ -439,16 +438,17 @@ phobos-prerelease : ${PHOBOS_FILES_GENERATED} $(STD_DDOC_PRE) druntime-prereleas
439438
VERSION="$(realpath ${DMD_DIR}/VERSION)" \
440439
html
441440

442-
phobos-release : ${PHOBOS_STABLE_FILES_GENERATED} $(DMD_STABLE) $(STD_DDOC) \
443-
druntime-release dmd-release
441+
phobos-release : ${PHOBOS_STABLE_FILES_GENERATED} $(DMD_REL) $(STD_DDOC) \
442+
druntime-release
444443
${MAKE} --directory=${PHOBOS_STABLE_DIR_GENERATED} -f posix.mak \
445-
DMD=$(realpath ${DMD_STABLE}) \
444+
DMD=$(DMD_REL) \
446445
DRUNTIME_PATH=${DRUNTIME_STABLE_DIR} \
447446
DOC_OUTPUT_DIR=${DOC_OUTPUT_DIR}/phobos \
448447
STDDOC="$(addprefix `pwd`/, $(STD_DDOC))" \
449448
DRUNTIME_PATH="$(realpath ${DRUNTIME_DIR})" \
449+
DMD="$(realpath ${DMD})" \
450450
DOCSRC="$(realpath .)" \
451-
VERSION="$(realpath ${DMD_STABLE_DIR}/VERSION)" \
451+
VERSION="$(realpath ${DMD_DIR}/VERSION)" \
452452
html
453453

454454
phobos-prerelease-verbatim : ${PHOBOS_FILES_GENERATED} ${DOC_OUTPUT_DIR}/phobos-prerelease/index.verbatim
@@ -473,24 +473,24 @@ ${DOC_OUTPUT_DIR}/phobos-prerelease/index.verbatim : verbatim.ddoc \
473473

474474
apidocs-prerelease : ${DOC_OUTPUT_DIR}/library-prerelease/sitemap.xml ${DOC_OUTPUT_DIR}/library-prerelease/.htaccess
475475
apidocs-release : ${DOC_OUTPUT_DIR}/library/sitemap.xml ${DOC_OUTPUT_DIR}/library/.htaccess
476-
apidocs-serve : $G/docs-prerelease.json
476+
apidocs-serve : docs-prerelease.json
477477
${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 \
478478
--override-macros=std-ddox-override.ddoc --package-order=std \
479-
--git-target=master --web-file-dir=. $<
479+
--git-target=master --web-file-dir=. docs-prerelease.json
480480

481-
${DOC_OUTPUT_DIR}/library-prerelease/sitemap.xml : $G/docs-prerelease.json
481+
${DOC_OUTPUT_DIR}/library-prerelease/sitemap.xml : docs-prerelease.json
482482
@mkdir -p $(dir $@)
483483
${DPL_DOCS} generate-html --file-name-style=lowerUnderscored --std-macros=html.ddoc --std-macros=dlang.org.ddoc --std-macros=std.ddoc --std-macros=macros.ddoc --std-macros=std-ddox.ddoc \
484484
--override-macros=std-ddox-override.ddoc --package-order=std \
485485
--git-target=master $(DPL_DOCS_PATH_RUN_FLAGS) \
486-
$< ${DOC_OUTPUT_DIR}/library-prerelease
486+
docs-prerelease.json ${DOC_OUTPUT_DIR}/library-prerelease
487487

488-
${DOC_OUTPUT_DIR}/library/sitemap.xml : $G/docs.json
488+
${DOC_OUTPUT_DIR}/library/sitemap.xml : docs.json
489489
@mkdir -p $(dir $@)
490490
${DPL_DOCS} generate-html --file-name-style=lowerUnderscored --std-macros=html.ddoc --std-macros=dlang.org.ddoc --std-macros=std.ddoc --std-macros=macros.ddoc --std-macros=std-ddox.ddoc \
491491
--override-macros=std-ddox-override.ddoc --package-order=std \
492492
--git-target=v${LATEST} $(DPL_DOCS_PATH_RUN_FLAGS) \
493-
$< ${DOC_OUTPUT_DIR}/library
493+
docs.json ${DOC_OUTPUT_DIR}/library
494494

495495
${DOC_OUTPUT_DIR}/library/.htaccess : dpl_release_htaccess
496496
@mkdir -p $(dir $@)
@@ -507,40 +507,36 @@ else
507507
DMD_EXCLUDE += -e /scanmach/d -e /libmach/d
508508
endif
509509

510-
$G/docs.json : ${DMD} ${DMD_STABLE} ${DMD_STABLE_DIR} ${DRUNTIME_STABLE_DIR} \
510+
docs.json : ${DMD_REL} ${DRUNTIME_STABLE_DIR} \
511511
${PHOBOS_STABLE_FILES_GENERATED} | dpl-docs
512-
find ${DMD_STABLE_DIR}/src -name '*.d' | \
513-
sed -e /mscoff/d -e /objc_glue.d/d -e /objc.d/d ${DMD_EXCLUDE} \
514-
> $G/.release-files.txt
515512
find ${DRUNTIME_STABLE_DIR}/src -name '*.d' | \
516-
sed -e /unittest.d/d -e /gcstub/d >> $G/.release-files.txt
513+
sed -e /unittest.d/d -e /gcstub/d > .release-files.txt
517514
find ${PHOBOS_STABLE_DIR_GENERATED} -name '*.d' | \
518-
sed -e /unittest.d/d -e /windows/d | sort >> $G/.release-files.txt
519-
${DMD_STABLE} -J$(DMD_STABLE_DIR)/res -J$(dir $(DMD_STABLE)) -c -o- -version=CoreDdoc \
520-
-version=MARS -version=CoreDdoc -version=StdDdoc -Df$G/.release-dummy.html \
521-
-Xf$@ -I${PHOBOS_STABLE_DIR_GENERATED} @$G/.release-files.txt
522-
${DPL_DOCS} filter $@ --min-protection=Protected \
515+
sed -e /unittest.d/d -e /windows/d | sort >> .release-files.txt
516+
${DMD_REL} -c -o- -version=CoreDdoc -version=StdDdoc -Df.release-dummy.html \
517+
-Xfdocs.json -I${PHOBOS_STABLE_DIR_GENERATED} @.release-files.txt
518+
${DPL_DOCS} filter docs.json --min-protection=Protected \
523519
--only-documented $(MOD_EXCLUDES_PRERELEASE)
524-
rm $G/.release-files.txt $G/.release-dummy.html
520+
rm .release-files.txt .release-dummy.html
525521

526522
# DDox tries to generate the docs for all `.d` files. However for dmd this is tricky,
527523
# because the `{mach, elf, mscoff}` are platform dependent.
528524
# Thus the need to exclude these files (and the `objc_glue.d` file).
529-
$G/docs-prerelease.json : ${DMD} ${DMD_DIR} ${DRUNTIME_DIR} \
525+
docs-prerelease.json : ${DMD} ${DMD_DIR} ${DRUNTIME_DIR} \
530526
${PHOBOS_FILES_GENERATED} | dpl-docs
531527
find ${DMD_DIR}/src -name '*.d' | \
532528
sed -e /mscoff/d -e /objc_glue.d/d ${DMD_EXCLUDE} \
533-
> $G/.prerelease-files.txt
529+
> .prerelease-files.txt
534530
find ${DRUNTIME_DIR}/src -name '*.d' | sed -e '/gcstub/d' \
535-
-e /unittest/d >> $G/.prerelease-files.txt
531+
-e /unittest/d >> .prerelease-files.txt
536532
find ${PHOBOS_DIR_GENERATED} -name '*.d' | sed -e /unittest.d/d \
537-
-e /windows/d | sort >> $G/.prerelease-files.txt
533+
-e /windows/d | sort >> .prerelease-files.txt
538534
${DMD} -J$(DMD_DIR)/res -J$(dir $(DMD)) -c -o- -version=MARS -version=CoreDdoc \
539-
-version=StdDdoc -Df$G/.prerelease-dummy.html \
540-
-Xf$@ -I${PHOBOS_DIR_GENERATED} @$G/.prerelease-files.txt
541-
${DPL_DOCS} filter $@ --min-protection=Protected \
535+
-version=StdDdoc -Df.prerelease-dummy.html \
536+
-Xfdocs-prerelease.json -I${PHOBOS_DIR_GENERATED} @.prerelease-files.txt
537+
${DPL_DOCS} filter docs-prerelease.json --min-protection=Protected \
542538
--only-documented $(MOD_EXCLUDES_RELEASE)
543-
rm $G/.prerelease-files.txt $G/.prerelease-dummy.html
539+
rm .prerelease-files.txt .prerelease-dummy.html
544540

545541
################################################################################
546542
# binary targets for DDOX

0 commit comments

Comments
 (0)