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: fix --disable-docs logic error #1678

Merged
merged 1 commit into from Sep 26, 2018

Conversation

Projects
None yet
5 participants
@garlick
Copy link
Member

garlick commented Sep 26, 2018

Problem: configure --disable-docs no longer works.

The recent change to prefer a2x over asciidoctor broke
logic for --disable-docs. If docs are not enabled,
ADOC is unset, but the logic requires it to be
set to "not-found" to disable docs building.

Drop the default "not-found" value in AC_CHECK_PROGS(),
and check for ADOC unset.

Tested

  • with a2x installed, docs enabled
  • with a2x installed, docs disabled
  • with nothing installed, docs enabled

Fixes #1677

build: fix --disable-docs logic error
Problem: configure --disable-docs no longer works.

The recent change to prefer a2x over asciidoctor broke
logic for --disable-docs.  If docs are not enabled,
ADOC is unset, but the logic requires it to be
set to "not-found" to disable docs building.

Drop the default "not-found" value in AC_CHECK_PROGS(),
and check for ADOC unset.

Tested
- with a2x installed, docs enabled
- with a2x installed, docs disabled
- with nothing installed, docs enabled

Fixes #1677
@coveralls

This comment has been minimized.

Copy link

coveralls commented Sep 26, 2018

Coverage Status

Coverage decreased (-0.03%) to 79.995% when pulling 316aa0a on garlick:asciidoc_oops into 551618f on flux-framework:master.

@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Sep 26, 2018

Codecov Report

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

@@            Coverage Diff             @@
##           master    #1678      +/-   ##
==========================================
- Coverage   79.72%   79.69%   -0.03%     
==========================================
  Files         186      186              
  Lines       34330    34330              
==========================================
- Hits        27369    27360       -9     
- Misses       6961     6970       +9
Impacted Files Coverage Δ
src/broker/content-cache.c 72.88% <0%> (-1.28%) ⬇️
src/broker/module.c 84.07% <0%> (-1.12%) ⬇️
src/broker/modservice.c 80.58% <0%> (-0.98%) ⬇️
src/common/libflux/rpc.c 93.23% <0%> (-0.76%) ⬇️
src/broker/overlay.c 73.81% <0%> (-0.32%) ⬇️
src/cmd/flux-module.c 85.06% <0%> (-0.31%) ⬇️
src/bindings/lua/flux-lua.c 82.15% <0%> (-0.09%) ⬇️
src/common/libflux/message.c 81.02% <0%> (+0.23%) ⬆️
src/common/libutil/base64.c 95.77% <0%> (+0.7%) ⬆️
src/common/libflux/mrpc.c 87.3% <0%> (+1.19%) ⬆️
@grondo

This comment has been minimized.

Copy link
Contributor

grondo commented Sep 26, 2018

Thanks!

@grondo grondo merged commit 8b195da into flux-framework:master Sep 26, 2018

3 of 4 checks passed

codecov/project 79.69% (-0.03%) compared to 551618f
Details
codecov/patch Coverage not affected when comparing 551618f...316aa0a
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage decreased (-0.03%) to 79.995%
Details
@SteVwonder

This comment has been minimized.

Copy link
Member

SteVwonder commented Sep 26, 2018

Thanks @garlick!

@garlick garlick deleted the garlick:asciidoc_oops branch Sep 27, 2018

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.