@@ -155,6 +155,8 @@ TOOLS_DIR=../tools
155155INSTALLER_DIR =../installer
156156DUB_DIR =../dub
157157
158+ # Auto-cloning missing directories
159+ $(shell [ ! -d $(DMD_DIR) ] && git clone --depth=1 ${GIT_HOME}/dmd $(DMD_DIR))
158160include $(DMD_DIR ) /src/osmodel.mak
159161
160162# External binaries
@@ -178,21 +180,6 @@ DMD_LATEST=$(DMD_LATEST_DIR)/generated/$(OS)/release/$(MODEL)/dmd
178180DRUNTIME_LATEST_DIR =$G/druntime-${LATEST}
179181PHOBOS_LATEST_DIR =$G/phobos-${LATEST}
180182
181- # Auto-cloning missing directories
182- $(shell [ ! -d $(DMD_DIR) ] && git clone --depth=1 ${GIT_HOME}/dmd $(DMD_DIR))
183- $(shell [ ! -d $(DRUNTIME_DIR) ] && git clone --depth=1 ${GIT_HOME}/druntime $(DRUNTIME_DIR))
184-
185- # ###############################################################################
186- # Automatically clone Phobos
187- PHOBOS_FILES := $(shell find $(PHOBOS_DIR ) -name '* .d' -o -name '* .mak' -o -name '* .ddoc')
188- ifndef RELEASE
189- # TODO: should be replaced by make targets
190- $(shell [ ! -d $(PHOBOS_DIR) ] && git clone --depth=1 ${GIT_HOME}/phobos $(PHOBOS_DIR))
191- $(shell [ ! -d $(PHOBOS_LATEST_DIR) ] && git clone -b v${LATEST} --depth=1 ${GIT_HOME}/phobos $(PHOBOS_LATEST_DIR))
192- PHOBOS_LATEST_FILES := $(shell find $(PHOBOS_LATEST_DIR ) -name '* .d' -o -name '* .mak' -o -name '* .ddoc')
193- endif
194- # ###############################################################################
195-
196183# stable dub and dmd versions used to build dpl-docs
197184STABLE_DMD_VER =2.078.2
198185STABLE_DMD_ROOT =$(GENERATED ) /stable_dmd-$(STABLE_DMD_VER )
@@ -693,20 +680,20 @@ $W/phobos-prerelease/object.verbatim : $(DMD) $G/changelog/next-version
693680# ###############################################################################
694681
695682.PHONY : phobos-prerelease
696- phobos-prerelease : ${PHOBOS_FILES} druntime-target $(STD_DDOC_PRERELEASE ) $(DDOC_BIN ) $(DMD ) \
683+ phobos-prerelease : druntime-target $(STD_DDOC_PRERELEASE ) $(DDOC_BIN ) $(DMD ) \
697684 $G /changelog/next-version
698685 $(MAKE ) --directory=$(PHOBOS_DIR ) -f posix.mak html $(DDOC_VARS_PRERELEASE_HTML ) \
699686 DMD=" $( abspath $( DDOC_BIN) ) --compiler=$( abspath $( DMD) ) "
700687
701- phobos-release : ${PHOBOS_FILES} druntime-target $(STD_DDOC_RELEASE ) $(DDOC_BIN ) $(DMD )
688+ phobos-release : druntime-target $(STD_DDOC_RELEASE ) $(DDOC_BIN ) $(DMD )
702689 $(MAKE ) --directory=$(PHOBOS_DIR ) -f posix.mak html $(DDOC_VARS_RELEASE_HTML ) \
703690 DMD=" $( abspath $( DDOC_BIN) ) --compiler=$( abspath $( DMD) ) "
704691
705- phobos-latest : ${PHOBOS_LATEST_FILES} druntime-latest-target $(STD_DDOC_LATEST ) $(DDOC_BIN ) $(DMD_LATEST )
692+ phobos-latest : druntime-latest-target $(STD_DDOC_LATEST ) $(DDOC_BIN ) $(DMD_LATEST )
706693 $(MAKE ) --directory=$(PHOBOS_LATEST_DIR ) -f posix.mak html $(DDOC_VARS_LATEST_HTML ) \
707694 DMD=" $( abspath $( DDOC_BIN) ) --compiler=$( abspath $( DMD_LATEST) ) "
708695
709- phobos-prerelease-verbatim : ${PHOBOS_FILES} druntime-target \
696+ phobos-prerelease-verbatim : druntime-target \
710697 $W /phobos-prerelease/index.verbatim
711698$W/phobos-prerelease/index.verbatim : verbatim.ddoc \
712699 $W /phobos-prerelease/object.verbatim \
762749endif
763750
764751$G/docs-latest.json : ${DMD_LATEST} ${DMD_LATEST_DIR} \
765- ${DRUNTIME_LATEST_DIR} ${PHOBOS_LATEST_FILES} | dpl-docs
752+ ${DRUNTIME_LATEST_DIR} | dpl-docs
766753 # remove this after https://github.com/dlang/dmd/pull/7513 has been merged
767754 if [ -f $( DMD_LATEST_DIR) /src/* /objc_glue_stubs.d ] ; then \
768755 DMD_EXCLUDE_LATEST_BASH=" -e /objc_glue.d/d" ; \
@@ -780,8 +767,7 @@ $G/docs-latest.json : ${DMD_LATEST} ${DMD_LATEST_DIR} \
780767 --only-documented $(MOD_EXCLUDES_LATEST )
781768 rm -f $G /.latest-files.txt $G /.latest-dummy.html
782769
783- $G/docs-prerelease.json : ${DMD} ${DMD_DIR} ${DRUNTIME_DIR} \
784- ${PHOBOS_FILES} | dpl-docs
770+ $G/docs-prerelease.json : ${DMD} ${DMD_DIR} ${DRUNTIME_DIR} | dpl-docs
785771 # remove this after https://github.com/dlang/dmd/pull/7513 has been merged
786772 if [ -f $( DMD_DIR) /src/* /objc_glue_stubs.d ] ; then \
787773 DMD_EXCLUDE_PRERELEASE=" -e /objc_glue.d/d" ; \
0 commit comments