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.

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

build: prefer asciidoc (a2x) over asciidoctor #1676

Merged
merged 1 commit into from Sep 26, 2018

Conversation

Projects
None yet
4 participants
@garlick
Copy link
Member

garlick commented Sep 25, 2018

Problem: only recent version of asciidoctor handle man
page stubs properly, but if both asciidoctor and asciidoc
are installed, the former will be used.

Change config logic to prefer a2x if both are installed.

Also, simpifly the doc/man*/Makefile.am files by setting
$(ADOC) to either asciidoc or a2x, and setting
$(ADOC_FORMAT_OPT) to either --backend or --format, so that
a single command line can be used for both formatters.

Fixes #1672

build: prefer asciidoc (a2x) over asciidoctor
Problem: only recent version of asciidoctor handle man
page stubs properly, but if both asciidoctor and asciidoc
are installed, the former will be used.

Change config logic to prefer a2x if both are installed.

Also, simplify the doc/man*/Makefile.am files by setting
$(ADOC) to either asciidoc or a2x, and setting
$(ADOC_FORMAT_OPT) to either --backend or --format, so that
a single command line can be used for both formatters.

Fixes #1672

@garlick garlick force-pushed the garlick:asciidoc_tweak branch from bff5903 to 5c0b931 Sep 25, 2018

@coveralls

This comment has been minimized.

Copy link

coveralls commented Sep 25, 2018

Coverage Status

Coverage decreased (-0.03%) to 79.981% when pulling 5c0b931 on garlick:asciidoc_tweak into 1b55e4f on flux-framework:master.

@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Sep 26, 2018

Codecov Report

Merging #1676 into master will increase coverage by 0.02%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #1676      +/-   ##
==========================================
+ Coverage    79.7%   79.73%   +0.02%     
==========================================
  Files         186      186              
  Lines       34330    34330              
==========================================
+ Hits        27364    27373       +9     
+ Misses       6966     6957       -9
Impacted Files Coverage Δ
src/broker/overlay.c 73.81% <0%> (-0.32%) ⬇️
src/modules/kvs/kvs.c 65.87% <0%> (-0.17%) ⬇️
src/broker/module.c 84.07% <0%> (+0.27%) ⬆️
src/cmd/flux-module.c 85.36% <0%> (+0.3%) ⬆️
src/common/libflux/message.c 81.5% <0%> (+0.59%) ⬆️
src/cmd/flux-event.c 78.18% <0%> (+0.6%) ⬆️
src/common/libflux/response.c 83.55% <0%> (+0.65%) ⬆️
src/common/libflux/mrpc.c 87.3% <0%> (+1.19%) ⬆️

@grondo grondo merged commit 551618f into flux-framework:master Sep 26, 2018

4 checks passed

codecov/patch Coverage not affected when comparing 1b55e4f...5c0b931
Details
codecov/project 79.73% (+0.02%) compared to 1b55e4f
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage decreased (-0.03%) to 79.981%
Details
@grondo

This comment has been minimized.

Copy link
Contributor

grondo commented Sep 26, 2018

Thanks, good cleanup!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.