Skip to content

Commit 78e54e8

Browse files
authored
Merge pull request #1889 from wilzbach/move-versions-to-generated
Checkout stable repositories into .generated merged-on-behalf-of: Petar Kirov <[email protected]>
2 parents 04bf20e + 2969c36 commit 78e54e8

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

posix.mak

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,21 +152,21 @@ DPL_DOCS_PATH=dpl-docs
152152
DPL_DOCS=$(DPL_DOCS_PATH)/dpl-docs
153153
REMOTE_DIR[email protected]:data
154154
TMP?=/tmp
155+
GENERATED=.generated
156+
G=$(GENERATED)
155157

156158
# Last released versions
157-
DMD_LATEST_DIR=${DMD_DIR}-${LATEST}
159+
DMD_LATEST_DIR=$G/${DMD_DIR}-${LATEST}
158160
DMD_LATEST=$(DMD_LATEST_DIR)/generated/$(OS)/release/$(MODEL)/dmd
159-
DRUNTIME_LATEST_DIR=${DRUNTIME_DIR}-${LATEST}
160-
PHOBOS_LATEST_DIR=${PHOBOS_DIR}-${LATEST}
161+
DRUNTIME_LATEST_DIR=$G/${DRUNTIME_DIR}-${LATEST}
162+
PHOBOS_LATEST_DIR=$G/${PHOBOS_DIR}-${LATEST}
161163

162164
# Auto-cloning missing directories
163165
$(shell [ ! -d $(DMD_DIR) ] && git clone --depth=1 ${GIT_HOME}/dmd $(DMD_DIR))
164166
$(shell [ ! -d $(DRUNTIME_DIR) ] && git clone --depth=1 ${GIT_HOME}/druntime $(DRUNTIME_DIR))
165167

166168
################################################################################
167169
# Automatically generated directories
168-
GENERATED=.generated
169-
G=$(GENERATED)
170170
PHOBOS_DIR_GENERATED=$(GENERATED)/phobos-prerelease
171171
PHOBOS_LATEST_DIR_GENERATED=$(GENERATED)/phobos-latest
172172
# The assert_writeln_magic tool transforms all source files from Phobos. Hence
@@ -574,9 +574,11 @@ $G/twid_latest.ddoc:
574574
# Git rules
575575
################################################################################
576576

577-
../%-${LATEST} :
577+
# Clone snapshots of the latest official release of all main D repositories
578+
$G/%-${LATEST} :
578579
git clone -b v${LATEST} --depth=1 ${GIT_HOME}/$(notdir $*) $@
579580

581+
# Clone all main D repositories
580582
${DMD_DIR} ${DRUNTIME_DIR} ${PHOBOS_DIR} ${TOOLS_DIR} ${INSTALLER_DIR}:
581583
git clone --depth=1 ${GIT_HOME}/$(notdir $(@F)) $@
582584

@@ -845,7 +847,7 @@ test_dspec: dspec_tester.d $(STABLE_DMD)
845847

846848
test: $(ASSERT_WRITELN_BIN)_test test_dspec test/next_version.sh all
847849
@echo "Searching for trailing whitespace"
848-
@grep -n '[[:blank:]]$$' $$(find . -type f -name "*.dd") ; test $$? -eq 1
850+
@grep -n '[[:blank:]]$$' $$(find . -type f -name "*.dd" | grep -v .generated) ; test $$? -eq 1
849851
@echo "Searching for undefined macros"
850852
@grep -n "UNDEFINED MACRO" $$(find $W -type f -name "*.html" -not -path "$W/phobos/*") ; test $$? -eq 1
851853
@echo "Searching for undefined ddoc"

0 commit comments

Comments
 (0)