Skip to content

Use nightly changelog theme #1586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MartinNowak merged 2 commits into from
Mar 2, 2017
Merged

Use nightly changelog theme #1586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e82fb2
Use nightly changelog theme
wilzbach Feb 27, 2017
89fb4ce
Add generated *_pre changelog files to .gitignore
wilzbach Feb 27, 2017
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,6 @@ modlist-release.ddoc

# DUB binaries
/assert_writeln_magic

# Generated changelogs
changelog/*_pre.dd
9 changes: 9 additions & 0 deletions changelog/changelog.ddoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ $(SMALL released $1, $2)
$4
)

NIGHTLY_VERSION=
$(DIVC version,
$(P
$(B $(LARGE $(LINK2 http://nightlies.dlang.org, Download D nightlies)))$(BR)
$(SMALL $1)
)
$4
)

BUGZILLA = <a href="https://issues.dlang.org/show_bug.cgi?id=$0">Bugzilla $0</a>
CPPBUGZILLA = <a href="http://bugzilla.digitalmars.com/issues/show_bug.cgi?id=$0">Bugzilla $0</a>
DSTRESS = dstress $0
Expand Down
17 changes: 11 additions & 6 deletions posix.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ ifeq (1,$(DIFFABLE))
NODATETIME := nodatetime.ddoc
DPL_DOCS_PATH_RUN_FLAGS := --no-exact-source-links
else
CHANGELOG_VERSION := "v${LATEST}..upstream/stable"
CHANGELOG_VERSION_MASTER := "v${LATEST}..upstream/master"
CHANGELOG_VERSION_STABLE := "v${LATEST}..upstream/stable"
endif

# Documents
Expand Down Expand Up @@ -171,8 +172,8 @@ SPEC_ROOT=$(addprefix spec/, \
abi simd)
SPEC_DD=$(addsuffix .dd,$(SPEC_ROOT))

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

# 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 @@ -588,12 +589,16 @@ test:
# Changelog generation
################################################################################

changelog/${NEXT_VERSION}_pre.dd: ${STABLE_DMD} ../tools ../installer
$(STABLE_RDMD) $(TOOLS_DIR)/changed.d $(CHANGELOG_VERSION_MASTER) -o $@ \
--version "${NEXT_VERSION} (upcoming)" --date "To be released" --nightly

changelog/${NEXT_VERSION}.dd: ${STABLE_DMD} ../tools ../installer
$(STABLE_RDMD) $(TOOLS_DIR)/changed.d $(CHANGELOG_VERSION) -o changelog/${NEXT_VERSION}.dd \
--version "${NEXT_VERSION}" --prev-version "${LATEST}"
$(STABLE_RDMD) $(TOOLS_DIR)/changed.d $(CHANGELOG_VERSION_STABLE) -o $@ \
--version "${NEXT_VERSION}"

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

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