Skip to content

Commit

Permalink
Issue 18351 - integrate dub changelog with changed.d tool
Browse files Browse the repository at this point in the history
  • Loading branch information
wilzbach committed Feb 8, 2018
1 parent f9fb5f8 commit 1617308
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions posix.mak
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ PHOBOS_DIR=../phobos
DRUNTIME_DIR=../druntime
TOOLS_DIR=../tools
INSTALLER_DIR=../installer
DUB_DIR=../dub

include $(DMD_DIR)/src/osmodel.mak

Expand Down Expand Up @@ -606,7 +607,7 @@ $G/%-${LATEST} :
git clone -b v${LATEST} --depth=1 ${GIT_HOME}/$(notdir $*) $@

# Clone all main D repositories
${DMD_DIR} ${DRUNTIME_DIR} ${PHOBOS_DIR} ${TOOLS_DIR} ${INSTALLER_DIR}:
${DMD_DIR} ${DRUNTIME_DIR} ${PHOBOS_DIR} ${TOOLS_DIR} ${INSTALLER_DIR} ${DUB_DIR}:
git clone ${GIT_HOME}/$(notdir $(@F)) $@

${DMD_DIR}/VERSION : ${DMD_DIR}
Expand Down Expand Up @@ -941,19 +942,22 @@ LOOSE_CHANGELOG_FILES:=$(wildcard $(DMD_DIR)/changelog/*.dd) \
$(wildcard $(DRUNTIME_DIR)/changelog/*.dd) \
$(wildcard $(PHOBOS_DIR)/changelog/*.dd) \
$(wildcard $(TOOLS_DIR)/changelog/*.dd) \
$(wildcard $(INSTALLER_DIR)/changelog/*.dd)
$(wildcard $(INSTALLER_DIR)/changelog/*.dd) \
$(wildcard $(DUB_DIR)/changelog/*.dd)

$G/changelog/next-version: ${DMD_DIR}/VERSION
$(eval NEXT_VERSION:=$(shell changelog/next_version.sh ${DMD_DIR}/VERSION))
@mkdir -p $(dir $@)
@echo $(NEXT_VERSION) > $@

changelog/prerelease.dd: $G/changelog/next-version $(LOOSE_CHANGELOG_FILES) | ${STABLE_DMD} $(TOOLS_DIR) $(INSTALLER_DIR)
changelog/prerelease.dd: $G/changelog/next-version $(LOOSE_CHANGELOG_FILES) | \
${STABLE_DMD} $(TOOLS_DIR) $(INSTALLER_DIR) $(DUB_DIR)
$(STABLE_RDMD) -version=Contributors_Lib $(TOOLS_DIR)/changed.d \
$(CHANGELOG_VERSION_STABLE) -o $@ --version "${NEXT_VERSION}" \
--date "To be released"

changelog/pending.dd: $G/changelog/next-version $(LOOSE_CHANGELOG_FILES) | ${STABLE_DMD} $(TOOLS_DIR) $(INSTALLER_DIR)
changelog/pending.dd: $G/changelog/next-version $(LOOSE_CHANGELOG_FILES) | \
${STABLE_DMD} $(TOOLS_DIR) $(INSTALLER_DIR) $(DUB_DIR)
$(STABLE_RDMD) -version=Contributors_Lib $(TOOLS_DIR)/changed.d \
$(CHANGELOG_VERSION_MASTER) -o $@ --version "${NEXT_VERSION}" \
--date "To be released"
Expand Down

0 comments on commit 1617308

Please sign in to comment.