Skip to content

Commit 0b304a7

Browse files
wilzbachwilzbach
committed
s/_LATEST/_STABLE/g
1 parent 8b1e427 commit 0b304a7

File tree

1 file changed

+49
-49
lines changed

1 file changed

+49
-49
lines changed

‎posix.mak

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@ GENERATED=.generated
159159
G=$(GENERATED)
160160

161161
# Last released versions
162-
DMD_LATEST_DIR=$G/dmd-${LATEST}
163-
DMD_LATEST=$(DMD_LATEST_DIR)/generated/$(OS)/release/$(MODEL)/dmd
164-
DRUNTIME_LATEST_DIR=$G/druntime-${LATEST}
165-
PHOBOS_LATEST_DIR=$G/phobos-${LATEST}
162+
DMD_STABLE_DIR=$G/dmd-${LATEST}
163+
DMD_STABLE=$(DMD_STABLE_DIR)/generated/$(OS)/release/$(MODEL)/dmd
164+
DRUNTIME_STABLE_DIR=$G/druntime-${LATEST}
165+
PHOBOS_STABLE_DIR=$G/phobos-${LATEST}
166166

167167
# Auto-cloning missing directories
168168
$(shell [ ! -d $(DMD_DIR) ] && git clone --depth=1 ${GIT_HOME}/dmd $(DMD_DIR))
@@ -171,7 +171,7 @@ $(shell [ ! -d $(DRUNTIME_DIR) ] && git clone --depth=1 ${GIT_HOME}/druntime $(D
171171
################################################################################
172172
# Automatically generated directories
173173
PHOBOS_DIR_GENERATED=$(GENERATED)/phobos-prerelease
174-
PHOBOS_LATEST_DIR_GENERATED=$(GENERATED)/phobos-latest
174+
PHOBOS_STABLE_DIR_GENERATED=$(GENERATED)/phobos-latest
175175
# The assert_writeln_magic tool transforms all source files from Phobos. Hence
176176
# - a temporary folder with a copy of Phobos needs to be generated
177177
# - a list of all files in Phobos and the temporary copy is needed to setup proper
@@ -181,9 +181,9 @@ PHOBOS_FILES_GENERATED := $(subst $(PHOBOS_DIR), $(PHOBOS_DIR_GENERATED), $(PHOB
181181
ifndef RELEASE
182182
# TODO: should be replaced by make targets
183183
$(shell [ ! -d $(PHOBOS_DIR) ] && git clone --depth=1 ${GIT_HOME}/phobos $(PHOBOS_DIR))
184-
$(shell [ ! -d $(PHOBOS_LATEST_DIR) ] && git clone -b v${LATEST} --depth=1 ${GIT_HOME}/phobos $(PHOBOS_LATEST_DIR))
185-
PHOBOS_LATEST_FILES := $(shell find $(PHOBOS_LATEST_DIR) -name '*.d' -o -name '*.mak' -o -name '*.ddoc')
186-
PHOBOS_LATEST_FILES_GENERATED := $(subst $(PHOBOS_LATEST_DIR), $(PHOBOS_LATEST_DIR_GENERATED), $(PHOBOS_LATEST_FILES))
184+
$(shell [ ! -d $(PHOBOS_STABLE_DIR) ] && git clone -b v${LATEST} --depth=1 ${GIT_HOME}/phobos $(PHOBOS_STABLE_DIR))
185+
PHOBOS_STABLE_FILES := $(shell find $(PHOBOS_STABLE_DIR) -name '*.d' -o -name '*.mak' -o -name '*.ddoc')
186+
PHOBOS_STABLE_FILES_GENERATED := $(subst $(PHOBOS_STABLE_DIR), $(PHOBOS_STABLE_DIR_GENERATED), $(PHOBOS_STABLE_FILES))
187187
endif
188188
################################################################################
189189

@@ -209,7 +209,7 @@ MOD_EXCLUDES_PRERELEASE=$(addprefix --ex=, \
209209
dmd.libmach dmd.libmscoff \
210210
dmd.scanmach dmd.scanmscoff)
211211

212-
MOD_EXCLUDES_LATEST=$(MOD_EXCLUDES_PRERELEASE)
212+
MOD_EXCLUDES_STABLE=$(MOD_EXCLUDES_PRERELEASE)
213213

214214
# rdmd must fetch the model, imports, and libs from the specified version
215215
DFLAGS=-m$(MODEL) -I$(DRUNTIME_DIR)/import -I$(PHOBOS_DIR) -L-L$(PHOBOS_DIR)/generated/$(OS)/release/$(MODEL)
@@ -228,7 +228,7 @@ CHANGE_SUFFIX = \
228228
done
229229

230230
# Caches the latest D blog post for the front page
231-
DBLOG_LATEST=
231+
DBLOG_STABLE=
232232

233233
# Disable all dynamic content that could potentially have an unrelated impact
234234
# on a diff
@@ -238,18 +238,18 @@ ifeq (1,$(DIFFABLE))
238238
else
239239
CHANGELOG_VERSION_MASTER := "v${LATEST}..upstream/master"
240240
CHANGELOG_VERSION_STABLE := "v${LATEST}..upstream/stable"
241-
DBLOG_LATEST=$G/dblog_latest.ddoc $G/dblog_latest2.ddoc
241+
DBLOG_STABLE=$G/dblog_latest.ddoc $G/dblog_latest2.ddoc
242242
endif
243243

244244
################################################################################
245245
# Ddoc build variables
246246
################################################################################
247-
DDOC_VARS_LATEST_HTML= \
247+
DDOC_VARS_STABLE_HTML= \
248248
DOC_OUTPUT_DIR="$W/phobos" \
249-
STDDOC="$(addprefix $(PWD)/, $(STD_DDOC_LATEST))" \
250-
DMD="$(abspath $(DMD_LATEST))" \
251-
DMD_DIR="$(abspath ${DMD_LATEST_DIR})" \
252-
DRUNTIME_PATH="$(abspath ${DRUNTIME_LATEST_DIR})" \
249+
STDDOC="$(addprefix $(PWD)/, $(STD_DDOC_STABLE))" \
250+
DMD="$(abspath $(DMD_STABLE))" \
251+
DMD_DIR="$(abspath ${DMD_STABLE_DIR})" \
252+
DRUNTIME_PATH="$(abspath ${DRUNTIME_STABLE_DIR})" \
253253
DOCSRC="$(PWD)" \
254254
VERSION="$(abspath ${DMD_DIR}/VERSION)"
255255

@@ -318,8 +318,8 @@ STYLES=$(addsuffix .css, $(addprefix css/, \
318318
# HTML Files
319319
################################################################################
320320

321-
DDOC=$(addsuffix .ddoc, macros html dlang.org doc ${GENERATED}/${LATEST}) $(NODATETIME) $(DBLOG_LATEST)
322-
STD_DDOC_LATEST=$(addsuffix .ddoc, macros html dlang.org ${GENERATED}/${LATEST} std std_navbar-release ${GENERATED}/modlist-${LATEST}) $(NODATETIME)
321+
DDOC=$(addsuffix .ddoc, macros html dlang.org doc ${GENERATED}/${LATEST}) $(NODATETIME) $(DBLOG_STABLE)
322+
STD_DDOC_STABLE=$(addsuffix .ddoc, macros html dlang.org ${GENERATED}/${LATEST} std std_navbar-release ${GENERATED}/modlist-${LATEST}) $(NODATETIME)
323323
STD_DDOC_RELEASE=$(addsuffix .ddoc, macros html dlang.org ${GENERATED}/${LATEST} std std_navbar-release ${GENERATED}/modlist-release) $(NODATETIME)
324324
STD_DDOC_PRERELEASE=$(addsuffix .ddoc, macros html dlang.org ${GENERATED}/${LATEST} std std_navbar-prerelease ${GENERATED}/modlist-prerelease) $(NODATETIME)
325325
SPEC_DDOC=${DDOC} spec/spec.ddoc
@@ -416,9 +416,9 @@ ${GENERATED}/${LATEST}.ddoc :
416416
mkdir -p $(dir $@)
417417
echo "LATEST=${LATEST}" >$@
418418

419-
${GENERATED}/modlist-${LATEST}.ddoc : modlist.d ${STABLE_DMD} $(DRUNTIME_LATEST_DIR) $(PHOBOS_LATEST_DIR) $(DMD_LATEST_DIR)
419+
${GENERATED}/modlist-${LATEST}.ddoc : modlist.d ${STABLE_DMD} $(DRUNTIME_STABLE_DIR) $(PHOBOS_STABLE_DIR) $(DMD_STABLE_DIR)
420420
mkdir -p $(dir $@)
421-
$(STABLE_RDMD) modlist.d $(DRUNTIME_LATEST_DIR) $(PHOBOS_LATEST_DIR) $(DMD_LATEST_DIR) $(MOD_EXCLUDES_LATEST) \
421+
$(STABLE_RDMD) modlist.d $(DRUNTIME_STABLE_DIR) $(PHOBOS_STABLE_DIR) $(DMD_STABLE_DIR) $(MOD_EXCLUDES_STABLE) \
422422
$(addprefix --dump , object std etc core) --dump dmd >$@
423423

424424
${GENERATED}/modlist-release.ddoc : modlist.d ${STABLE_DMD} $(DRUNTIME_DIR) $(PHOBOS_DIR) $(DMD_DIR)
@@ -575,10 +575,10 @@ $G/dblog_latest.ddoc:
575575
@echo "Receiving the latest DBlog article. Disable with DIFFABLE=1"
576576
curl -s --retry 3 --retry-delay 5 http://blog.dlang.org > $(TMP)/blog.html
577577
cat $(TMP)/blog.html | grep -m1 'entry-title' | \
578-
sed -E 's/^.*<a href="(.+)" rel="bookmark">([^<]+)<\/a>.*<time.*datetime="[^"]+">([^<]*)<\/time><time class="updated".*Author *<\/span><a [^>]+>([^<]+)<\/a>.*/DBLOG_LATEST_TITLE=\2|DBLOG_LATEST_LINK=\1|DBLOG_LATEST_DATE=\3|DBLOG_LATEST_AUTHOR=\4/' | \
578+
sed -E 's/^.*<a href="(.+)" rel="bookmark">([^<]+)<\/a>.*<time.*datetime="[^"]+">([^<]*)<\/time><time class="updated".*Author *<\/span><a [^>]+>([^<]+)<\/a>.*/DBLOG_STABLE_TITLE=\2|DBLOG_STABLE_LINK=\1|DBLOG_STABLE_DATE=\3|DBLOG_STABLE_AUTHOR=\4/' | \
579579
tr '|' '\n' > $@
580580
cat $(TMP)/blog.html | grep -m2 'entry-title' | tail -n1 | \
581-
sed -E 's/^.*<a href="(.+)" rel="bookmark">([^<]+)<\/a>.*<time.*datetime="[^"]+">([^<]*)<\/time><time class="updated".*Author *<\/span><a [^>]+>([^<]+)<\/a>.*/DBLOG_LATEST_TITLE2=\2|DBLOG_LATEST_LINK2=\1|DBLOG_LATEST_DATE2=\3|DBLOG_LATEST_AUTHOR2=\4/' | \
581+
sed -E 's/^.*<a href="(.+)" rel="bookmark">([^<]+)<\/a>.*<time.*datetime="[^"]+">([^<]*)<\/time><time class="updated".*Author *<\/span><a [^>]+>([^<]+)<\/a>.*/DBLOG_STABLE_TITLE2=\2|DBLOG_STABLE_LINK2=\1|DBLOG_STABLE_DATE2=\3|DBLOG_STABLE_AUTHOR2=\4/' | \
582582
tr '|' '\n' > $(basename $@)2.ddoc
583583
rm $(TMP)/blog.html
584584

@@ -605,17 +605,17 @@ ${DMD_DIR}/VERSION : ${DMD_DIR}
605605
$(DMD) : ${DMD_DIR}
606606
${MAKE} --directory=${DMD_DIR}/src -f posix.mak AUTO_BOOTSTRAP=1
607607

608-
$(DMD_LATEST) : ${DMD_LATEST_DIR}
609-
${MAKE} --directory=${DMD_LATEST_DIR}/src -f posix.mak AUTO_BOOTSTRAP=1
608+
$(DMD_STABLE) : ${DMD_STABLE_DIR}
609+
${MAKE} --directory=${DMD_STABLE_DIR}/src -f posix.mak AUTO_BOOTSTRAP=1
610610

611611
dmd-prerelease : $(STD_DDOC_PRERELEASE) druntime-target $G/changelog/next-version
612612
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_DIR) -f posix.mak html $(DDOC_VARS_PRERELEASE_HTML)
613613

614614
dmd-release : $(STD_DDOC_RELEASE) druntime-target
615615
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_DIR) -f posix.mak html $(DDOC_VARS_RELEASE_HTML)
616616

617-
dmd-latest : $(STD_DDOC_LATEST) druntime-latest-target
618-
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_LATEST_DIR) -f posix.mak html $(DDOC_VARS_LATEST_HTML)
617+
dmd-latest : $(STD_DDOC_STABLE) druntime-latest-target
618+
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_STABLE_DIR) -f posix.mak html $(DDOC_VARS_STABLE_HTML)
619619

620620
dmd-prerelease-verbatim : $(STD_DDOC_PRERELEASE) druntime-target \
621621
$W/phobos-prerelease/mars.verbatim
@@ -634,8 +634,8 @@ $W/phobos-prerelease/mars.verbatim: verbatim.ddoc $G/changelog/next-version
634634
druntime-target: ${DRUNTIME_DIR} ${DMD}
635635
${MAKE} --directory=${DRUNTIME_DIR} -f posix.mak target ${DDOC_VARS_PRERELEASE_HTML}
636636

637-
druntime-latest-target: ${DRUNTIME_LATEST_DIR} ${DMD_LATEST}
638-
${MAKE} --directory=${DRUNTIME_LATEST_DIR} -f posix.mak target ${DDOC_VARS_LATEST_HTML}
637+
druntime-latest-target: ${DRUNTIME_STABLE_DIR} ${DMD_STABLE}
638+
${MAKE} --directory=${DRUNTIME_STABLE_DIR} -f posix.mak target ${DDOC_VARS_STABLE_HTML}
639639

640640
druntime-prerelease : druntime-target $(STD_DDOC_PRERELEASE) $G/changelog/next-version
641641
${MAKE} --directory=${DRUNTIME_DIR} -f posix.mak doc $(DDOC_VARS_PRERELEASE_HTML) \
@@ -647,10 +647,10 @@ druntime-release : druntime-target $(STD_DDOC_RELEASE)
647647
DOCDIR=$W/phobos \
648648
DOCFMT="$(addprefix `pwd`/, $(STD_DDOC_RELEASE))"
649649

650-
druntime-latest : druntime-latest-target $(STD_DDOC_LATEST)
651-
${MAKE} --directory=${DRUNTIME_LATEST_DIR} -f posix.mak doc $(DDOC_VARS_LATEST_HTML) \
650+
druntime-latest : druntime-latest-target $(STD_DDOC_STABLE)
651+
${MAKE} --directory=${DRUNTIME_STABLE_DIR} -f posix.mak doc $(DDOC_VARS_STABLE_HTML) \
652652
DOCDIR=$W/phobos \
653-
DOCFMT="$(addprefix `pwd`/, $(STD_DDOC_LATEST))"
653+
DOCFMT="$(addprefix `pwd`/, $(STD_DDOC_STABLE))"
654654

655655
druntime-prerelease-verbatim : druntime-target \
656656
$W/phobos-prerelease/object.verbatim
@@ -674,8 +674,8 @@ phobos-prerelease : ${PHOBOS_FILES_GENERATED} druntime-target $(STD_DDOC_PRERELE
674674
phobos-release : ${PHOBOS_FILES_GENERATED} druntime-target $(STD_DDOC_RELEASE)
675675
$(MAKE) --directory=$(PHOBOS_DIR_GENERATED) -f posix.mak html $(DDOC_VARS_RELEASE_HTML)
676676

677-
phobos-latest : ${PHOBOS_LATEST_FILES_GENERATED} druntime-latest-target $(STD_DDOC_LATEST)
678-
$(MAKE) --directory=$(PHOBOS_LATEST_DIR_GENERATED) -f posix.mak html $(DDOC_VARS_LATEST_HTML)
677+
phobos-latest : ${PHOBOS_STABLE_FILES_GENERATED} druntime-latest-target $(STD_DDOC_STABLE)
678+
$(MAKE) --directory=$(PHOBOS_STABLE_DIR_GENERATED) -f posix.mak html $(DDOC_VARS_STABLE_HTML)
679679

680680
phobos-prerelease-verbatim : ${PHOBOS_FILES_GENERATED} druntime-target \
681681
$W/phobos-prerelease/index.verbatim
@@ -725,30 +725,30 @@ $W/library-prerelease/.htaccess : dpl_prerelease_htaccess
725725
cp $< $@
726726

727727
# Can be removed after 2.079.0 (2018-03-01) (see https://github.com/dlang/dmd/pull/7567 for details)
728-
DMD_EXCLUDE_LATEST = -e /mscoff/d
728+
DMD_EXCLUDE_STABLE = -e /mscoff/d
729729
ifeq (osx,$(OS))
730-
DMD_EXCLUDE_LATEST += -e /scanelf/d -e /libelf/d
730+
DMD_EXCLUDE_STABLE += -e /scanelf/d -e /libelf/d
731731
else
732-
DMD_EXCLUDE_LATEST += -e /scanmach/d -e /libmach/d
732+
DMD_EXCLUDE_STABLE += -e /scanmach/d -e /libmach/d
733733
endif
734734

735-
$G/docs-latest.json : ${DMD_LATEST} ${DMD_LATEST_DIR} \
736-
${DRUNTIME_LATEST_DIR} ${PHOBOS_LATEST_FILES_GENERATED} | dpl-docs
735+
$G/docs-latest.json : ${DMD_STABLE} ${DMD_STABLE_DIR} \
736+
${DRUNTIME_STABLE_DIR} ${PHOBOS_STABLE_FILES_GENERATED} | dpl-docs
737737
# remove this after https://github.com/dlang/dmd/pull/7513 has been merged
738-
if [ -f $(DMD_LATEST_DIR)/src/*/objc_glue_stubs.d ] ; then \
739-
DMD_EXCLUDE_LATEST_BASH="-e /objc_glue.d/d"; \
738+
if [ -f $(DMD_STABLE_DIR)/src/*/objc_glue_stubs.d ] ; then \
739+
DMD_EXCLUDE_STABLE_BASH="-e /objc_glue.d/d"; \
740740
fi; \
741-
find ${DMD_LATEST_DIR}/src -name '*.d' | \
742-
sed -e /mscoff/d $${DMD_EXCLUDE_LATEST_BASH} ${DMD_EXCLUDE_LATEST}
743-
find ${DRUNTIME_LATEST_DIR}/src -name '*.d' | \
741+
find ${DMD_STABLE_DIR}/src -name '*.d' | \
742+
sed -e /mscoff/d $${DMD_EXCLUDE_STABLE_BASH} ${DMD_EXCLUDE_STABLE}
743+
find ${DRUNTIME_STABLE_DIR}/src -name '*.d' | \
744744
sed -e /unittest.d/d -e /gcstub/d >> $G/.latest-files.txt
745-
find ${PHOBOS_LATEST_DIR_GENERATED} -name '*.d' | \
745+
find ${PHOBOS_STABLE_DIR_GENERATED} -name '*.d' | \
746746
sed -e /unittest.d/d | sort >> $G/.latest-files.txt
747-
${DMD_LATEST} -J$(DMD_LATEST_DIR)/res -J$(dir $(DMD_LATEST)) -c -o- -version=CoreDdoc \
747+
${DMD_STABLE} -J$(DMD_STABLE_DIR)/res -J$(dir $(DMD_STABLE)) -c -o- -version=CoreDdoc \
748748
-version=MARS -version=CoreDdoc -version=StdDdoc -Df$G/.latest-dummy.html \
749-
-Xf$@ -I${PHOBOS_LATEST_DIR_GENERATED} @$G/.latest-files.txt
749+
-Xf$@ -I${PHOBOS_STABLE_DIR_GENERATED} @$G/.latest-files.txt
750750
${DPL_DOCS} filter $@ --min-protection=Protected \
751-
--only-documented $(MOD_EXCLUDES_LATEST)
751+
--only-documented $(MOD_EXCLUDES_STABLE)
752752
rm -f $G/.latest-files.txt $G/.latest-dummy.html
753753

754754
$G/docs-prerelease.json : ${DMD} ${DMD_DIR} ${DRUNTIME_DIR} \
@@ -856,9 +856,9 @@ $(PHOBOS_FILES_GENERATED): $(PHOBOS_DIR_GENERATED)/%: $(PHOBOS_DIR)/% $(DUB) $(A
856856
$(ASSERT_WRITELN_BIN) -i $< -o $@ ; \
857857
else cp $< $@ ; fi
858858

859-
$(PHOBOS_LATEST_FILES_GENERATED): $(PHOBOS_LATEST_DIR_GENERATED)/%: $(PHOBOS_LATEST_DIR)/% $(DUB) $(ASSERT_WRITELN_BIN)
859+
$(PHOBOS_STABLE_FILES_GENERATED): $(PHOBOS_STABLE_DIR_GENERATED)/%: $(PHOBOS_STABLE_DIR)/% $(DUB) $(ASSERT_WRITELN_BIN)
860860
@mkdir -p $(dir $@)
861-
@if [ $(subst .,, $(suffix $@)) = "d" ] && [ "$@" != "$(PHOBOS_LATEST_DIR_GENERATED)/index.d" ] ; then \
861+
@if [ $(subst .,, $(suffix $@)) = "d" ] && [ "$@" != "$(PHOBOS_STABLE_DIR_GENERATED)/index.d" ] ; then \
862862
$(ASSERT_WRITELN_BIN) -i $< -o $@ ; \
863863
else cp $< $@ ; fi
864864

0 commit comments

Comments
 (0)