Repository: qpid-site Updated Branches: refs/heads/asf-site 3cbe9ebf0 -> 48fa05540
Fixed generation of book and man pages (hat-tip to Justin Ross for his patch). Project: http://git-wip-us.apache.org/repos/asf/qpid-site/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-site/commit/c973ce03 Tree: http://git-wip-us.apache.org/repos/asf/qpid-site/tree/c973ce03 Diff: http://git-wip-us.apache.org/repos/asf/qpid-site/diff/c973ce03 Branch: refs/heads/asf-site Commit: c973ce03eea22cf823bc0907d7755ea414f8aa1d Parents: 3cbe9eb Author: Ted Ross <[email protected]> Authored: Mon Aug 15 17:22:20 2016 -0400 Committer: Ted Ross <[email protected]> Committed: Mon Aug 15 17:22:20 2016 -0400 ---------------------------------------------------------------------- scripts/gen-dispatch-release-books | 27 ++++++++++++++++++++++----- scripts/gen-dispatch-release-page | 10 +++++----- 2 files changed, 27 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-site/blob/c973ce03/scripts/gen-dispatch-release-books ---------------------------------------------------------------------- diff --git a/scripts/gen-dispatch-release-books b/scripts/gen-dispatch-release-books index 5447259..b48f29c 100755 --- a/scripts/gen-dispatch-release-books +++ b/scripts/gen-dispatch-release-books @@ -29,12 +29,29 @@ def gen_books_and_man(release, source_dir, output_dir): call("make") call("make doc") - build_doc = join(build_dir, "doc") + book_build_dir = join(build_dir, "doc", "html", "book") - # .html.in files are raw HTML bodies, the render script will apply the site style. - for f in list_dir(build_doc, "*.html.in", "*.pdf", "*.png"): - if not f == "index.html.in": # Use gen-dispatch-release-page index. - copy(join(build_doc, f), join(output_dir, f)) + for f in list_dir(book_build_dir, "*.html"): + input_file = join(book_build_dir, f) + output_file = join(output_dir, "book", "{}.in".format(f)) + + copy(input_file, output_file) + + book_image_dir = join(build_dir, "doc", "html", "_images") + + for f in list_dir(book_image_dir, "*"): + input_file = join(book_image_dir, f) + output_file = join(output_dir, "_images", f) + + copy(input_file, output_file) + + man_build_dir = join(build_dir, "doc", "html", "man") + + for f in list_dir(man_build_dir, "*.html"): + input_file = join(man_build_dir, f) + output_file = join(output_dir, "man", "{}.in".format(f)) + + copy(input_file, output_file) ## Now do stuff ## release, issues_release, source_release, release_dir, checkout_dir = setup_release_script() http://git-wip-us.apache.org/repos/asf/qpid-site/blob/c973ce03/scripts/gen-dispatch-release-page ---------------------------------------------------------------------- diff --git a/scripts/gen-dispatch-release-page b/scripts/gen-dispatch-release-page index 4e40cb4..53cc1d9 100755 --- a/scripts/gen-dispatch-release-page +++ b/scripts/gen-dispatch-release-page @@ -35,11 +35,11 @@ documentation = \ <div class="two-column" markdown="1"> - [Installing Qpid Dispatch](https://git-wip-us.apache.org/repos/asf?p=qpid-dispatch.git;a=blob_plain;f=README;hb={source_release}) - - [Dispatch Router User Guide](book.html) ([PDF](book.pdf)) - - [qdrouterd(8)](qdrouterd.8.html) - Router daemon - - [qdrouterd.conf(5)](qdrouterd.conf.5.html) - Daemon configuration - - [qdstat(8)](qdstat.8.html) - Get router statistics - - [qdmanage(8)](qdmanage.8.html) - Manage the router + - [Dispatch Router User Guide](book/book.html) + - [qdrouterd](man/qdrouterd.html) - Router daemon + - [qdrouterd.conf](man/qdrouterd.conf.html) - Daemon configuration + - [qdstat](man/qdstat.html) - Get router statistics + - [qdmanage](man/qdmanage.html) - Manage the router </div> """ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
