Skip to content

Commit 95cd00c

Browse files
committed
Remove auto-cloning of Phobos on start
1 parent 6692bbe commit 95cd00c

File tree

1 file changed

+8
-18
lines changed

1 file changed

+8
-18
lines changed

posix.mak

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -181,17 +181,8 @@ PHOBOS_LATEST_DIR=$G/phobos-${LATEST}
181181
# Auto-cloning missing directories
182182
$(shell [ ! -d $(DMD_DIR) ] && git clone --depth=1 ${GIT_HOME}/dmd $(DMD_DIR))
183183
$(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-
################################################################################
184+
$(shell [ ! -d $(PHOBOS_DIR) ] && git clone --depth=1 ${GIT_HOME}/phobos $(PHOBOS_DIR))
185+
$(shell [ ! -d $(TOOLS_DIR) ] && git clone --depth=1 ${GIT_HOME}/tools $(TOOLS_DIR))
195186

196187
# stable dub and dmd versions used to build dpl-docs
197188
STABLE_DMD_VER=2.078.2
@@ -693,20 +684,20 @@ $W/phobos-prerelease/object.verbatim : $(DMD) $G/changelog/next-version
693684
################################################################################
694685

695686
.PHONY: phobos-prerelease
696-
phobos-prerelease : ${PHOBOS_FILES} druntime-target $(STD_DDOC_PRERELEASE) $(DDOC_BIN) $(DMD) \
687+
phobos-prerelease : druntime-target $(STD_DDOC_PRERELEASE) $(DDOC_BIN) $(DMD) \
697688
$G/changelog/next-version
698689
$(MAKE) --directory=$(PHOBOS_DIR) -f posix.mak html $(DDOC_VARS_PRERELEASE_HTML) \
699690
DMD="$(abspath $(DDOC_BIN)) --compiler=$(abspath $(DMD))"
700691

701-
phobos-release : ${PHOBOS_FILES} druntime-target $(STD_DDOC_RELEASE) $(DDOC_BIN) $(DMD)
692+
phobos-release : druntime-target $(STD_DDOC_RELEASE) $(DDOC_BIN) $(DMD)
702693
$(MAKE) --directory=$(PHOBOS_DIR) -f posix.mak html $(DDOC_VARS_RELEASE_HTML) \
703694
DMD="$(abspath $(DDOC_BIN)) --compiler=$(abspath $(DMD))"
704695

705-
phobos-latest : ${PHOBOS_LATEST_FILES} druntime-latest-target $(STD_DDOC_LATEST) $(DDOC_BIN) $(DMD_LATEST)
696+
phobos-latest : druntime-latest-target $(STD_DDOC_LATEST) $(DDOC_BIN) $(DMD_LATEST)
706697
$(MAKE) --directory=$(PHOBOS_LATEST_DIR) -f posix.mak html $(DDOC_VARS_LATEST_HTML) \
707698
DMD="$(abspath $(DDOC_BIN)) --compiler=$(abspath $(DMD_LATEST))"
708699

709-
phobos-prerelease-verbatim : ${PHOBOS_FILES} druntime-target \
700+
phobos-prerelease-verbatim : druntime-target \
710701
$W/phobos-prerelease/index.verbatim
711702
$W/phobos-prerelease/index.verbatim : verbatim.ddoc \
712703
$W/phobos-prerelease/object.verbatim \
@@ -762,7 +753,7 @@ else
762753
endif
763754

764755
$G/docs-latest.json : ${DMD_LATEST} ${DMD_LATEST_DIR} \
765-
${DRUNTIME_LATEST_DIR} ${PHOBOS_LATEST_FILES} | dpl-docs
756+
${DRUNTIME_LATEST_DIR} | dpl-docs
766757
# remove this after https://github.com/dlang/dmd/pull/7513 has been merged
767758
if [ -f $(DMD_LATEST_DIR)/src/*/objc_glue_stubs.d ] ; then \
768759
DMD_EXCLUDE_LATEST_BASH="-e /objc_glue.d/d"; \
@@ -780,8 +771,7 @@ $G/docs-latest.json : ${DMD_LATEST} ${DMD_LATEST_DIR} \
780771
--only-documented $(MOD_EXCLUDES_LATEST)
781772
rm -f $G/.latest-files.txt $G/.latest-dummy.html
782773

783-
$G/docs-prerelease.json : ${DMD} ${DMD_DIR} ${DRUNTIME_DIR} \
784-
${PHOBOS_FILES} | dpl-docs
774+
$G/docs-prerelease.json : ${DMD} ${DMD_DIR} ${DRUNTIME_DIR} | dpl-docs
785775
# remove this after https://github.com/dlang/dmd/pull/7513 has been merged
786776
if [ -f $(DMD_DIR)/src/*/objc_glue_stubs.d ] ; then \
787777
DMD_EXCLUDE_PRERELEASE="-e /objc_glue.d/d"; \

0 commit comments

Comments
 (0)