Author: kwall
Date: Sat Jan 2 23:43:12 2016
New Revision: 1722683
URL: http://svn.apache.org/viewvc?rev=1722683&view=rev
Log:
QPID-6961: Make site scripts build Java docbooks using Maven
Modified:
qpid/site/README
qpid/site/scripts/gen-java-release-books
Modified: qpid/site/README
URL:
http://svn.apache.org/viewvc/qpid/site/README?rev=1722683&r1=1722682&r2=1722683&view=diff
==============================================================================
--- qpid/site/README (original)
+++ qpid/site/README Sat Jan 2 23:43:12 2016
@@ -161,7 +161,7 @@ on Fedora or RHEL.
$ sudo yum install cmake doxygen epydoc fop gcc graphviz java-devel \
libxslt make python-pygments PyYAML rubygem-rdoc subversion \
- pandoc-pdf python-sphinx
+ pandoc-pdf python-sphinx apache-maven
## Publishing your work
Modified: qpid/site/scripts/gen-java-release-books
URL:
http://svn.apache.org/viewvc/qpid/site/scripts/gen-java-release-books?rev=1722683&r1=1722682&r2=1722683&view=diff
==============================================================================
--- qpid/site/scripts/gen-java-release-books (original)
+++ qpid/site/scripts/gen-java-release-books Sat Jan 2 23:43:12 2016
@@ -24,54 +24,35 @@ import uuid
from xml.etree import ElementTree
def gen_books(release, source_dir, output_dir):
- input_dir = join(source_dir, "doc", "book")
+ toplevel_pom = join(source_dir, "pom.xml")
+ input_dir = join(source_dir, "doc")
- stylesheet = """<?xml version='1.0'?>
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
version="1.0">
- <xsl:import
href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl"/>
- </xsl:stylesheet>"""
+ cpp_broker_book_url =
"/releases/qpid-cpp-{{current_cpp_release}}/cpp-broker/book/"
+ # TODO seems programming book is rather in limbo at the moment, neither
published with cpp or java?
+ programming_book_url = "/releases/qpid-0.32/programming/book/"
+
+ call("mvn -f {} -pl doc -amd -Ddoc=true package -DqpidCppBook={}
-DqpidProgrammingBook={}",
+ toplevel_pom,
+ cpp_broker_book_url,
+ programming_book_url)
- write(join(input_dir, "xsl", "html-custom.xsl"), stylesheet)
-
- call("make -C {} clean html", input_dir)
-
- java_broker_input_dir = join(input_dir, "build",
"AMQP-Messaging-Broker-Java-Book")
- #programming_input_dir = join(input_dir, "build",
"Programming-In-Apache-Qpid")
- jms_client08_input_dir = join(input_dir, "build", "JMS-Client-Book")
+ java_broker_input_dir = join(input_dir, "java-broker", "target", "docbkx")
+ jms_client08_input_dir = join(input_dir, "jms-client-0-8", "target",
"docbkx")
java_broker_output_dir = join(output_dir, "java-broker")
- #programming_output_dir = join(output_dir, "programming")
jms_client08_output_dir = join(output_dir, "jms-client-0-8")
remove(java_broker_output_dir)
- #remove(programming_output_dir)
remove(jms_client08_output_dir)
- copy(join(java_broker_input_dir, "html"), join(java_broker_output_dir,
"book"))
- #copy(join(programming_input_dir, "html"), join(programming_output_dir,
"book"))
- copy(join(jms_client08_input_dir, "html"), join(jms_client08_output_dir,
"book"))
-
- #copy(join(java_broker_input_dir, "pdf",
"AMQP-Messaging-Broker-Java-Book.pdf"),
- # join(java_broker_output_dir, "java-broker-book.pdf"))
- #copy(join(programming_input_dir, "pdf", "Programming-In-Apache-Qpid.pdf"),
- # join(programming_output_dir, "programming-book.pdf"))
- #copy(join(jms_client08_input_dir, "pdf", "JMS-Client-Book.pdf"),
- # join(jms_client08_output_dir, "jms_client08-book.pdf"))
+ copy(java_broker_input_dir, join(java_broker_output_dir, "book"))
+ copy(jms_client08_input_dir, join(jms_client08_output_dir, "book"))
- #output_dirs = [java_broker_output_dir, programming_output_dir,
jms_client08_output_dir]
output_dirs = [java_broker_output_dir, jms_client08_output_dir]
for dir in output_dirs:
for path in find(dir, "*.html"):
- # temporary hacks to fix cross references between different doc
books
- if dir == jms_client08_output_dir:
- infile_replace(path, "AMQP-Messaging-Broker-Java-Book/html/",
"java-broker/book/")
- else:
- #infile_replace(path, "AMQP-Messaging-Broker-CPP-Book/html/",
"../qpid-cpp-0.34/cpp-broker/book/")
- infile_replace(path, "AMQP-Messaging-Broker-CPP-Book/html/",
"../qpid-cpp-{{current_cpp_release}}/cpp-broker/book/")
-
- #infile_replace(path, "Programming-In-Apache-Qpid/html/",
"../qpid-0.32/programming/book/")
- infile_replace(path, "Programming-In-Apache-Qpid/html/",
"../qpid-{{current_release}}/programming/book/")
+ print path
tree = ElementTree.parse(path)
elem = tree.find(".//{http://www.w3.org/1999/xhtml}body";)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
