This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/qpid-site.git
commit b6f650aa3f466f3a8403fe1203907dee22dab9b0
Author: Robbie Gemmell <rob...@apache.org>
AuthorDate: Wed Dec 11 15:03:32 2019 +0000
updated proton release scripts for 0.30.0 doc changes
---
scripts/gen-proton-release-docs | 35 ++++++++++++++++++-----------------
scripts/gen-proton-release-page | 6 +++---
2 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/scripts/gen-proton-release-docs b/scripts/gen-proton-release-docs
index acf1b0f..a4f3529 100755
--- a/scripts/gen-proton-release-docs
+++ b/scripts/gen-proton-release-docs
@@ -25,7 +25,6 @@ def gen_proton_apis(release, source_dir, release_dir):
gen_proton_c_api(release, source_dir, component_dir)
gen_proton_cpp_api(release, source_dir, component_dir)
- gen_proton_python_api(release, source_dir, component_dir)
gen_proton_ruby_api(release, source_dir, component_dir)
def gen_proton_c_api(release, source_dir, component_dir):
@@ -66,19 +65,6 @@ def gen_proton_cpp_api(release, source_dir, component_dir):
example_paths=(join(source_dir, "cpp", "examples"),),
config_file=config_file)
-def gen_proton_python_api(release, source_dir, component_dir):
- input_dir = join(source_dir, "python")
- input_namespace = "proton"
- output_dir = join(component_dir, "python", "api")
-
- remove(output_dir)
-
- gen_epydoc(release=release,
- title="Qpid Proton Python API",
- input_paths=(input_dir,),
- input_namespaces=(input_namespace,),
- output_dir=output_dir)
-
def gen_proton_ruby_api(release, source_dir, component_dir):
input_dir = join(source_dir, "ruby")
output_dir = join(component_dir, "ruby", "api")
@@ -91,10 +77,22 @@ def gen_proton_ruby_api(release, source_dir, component_dir):
input_namespaces=("Qpid::Proton",),
output_dir=output_dir)
+
+_htaccess_template = """
+<IfModule mod_rewrite.c>
+ RewriteEngine on
+ RewriteBase /releases/qpid-proton-{}/proton/python
+
+ RewriteRule ^book/(.*)$ docs/$1 [R=301,L]
+ RewriteRule ^api/(.*)$ docs/ [R=301,L]
+</IfModule>
+"""
+
def gen_proton_books(release, source_dir, release_dir, build_dir):
component_dir = join(release_dir, "proton")
- input_dir = join(build_dir, "python", "tutorial")
- output_dir = join(component_dir, "python", "book")
+ input_dir = join(build_dir, "python", "docs")
+ output_dir = join(component_dir, "python", "docs")
+ htaccess = join(component_dir, "python", ".htaccess")
remove(output_dir)
@@ -103,6 +101,9 @@ def gen_proton_books(release, source_dir, release_dir,
build_dir):
remove(join(output_dir, ".doctrees"))
+ htaccess_content = _htaccess_template.format(release)
+ write(htaccess, htaccess_content)
+
def gen_proton_examples(release, source_dir, release_dir):
component_dir = join(release_dir, "proton")
@@ -167,7 +168,7 @@ build_dir = make_temp_dir()
with working_dir(build_dir):
call("cmake {}", source_dir)
- call("make tutorial-py")
+ call("make docs-py")
gen_proton_apis(release, source_dir, release_dir)
gen_proton_books(release, source_dir, release_dir, build_dir)
diff --git a/scripts/gen-proton-release-page b/scripts/gen-proton-release-page
index b55b6da..aa4279a 100755
--- a/scripts/gen-proton-release-page
+++ b/scripts/gen-proton-release-page
@@ -36,10 +36,10 @@ documentation = \
- [C++ examples](proton/cpp/examples/index.html)
- [C++ API reference](proton/cpp/api/annotated.html)
;; - [Go
binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md)
- - [Python overview](proton/python/book/overview.html)
- - [Python tutorial](proton/python/book/tutorial.html)
+ - [Python overview](proton/python/docs/overview.html)
+ - [Python tutorial](proton/python/docs/tutorial.html)
- [Python examples](proton/python/examples/index.html)
- - [Python API reference](proton/python/api/index.html)
+ - [Python API reference](proton/python/docs/index.html#modules)
- [Ruby examples](proton/ruby/examples/index.html)
- [Ruby API reference](proton/ruby/api/index.html)
- [Installing Qpid
Proton](https://gitbox.apache.org/repos/asf?p=qpid-proton.git;a=blob;f=INSTALL.md;hb={source_release})
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
