You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2018/06/28 02:48:52 UTC
qpid-dispatch git commit: DISPATCH-851: Correct the cmake logic for
adding book targets based on the presence of asciidoctor;
add asciidoctor to the documented deps and CI config
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 723b73585 -> 0f8fb609e
DISPATCH-851: Correct the cmake logic for adding book targets based on the presence of asciidoctor; add asciidoctor to the documented deps and CI config
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/0f8fb609
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/0f8fb609
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/0f8fb609
Branch: refs/heads/master
Commit: 0f8fb609e8668738f422549ee8eb866c96e38377
Parents: 723b735
Author: Justin Ross <jr...@apache.org>
Authored: Wed Jun 27 19:18:25 2018 -0700
Committer: Justin Ross <jr...@apache.org>
Committed: Wed Jun 27 19:18:25 2018 -0700
----------------------------------------------------------------------
.travis.yml | 1 +
README | 1 +
docs/books/CMakeLists.txt | 6 +++---
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/0f8fb609/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index d248f82..586f06b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,6 +38,7 @@ addons:
- maven
# documentation
- asciidoc
+ - asciidoctor
- dblatex
# unit test requirement
- python-unittest2
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/0f8fb609/README
----------------------------------------------------------------------
diff --git a/README b/README
index b160052..6e07d27 100644
--- a/README
+++ b/README
@@ -19,6 +19,7 @@ packages installed:
- cyrus-sasl-plain
- cyrus-sasl-devel
- asciidoc (for building docs)
+- asciidoctor (for building docs)
- python-unittest2 (python2-unittest2 on Fedora) (we use unittest2 for running python tests)
Dispatch will not build on Windows.
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/0f8fb609/docs/books/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/docs/books/CMakeLists.txt b/docs/books/CMakeLists.txt
index e7dcfb7..c4938a4 100644
--- a/docs/books/CMakeLists.txt
+++ b/docs/books/CMakeLists.txt
@@ -27,7 +27,7 @@ set (
if (ASCIIDOCTOR_EXE)
# Don't follow symlinks and don't warn about it
- cmake_policy(SET CMP0009 NEW)
+ cmake_policy (SET CMP0009 NEW)
file (GLOB_RECURSE png_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.png)
foreach (file ${png_files})
@@ -46,9 +46,9 @@ if (ASCIIDOCTOR_EXE)
)
endforeach ()
+ add_custom_target (books DEPENDS ${books})
+ add_dependencies (docs books)
else ()
message (STATUS "AsciiDoctor not found: Not generating books")
endif ()
-add_custom_target (books DEPENDS ${books})
-add_dependencies (docs books)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org