Skip to content

Commit 4480f07

Browse files
authored
Merge pull request #2163 from wilzbach/18351
Issue 18351 - integrate dub changelog with changed.d tool merged-on-behalf-of: Vladimir Panteleev <github@thecybershadow.net>
2 parents 30dc2ed + 1617308 commit 4480f07

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

posix.mak

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ PHOBOS_DIR=../phobos
141141
DRUNTIME_DIR=../druntime
142142
TOOLS_DIR=../tools
143143
INSTALLER_DIR=../installer
144+
DUB_DIR=../dub
144145

145146
include $(DMD_DIR)/src/osmodel.mak
146147

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

608609
# Clone all main D repositories
609-
${DMD_DIR} ${DRUNTIME_DIR} ${PHOBOS_DIR} ${TOOLS_DIR} ${INSTALLER_DIR}:
610+
${DMD_DIR} ${DRUNTIME_DIR} ${PHOBOS_DIR} ${TOOLS_DIR} ${INSTALLER_DIR} ${DUB_DIR}:
610611
git clone ${GIT_HOME}/$(notdir $(@F)) $@
611612

612613
${DMD_DIR}/VERSION : ${DMD_DIR}
@@ -941,19 +942,22 @@ LOOSE_CHANGELOG_FILES:=$(wildcard $(DMD_DIR)/changelog/*.dd) \
941942
$(wildcard $(DRUNTIME_DIR)/changelog/*.dd) \
942943
$(wildcard $(PHOBOS_DIR)/changelog/*.dd) \
943944
$(wildcard $(TOOLS_DIR)/changelog/*.dd) \
944-
$(wildcard $(INSTALLER_DIR)/changelog/*.dd)
945+
$(wildcard $(INSTALLER_DIR)/changelog/*.dd) \
946+
$(wildcard $(DUB_DIR)/changelog/*.dd)
945947

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

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

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

0 commit comments

Comments
 (0)