You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2018/06/28 14:30:28 UTC
[2/2] qpid-proton git commit: PROTON-1877: [ruby] doc is not
multilib-clean for x86_64 vs i686
PROTON-1877: [ruby] doc is not multilib-clean for x86_64 vs i686
Override the footer which has a timestamp in it.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/122404a4
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/122404a4
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/122404a4
Branch: refs/heads/master
Commit: 122404a49a40e5f913ffe4e678bcd781b2e3d9db
Parents: 37cd347
Author: Alan Conway <ac...@redhat.com>
Authored: Thu Jun 28 10:23:16 2018 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Thu Jun 28 10:29:27 2018 -0400
----------------------------------------------------------------------
ruby/.gitignore | 6 ------
ruby/CMakeLists.txt | 5 +++--
ruby/doc/templates/default/layout/html/footer.erb | 1 +
3 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/122404a4/ruby/.gitignore
----------------------------------------------------------------------
diff --git a/ruby/.gitignore b/ruby/.gitignore
deleted file mode 100644
index 153f4ae..0000000
--- a/ruby/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-coverage
-ext/cproton/cproton.c
-html
-lib/*.so
-pkg
-tmp
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/122404a4/ruby/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/ruby/CMakeLists.txt b/ruby/CMakeLists.txt
index a27a67a..ad8e531 100644
--- a/ruby/CMakeLists.txt
+++ b/ruby/CMakeLists.txt
@@ -153,11 +153,12 @@ endif()
find_program(YARD_EXE "yard")
if (YARD_EXE)
+ file(GLOB_RECURSE TEMPLATES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "doc/templates/**")
add_custom_command(
OUTPUT ${bin}/doc
WORKING_DIRECTORY ${src}
- COMMAND ${YARD_EXE} -o ${bin}/doc -b ${bin}/.yardoc --yardopts ${src}/.yardopts -p ${src}/yard/templates
- DEPENDS ${RUBY_SRC}
+ COMMAND ${YARD_EXE} -o ${bin}/doc -b ${bin}/.yardoc -p ${src}/doc/templates
+ DEPENDS ${RUBY_SRC} ${TEMPLATES}
)
add_custom_target(docs-ruby DEPENDS ${bin}/doc)
add_dependencies (docs docs-ruby)
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/122404a4/ruby/doc/templates/default/layout/html/footer.erb
----------------------------------------------------------------------
diff --git a/ruby/doc/templates/default/layout/html/footer.erb b/ruby/doc/templates/default/layout/html/footer.erb
new file mode 100644
index 0000000..bde2b27
--- /dev/null
+++ b/ruby/doc/templates/default/layout/html/footer.erb
@@ -0,0 +1 @@
+<%# replace default footer - it has timestamps which cause repeatable build problems %>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org