Skip to content
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

Jump to bottom

Fix Issue 17644 - [Downloads] Bad link to changelog for DMD beta version #1820

Closed
wants to merge 2 commits into from
Closed

Fix Issue 17644 - [Downloads] Bad link to changelog for DMD beta version #1820

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
20fdde6
Fix Issue 17644 - [Downloads] Bad link to changelog for DMD beta vers…
wilzbach Jul 13, 2017
52b20d8
Show Nightly version in the changelog menu
wilzbach Jul 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions changelog/changelog.ddoc
View file
Open in desktop
Expand Up @@ -63,8 +63,8 @@ PHOBOSPR = $(PULL_REQUEST phobos,$1)
_=

CHANGELOG_VERSION = $(LI <a id="$1" href="$1.html">$1</a><span class="hide-from-nav"> ($2, $3)</span>)
CHANGELOG_VERSION_PRE = $(LI <a id="$1_pre" href="$1_pre.html">$1</a><span class="hide-from-nav"> ($+)</span>)
CHANGELOG_VERSION_PENDING = $(LI <a id="$1_pending" href="$1_pending.html">Nightlies</a><span class="hide-from-nav"> ($+)</span>)
CHANGELOG_VERSION_PRE = $(LI <a id="$1_pre" href="$1_pre.html">$1 (Beta)</a><span class="hide-from-nav"> ($+)</span>)
CHANGELOG_VERSION_PENDING = $(LI <a id="$1_pending" href="$1_pending.html">$1 (Nightly)</a><span class="hide-from-nav"> ($+)</span>)
_=BEGIN_GENERATED_CHANGELOG_VERSIONS
CHANGELOG_VERSIONS =
$(CHANGELOG_VERSION_PENDING 2.075.0, not yet released)
Expand Down
7 changes: 5 additions & 2 deletions download.dd
View file
Open in desktop
Expand Up @@ -83,7 +83,7 @@ $(DIVC download_channels,
$(BETA
$(DIVC download_channel,
$(H2 $(LNAME2 dmd_beta,DMD Beta $(B_DMDV2)-$(B_SUFFIX)))
$(LINK2 changelog/$(B_DMDV2).html, Changelog)
$(LINK2 changelog/$(B_DMDV2)_pre.html, Changelog)
Copy link
Member

Choose a reason for hiding this comment

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

So far we made the beta changelog from 2.075.0_pre.dd to 2.075.0.html, something went wrong to make a _pre.html from a (generated?) _pre.dd changelog instead.


$(BR)$(BR)

Expand All @@ -104,7 +104,8 @@ $(DIVC download_channels,
)

$(DIVC download_channel,
$(H2 $(LNAME2 dmd-nightly,DMD Nightly))
$(H2 $(LNAME2 dmd-nightly,DMD Nightly ($(NIGHTLIES_DMDV2))))
$(LINK2 changelog/$(NIGHTLIES_DMDV2)_pre.html, Changelog)
Copy link
Member Author

Choose a reason for hiding this comment

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

Should be _pending here

Copy link
Member

Choose a reason for hiding this comment

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

Sorry, so why isn't it?

Copy link
Member Author

Choose a reason for hiding this comment

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

Cause there are days where I am traveling and can only do stuff on my phone ;-)

Copy link
Member

Choose a reason for hiding this comment

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

Want me to fix that for you then?

Copy link
Member Author

Choose a reason for hiding this comment

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

If you think it's critical, feel free to go ahead. Otherwise I can get to it tomorrow.


$(BR)$(BR)

Expand Down Expand Up @@ -172,6 +173,8 @@ Macros:
B_DMDV2=2.075.0
B_SUFFIX=b4

NIGHTLIES_DMDV2=$(NEXT_VERSION)

DEB32=$(DLSITE dmd_$(DMDV2)-0_i386.deb)
DEB64=$(DLSITE dmd_$(DMDV2)-0_amd64.deb)
RPM32=$(DLSITE dmd-$(DMDV2)-0.fedora.i386.rpm)
Expand Down
1 change: 1 addition & 0 deletions posix.mak
View file
Open in desktop
Expand Up @@ -253,6 +253,7 @@ $(DOC_OUTPUT_DIR)/sitemap.html : $(ALL_FILES_BUT_SITEMAP) $(DMD)
${GENERATED}/${LATEST}.ddoc :
mkdir -p $(dir $@)
echo "LATEST=${LATEST}" >$@
echo "NEXT_VERSION=${NEXT_VERSION}" >>$@

${GENERATED}/modlist-${LATEST}.ddoc : modlist.d ${STABLE_DMD} $(DRUNTIME_STABLE_DIR) $(PHOBOS_STABLE_DIR) $(DMD_STABLE_DIR)
mkdir -p $(dir $@)
Expand Down