Skip to content

Commit 7e3b118

Browse files
authored
Merge pull request #1670 from wilzbach/rename-dmd-rel
Rename DMD_REL to DMD_STABLE merged-on-behalf-of: Vladimir Panteleev <github@thecybershadow.net>
2 parents 7e86ce7 + 353c407 commit 7e3b118

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

posix.mak

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ TMP?=/tmp
4040

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

@@ -369,7 +369,7 @@ ${DMD_DIR} ${DRUNTIME_DIR} ${PHOBOS_DIR} ${TOOLS_DIR} ${INSTALLER_DIR}:
369369
$(DMD) : ${DMD_DIR}
370370
${MAKE} --directory=${DMD_DIR}/src -f posix.mak AUTO_BOOTSTRAP=1
371371

372-
$(DMD_REL) : ${DMD_STABLE_DIR}
372+
$(DMD_STABLE) : ${DMD_STABLE_DIR}
373373
${MAKE} --directory=${DMD_STABLE_DIR}/src -f posix.mak AUTO_BOOTSTRAP=1
374374

375375
dmd-release : $(STD_DDOC) $(DMD_DIR) $(DMD)
@@ -405,9 +405,9 @@ druntime-prerelease : ${DRUNTIME_DIR} $(DMD) $(STD_DDOC_PRE)
405405
DOCDIR=${DOC_OUTPUT_DIR}/phobos-prerelease \
406406
DOCFMT="$(addprefix `pwd`/, $(STD_DDOC_PRE))"
407407

408-
druntime-release : ${DRUNTIME_STABLE_DIR} $(DMD_REL) $(STD_DDOC)
408+
druntime-release : ${DRUNTIME_STABLE_DIR} $(DMD_STABLE) $(STD_DDOC)
409409
${MAKE} --directory=${DRUNTIME_STABLE_DIR} -f posix.mak target doc \
410-
DMD=$(DMD_REL) \
410+
DMD=$(DMD_STABLE) \
411411
DOCDIR=${DOC_OUTPUT_DIR}/phobos \
412412
DOCFMT="$(addprefix `pwd`/, $(STD_DDOC))"
413413

@@ -437,10 +437,10 @@ phobos-prerelease : ${PHOBOS_FILES_GENERATED} $(STD_DDOC_PRE) druntime-prereleas
437437
VERSION="$(realpath ${DMD_DIR}/VERSION)" \
438438
html
439439

440-
phobos-release : ${PHOBOS_STABLE_FILES_GENERATED} $(DMD_REL) $(STD_DDOC) \
440+
phobos-release : ${PHOBOS_STABLE_FILES_GENERATED} $(DMD_STABLE) $(STD_DDOC) \
441441
druntime-release dmd-release
442442
${MAKE} --directory=${PHOBOS_STABLE_DIR_GENERATED} -f posix.mak \
443-
DMD=$(realpath ${DMD_REL}) \
443+
DMD=$(realpath ${DMD_STABLE}) \
444444
DRUNTIME_PATH=${DRUNTIME_STABLE_DIR} \
445445
DOC_OUTPUT_DIR=${DOC_OUTPUT_DIR}/phobos \
446446
STDDOC="$(addprefix `pwd`/, $(STD_DDOC))" \
@@ -505,7 +505,7 @@ else
505505
DMD_EXCLUDE += -e /scanmach/d -e /libmach/d
506506
endif
507507

508-
$G/docs.json : ${DMD} ${DMD_REL} ${DMD_STABLE_DIR} ${DRUNTIME_STABLE_DIR} \
508+
$G/docs.json : ${DMD} ${DMD_STABLE} ${DMD_STABLE_DIR} ${DRUNTIME_STABLE_DIR} \
509509
${PHOBOS_STABLE_FILES_GENERATED} | dpl-docs
510510
find ${DMD_STABLE_DIR}/src -name '*.d' | \
511511
sed -e /mscoff/d -e /objc_glue.d/d -e /objc.d/d ${DMD_EXCLUDE} \
@@ -514,7 +514,7 @@ $G/docs.json : ${DMD} ${DMD_REL} ${DMD_STABLE_DIR} ${DRUNTIME_STABLE_DIR} \
514514
sed -e /unittest.d/d -e /gcstub/d >> $G/.release-files.txt
515515
find ${PHOBOS_STABLE_DIR_GENERATED} -name '*.d' | \
516516
sed -e /unittest.d/d -e /windows/d | sort >> $G/.release-files.txt
517-
${DMD_REL} -J$(DMD_STABLE_DIR)/res -J$(dir $(DMD_REL)) -c -o- -version=CoreDdoc \
517+
${DMD_STABLE} -J$(DMD_STABLE_DIR)/res -J$(dir $(DMD_STABLE)) -c -o- -version=CoreDdoc \
518518
-version=MARS -version=CoreDdoc -version=StdDdoc -Df$G/.release-dummy.html \
519519
-Xf$@ -I${PHOBOS_STABLE_DIR_GENERATED} @$G/.release-files.txt
520520
${DPL_DOCS} filter $@ --min-protection=Protected \

0 commit comments

Comments
 (0)