Skip to content

Improve autogenerated manpages#2124

Merged
zkbot merged 12 commits intozcash:masterfrom
str4d:2086-help2man
Mar 2, 2017
Merged

Improve autogenerated manpages#2124
zkbot merged 12 commits intozcash:masterfrom
str4d:2086-help2man

Conversation

@str4d
Copy link
Copy Markdown
Contributor

@str4d str4d commented Feb 23, 2017

Cherry-picked from bitcoin/bitcoin#8608.

Closes #2086.

@str4d str4d added dev infrastructure A-documentation Area: Documentation C-release Category: This is an issue corresponding to the creation of a specific release. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 23, 2017
@str4d str4d modified the milestone: 1.0.7 Feb 23, 2017
daira
daira approved these changes Feb 23, 2017
View reviewed changes
Copy link
Copy Markdown
Contributor

@daira daira left a comment

Choose a reason for hiding this comment

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

utACK.

@arcalinea
Copy link
Copy Markdown
Contributor

arcalinea commented Mar 2, 2017 •
edited
Loading

This script successfully generates man pages.

Help2man doesn't recognize "Commands" and "Register Commands" as distinct sections that should be bolded though. This is the same for the upstream autogenerated man pages as well. Maybe this is worth changing the formatting for later.

Screenshot of what I mean:
zcashtx-man

ACK on this for now, though

@daira
Copy link
Copy Markdown
Contributor

daira commented Mar 2, 2017

Comments are non-blocking. @zkbot r+

@zkbot
Copy link
Copy Markdown
Contributor

zkbot commented Mar 2, 2017

📌 Commit cc39080 has been approved by daira

@zkbot
Copy link
Copy Markdown
Contributor

zkbot commented Mar 2, 2017

⌛ Testing commit cc39080 with merge ff9b21e...

@zkbot
Copy link
Copy Markdown
Contributor

zkbot commented Mar 2, 2017

💔 Test failed - zcash

arcalinea
arcalinea reviewed Mar 2, 2017
View reviewed changes
Comment thread configure.ac Outdated
Copy link
Copy Markdown
Contributor

@arcalinea arcalinea Mar 2, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

Was this duplicated in merge? Think registering src/Makefile twice is causing build.sh to fail

Copy link
Copy Markdown
Contributor Author

@str4d str4d Mar 2, 2017

Choose a reason for hiding this comment

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

This should have been a change, not an addition (there was a merge conflict).

@arcalinea
Copy link
Copy Markdown
Contributor

arcalinea commented Mar 2, 2017 •
edited
Loading

Build.sh failed locally for me with the same error as it did on the test server,

+ ./autogen.sh
configure.ac:985: error: `Makefile' is already registered with AC_CONFIG_FILES.
../../lib/autoconf/status.m4:288: AC_CONFIG_FILES is expanded from...
configure.ac:985: the top level
autom4te: /usr/bin/m4 failed with exit status: 1
aclocal: error: echo failed with exit status: 1
autoreconf: aclocal failed with exit status: 1

See comment on configure.ac line 985 -- possible merge conflict when this was pulled in?
....
Using zkbot to run tests on the fix I applied below that let me build it successfully locally

@arcalinea
Copy link
Copy Markdown
Contributor

arcalinea commented Mar 2, 2017

@zkbot try

@zkbot
Copy link
Copy Markdown
Contributor

zkbot commented Mar 2, 2017

⌛ Trying commit fc82d19 with merge 8ef121e...

@zkbot
Copy link
Copy Markdown
Contributor

zkbot commented Mar 2, 2017

☀️ Test successful - zcash

@str4d
Copy link
Copy Markdown
Contributor Author

str4d commented Mar 2, 2017

@arcalinea thanks for catching that. I'll rebase to merge your change into the original commit, so the cherry-picked commit matches bitcoin/bitcoin@a32c102 upstream.

@str4d
Copy link
Copy Markdown
Contributor Author

str4d commented Mar 2, 2017

Done.

@zkbot r+

@zkbot
Copy link
Copy Markdown
Contributor

zkbot commented Mar 2, 2017

📌 Commit 6337870 has been approved by str4d

@zkbot
Copy link
Copy Markdown
Contributor

zkbot commented Mar 2, 2017

⌛ Testing commit 6337870 with merge b75b2de...

zkbot added a commit that referenced this pull request Mar 2, 2017
@zkbot
Auto merge of #2124 - str4d:2086-help2man, r=str4d
b75b2de 
Improve autogenerated manpages

Cherry-picked from bitcoin/bitcoin#8608.

Closes #2086.
@zkbot
Copy link
Copy Markdown
Contributor

zkbot commented Mar 2, 2017

☀️ Test successful - zcash

@zkbot zkbot merged commit 6337870 into zcash:master Mar 2, 2017
@str4d str4d deleted the 2086-help2man branch January 27, 2023 16:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@daira daira daira approved these changes

+1 more reviewer

@arcalinea arcalinea arcalinea left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

A-documentation Area: Documentation C-release Category: This is an issue corresponding to the creation of a specific release. dev infrastructure S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.

Projects

None yet

Milestone

1.0.7

Development

Successfully merging this pull request may close these issues.

4 participants

@str4d @arcalinea @daira @zkbot