@@ -155,6 +155,8 @@ TOOLS_DIR=../tools
155
155
INSTALLER_DIR =../installer
156
156
DUB_DIR =../dub
157
157
158
+ # Auto-cloning missing directories
159
+ $(shell [ ! -d $(DMD_DIR) ] && git clone --depth=1 ${GIT_HOME}/dmd $(DMD_DIR))
158
160
include $(DMD_DIR ) /src/osmodel.mak
159
161
160
162
# External binaries
@@ -178,21 +180,6 @@ DMD_LATEST=$(DMD_LATEST_DIR)/generated/$(OS)/release/$(MODEL)/dmd
178
180
DRUNTIME_LATEST_DIR =$G/druntime-${LATEST}
179
181
PHOBOS_LATEST_DIR =$G/phobos-${LATEST}
180
182
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
-
196
183
# stable dub and dmd versions used to build dpl-docs
197
184
STABLE_DMD_VER =2.078.2
198
185
STABLE_DMD_ROOT =$(GENERATED ) /stable_dmd-$(STABLE_DMD_VER )
@@ -693,20 +680,20 @@ $W/phobos-prerelease/object.verbatim : $(DMD) $G/changelog/next-version
693
680
# ###############################################################################
694
681
695
682
.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 ) \
697
684
$G /changelog/next-version
698
685
$(MAKE ) --directory=$(PHOBOS_DIR ) -f posix.mak html $(DDOC_VARS_PRERELEASE_HTML ) \
699
686
DMD=" $( abspath $( DDOC_BIN) ) --compiler=$( abspath $( DMD) ) "
700
687
701
- phobos-release : ${PHOBOS_FILES} druntime-target $(STD_DDOC_RELEASE ) $(DDOC_BIN ) $(DMD )
688
+ phobos-release : druntime-target $(STD_DDOC_RELEASE ) $(DDOC_BIN ) $(DMD )
702
689
$(MAKE ) --directory=$(PHOBOS_DIR ) -f posix.mak html $(DDOC_VARS_RELEASE_HTML ) \
703
690
DMD=" $( abspath $( DDOC_BIN) ) --compiler=$( abspath $( DMD) ) "
704
691
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 )
706
693
$(MAKE ) --directory=$(PHOBOS_LATEST_DIR ) -f posix.mak html $(DDOC_VARS_LATEST_HTML ) \
707
694
DMD=" $( abspath $( DDOC_BIN) ) --compiler=$( abspath $( DMD_LATEST) ) "
708
695
709
- phobos-prerelease-verbatim : ${PHOBOS_FILES} druntime-target \
696
+ phobos-prerelease-verbatim : druntime-target \
710
697
$W /phobos-prerelease/index.verbatim
711
698
$W/phobos-prerelease/index.verbatim : verbatim.ddoc \
712
699
$W /phobos-prerelease/object.verbatim \
762
749
endif
763
750
764
751
$G/docs-latest.json : ${DMD_LATEST} ${DMD_LATEST_DIR} \
765
- ${DRUNTIME_LATEST_DIR} ${PHOBOS_LATEST_FILES} | dpl-docs
752
+ ${DRUNTIME_LATEST_DIR} | dpl-docs
766
753
# remove this after https://github.com/dlang/dmd/pull/7513 has been merged
767
754
if [ -f $( DMD_LATEST_DIR) /src/* /objc_glue_stubs.d ] ; then \
768
755
DMD_EXCLUDE_LATEST_BASH=" -e /objc_glue.d/d" ; \
@@ -780,8 +767,7 @@ $G/docs-latest.json : ${DMD_LATEST} ${DMD_LATEST_DIR} \
780
767
--only-documented $(MOD_EXCLUDES_LATEST )
781
768
rm -f $G /.latest-files.txt $G /.latest-dummy.html
782
769
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
785
771
# remove this after https://github.com/dlang/dmd/pull/7513 has been merged
786
772
if [ -f $( DMD_DIR) /src/* /objc_glue_stubs.d ] ; then \
787
773
DMD_EXCLUDE_PRERELEASE=" -e /objc_glue.d/d" ; \
0 commit comments