Skip to content

Add macros for replacement with _pending#1838

Merged
dlang-bot merged 2 commits intodlang:masterfrom
wilzbach:pending
Dec 13, 2017
Merged

Add macros for replacement with _pending#1838
dlang-bot merged 2 commits intodlang:masterfrom
wilzbach:pending

Conversation

@wilzbach
Copy link
Copy Markdown
Contributor

@wilzbach wilzbach commented Jul 21, 2017

See #1821 (comment) and dlang/tools#251 (comment)

Step 1) Add new macros

  • as suggested no-hardcoded difference is generated by the changelog script
  • similarly to prerelease.ddoc, a ddoc file is used to overwrite the definitions

Step 2) Replace full text with macros at the change.d tool (dlang/tools#252)

Step 3) Add option to parse BUGSTITLE_TEXT_BODY and generate a "incremental" changelog

@dlang-bot
Copy link
Copy Markdown
Contributor

Thanks for your pull request, @wilzbach!

Bugzilla references

Your PR doesn't reference any Bugzilla issue.

If your PR contains non-trivial changes, please reference a Bugzilla issue or create a manual changelog.

$(SMALL $1)
)
$4
)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

How about leaving this in but removing it later so that we don't break the _pre page interim?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This should no longer be an issue.

)
$4
)
SEP_HEADER_TEXT_NONEMPTY=$(BR)$(BIG $(RELATIVE_LINK2 bugfix-list, List of all bug fixes and enhancements in D $(VER).))
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Some comments describing what these macros do and where they're used sure would be nice.

SPEC_DDOC=${DDOC} spec/spec.ddoc
CHANGELOG_DDOC=${DDOC} changelog/changelog.ddoc $(NODATETIME)
CHANGELOG_PRE_DDOC=${CHANGELOG_DDOC} changelog/prerelease.ddoc
CHANGELOG_PENDING_DDOC=${CHANGELOG_DDOC} changelog/pending.ddoc
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would be good to start maintaining some documentation of how the changelog is built. A description or link to one here and the .ddoc files would be nice.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Done. I put the description in the respective changelog section

posix.mak Outdated
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
--version "${NEXT_VERSION} (upcoming)" --date "To be released"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The changed invocations for _pre and _pending look identical right now. Aren't they supposed to be for different things (master/stable)?

@CyberShadow
Copy link
Copy Markdown
Member

Step 2) Replace full text with macros at the change.d tool (#1838)

I think you meant to link to dlang/tools#252.

@wilzbach wilzbach force-pushed the pending branch 2 times, most recently from fbcf65c to d5485e0 Compare December 13, 2017 01:46
@wilzbach
Copy link
Copy Markdown
Contributor Author

So I have finally found time to rebase this. If I have done this right, zero changes should appear on DAutoTest diff ...

This is intended to replace the `--nightly` CLI flag of the changed
script.
@wilzbach
Copy link
Copy Markdown
Contributor Author

If I have done this right, zero changes should appear on DAutoTest diff ...

Documentation OK (no changes)

🎉

@dlang-bot dlang-bot merged commit 8e2f118 into dlang:master Dec 13, 2017
@wilzbach wilzbach deleted the pending branch December 18, 2017 06:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants