@@ -24,13 +24,11 @@ PHOBOS_DIR=../phobos
24
24
DRUNTIME_DIR =../druntime
25
25
TOOLS_DIR =../tools
26
26
INSTALLER_DIR =../installer
27
- DUB_DIR =../dub-${DUB_VER}
28
27
29
28
include $(DMD_DIR ) /src/osmodel.mak
30
29
31
30
# External binaries
32
31
DMD =$(DMD_DIR ) /generated/$(OS ) /release/$(MODEL ) /dmd
33
- DUB =${DUB_DIR}/bin/dub
34
32
35
33
# External directories
36
34
DOC_OUTPUT_DIR: =$(PWD ) /web
@@ -65,14 +63,14 @@ PHOBOS_STABLE_FILES_GENERATED := $(subst $(PHOBOS_STABLE_DIR), $(PHOBOS_STABLE_D
65
63
# ###############################################################################
66
64
67
65
# stable dub and dmd versions used to build dpl-docs
68
- DUB_VER =1.1.0
69
66
STABLE_DMD_VER =2.072.2
70
67
STABLE_DMD_ROOT =$(GENERATED ) /stable_dmd-$(STABLE_DMD_VER )
71
68
STABLE_DMD_URL =http://downloads.dlang.org/releases/2.x/$(STABLE_DMD_VER ) /dmd.$(STABLE_DMD_VER ) .$(OS ) .zip
72
- STABLE_DMD =$(STABLE_DMD_ROOT ) /dmd2/$(OS ) /$(if $(filter $(OS ) ,osx) ,bin,bin$(MODEL ) ) /dmd
69
+ STABLE_DMD_BIN_ROOT =$(STABLE_DMD_ROOT ) /dmd2/$(OS ) /$(if $(filter $(OS ) ,osx) ,bin,bin$(MODEL ) )
70
+ STABLE_DMD =$(STABLE_DMD_BIN_ROOT ) /dmd
73
71
STABLE_DMD_CONF =$(STABLE_DMD ) .conf
74
- STABLE_RDMD =$(STABLE_DMD_ROOT ) /dmd2/ $( OS ) / $( if $( filter $( OS ) ,osx) ,bin,bin $( MODEL ) ) /rdmd \
75
- --compiler =$(STABLE_DMD ) -conf= $( STABLE_DMD_CONF )
72
+ STABLE_RDMD =$(STABLE_DMD_BIN_ROOT ) /rdmd --compiler= $( STABLE_DMD ) -conf= $( STABLE_DMD_CONF )
73
+ DUB =$(STABLE_DMD_BIN_ROOT ) /dub
76
74
77
75
# exclude lists
78
76
MOD_EXCLUDES_PRERELEASE =$(addprefix --ex=, gc. rt. core.internal. core.stdc.config core.sys. \
@@ -277,7 +275,7 @@ clean:
277
275
rm -rf $(DOC_OUTPUT_DIR ) ${GENERATED} dpl-docs/.dub
278
276
rm -rf auto dlangspec-consolidated.d $(addprefix dlangspec,.aux .d .dvi .fdb_latexmk .fls .log .out .pdf .tex .txt .verbatim.txt)
279
277
rm -f docs.json docs-prerelease.json dpl-docs/dpl-docs
280
- @echo You should issue manually: rm -rf ${DMD_STABLE_DIR} ${DRUNTIME_STABLE_DIR} ${PHOBOS_STABLE_DIR} ${STABLE_DMD_ROOT} ${DUB_DIR}
278
+ @echo You should issue manually: rm -rf ${DMD_STABLE_DIR} ${DRUNTIME_STABLE_DIR} ${PHOBOS_STABLE_DIR} ${STABLE_DMD_ROOT}
281
279
282
280
RSYNC_FILTER =-f 'P /Usage' -f 'P /.dpl_rewrite*' -f 'P /install.sh*'
283
281
@@ -409,9 +407,6 @@ $G/twid_latest.ddoc:
409
407
../% -${LATEST} :
410
408
git clone -b v${LATEST} --depth=1 ${GIT_HOME} /$(notdir $* ) $@
411
409
412
- ../% -${DUB_VER} :
413
- git clone --depth=1 -b v${DUB_VER} ${GIT_HOME} /$(notdir $* ) $@
414
-
415
410
${DMD_DIR} ${DRUNTIME_DIR} ${PHOBOS_DIR} ${TOOLS_DIR} ${INSTALLER_DIR} :
416
411
git clone --depth=1 ${GIT_HOME} /$(notdir $(@F ) ) $@
417
412
@@ -579,13 +574,13 @@ dpl-docs: ${DUB} ${STABLE_DMD}
579
574
DFLAGS=" $( DPL_DOCS_DFLAGS) " ${DUB} build --root=${DPL_DOCS_PATH} \
580
575
--compiler=${STABLE_DMD}
581
576
582
- ${STABLE_DMD} :
577
+ ${STABLE_DMD_ROOT}/.downloaded :
583
578
mkdir -p ${STABLE_DMD_ROOT}
584
- TMPFILE=$$(mktemp deleteme.XXXXXXXX ) && curl -fsSL ${STABLE_DMD_URL} > ${TMP} /$$ {TMPFILE}.zip && \
585
- unzip -qd ${STABLE_DMD_ROOT} ${TMP} /$$ {TMPFILE}.zip && rm ${TMP} /$$ {TMPFILE}.zip
579
+ TMPFILE=$$(mktemp ${TMP}/dmd-download-deleteme.XXXXXXXX ) && curl -fsSL ${STABLE_DMD_URL} > $$ {TMPFILE}.zip && \
580
+ unzip -qd ${STABLE_DMD_ROOT} $$ {TMPFILE}.zip && rm $$ {TMPFILE}.zip
581
+ touch $@
586
582
587
- ${DUB} : | ${DUB_DIR} ${STABLE_DMD}
588
- cd ${DUB_DIR} && DMD=" $( abspath ${STABLE_DMD} ) " ./build.sh
583
+ ${STABLE_DMD} ${STABLE_RDMD} ${DUB} : ${STABLE_DMD_ROOT}/.downloaded
589
584
590
585
# ###############################################################################
591
586
# chm help files
0 commit comments