Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions posix.mak
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@
ifeq (,${LATEST})
LATEST:=$(shell cat VERSION)
endif
# Next major DMD release
NEXT_VERSION:=$(shell bash -c 'version=$$(cat VERSION);a=($${version//./ });a[1]="10\#$${a[1]}";((a[1]++)); a[2]=0; echo $${a[0]}.0$${a[1]}.$${a[2]};' )

# Externals
DMD_DIR=../dmd
PHOBOS_DIR=../phobos
DRUNTIME_DIR=../druntime
TOOLS_DIR=../tools
DUB_DIR=../dub-${DUB_VER}
DMD=$(DMD_DIR)/src/dmd
DMD_REL=$(DMD_DIR)-${LATEST}/src/dmd
Expand Down Expand Up @@ -150,7 +153,8 @@ SPEC_ROOT=$(addprefix spec/, \
abi simd)
SPEC_DD=$(addsuffix .dd,$(SPEC_ROOT))

CHANGELOG_FILES=$(basename $(subst _pre.dd,.dd,$(wildcard changelog/*.dd)))
CHANGELOG_FILES=$(basename $(subst _pre.dd,.dd,$(wildcard changelog/*.dd))) \
changelog/${NEXT_VERSION}

# Website root filenames. They have extension .dd in the source
# and .html in the generated HTML. Save for the expansion of
Expand Down Expand Up @@ -519,7 +523,17 @@ test:
# Changelog generation
################################################################################

pending_changelog:
@echo "This command will be available soon."
changelog/${NEXT_VERSION}.dd: ${STABLE_DMD} ../tools ../installer
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changelog/${NEXT_VERSION}_pre.dd

$(STABLE_RDMD) $(TOOLS_DIR)/changed.d "v${LATEST}..upstream/stable" -o changelog/${NEXT_VERSION}.dd \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Always using stable seems incorrect when the purpose of this target is trying to build the changelog for dmd/druntime/phobos PRs.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was already changed, as we realized that showing the bug list from Bugzilla will lead to unrelated diffs on DAutoTest: #1588

--version "${NEXT_VERSION}"

pending_changelog: changelog/${NEXT_VERSION}.dd html
@echo "Please open file:///$(shell pwd)/web/changelog/${NEXT_VERSION}.html in your browser"

../tools:
git clone https://github.com/dlang/tools ../tools

../installer:
git clone https://github.com/dlang/installer ../installer

.DELETE_ON_ERROR: # GNU Make directive (delete output files on error)