Modified: qpid/site/scripts/gen-java-release-page URL: http://svn.apache.org/viewvc/qpid/site/scripts/gen-java-release-page?rev=1705923&r1=1705922&r2=1705923&view=diff ============================================================================== --- qpid/site/scripts/gen-java-release-page (original) +++ qpid/site/scripts/gen-java-release-page Tue Sep 29 20:27:56 2015 @@ -76,14 +76,6 @@ template = \ ;; under the License. ;; -<script type="text/javascript"> - _deferredFunctions.push(function() {{ - if ("{release}" === "{{{{current_java_release}}}}") {{ - _modifyCurrentReleaseLinks(); - }} - }}); -</script> - # Qpid Java {release} Qpid Java offers an AMQP-fluent implementation of JMS and a message @@ -125,6 +117,14 @@ files you download. - [Resolved issues in JIRA]({issues_url}) - [Source repository branch](http://svn.apache.org/repos/asf/qpid/java/branches/{release}) - [Source repository tag](http://svn.apache.org/repos/asf/qpid/java/tags/{release}) + +<script type="text/javascript"> + _deferredFunctions.push(function() {{ + if ("{release}" === "{{{{current_java_release}}}}") {{ + _modifyCurrentReleaseLinks(); + }} + }}); +</script> """ def gen_release_page(release, release_dir): @@ -174,7 +174,10 @@ def gen_release_page(release, release_di jql = "project = QPID AND fixVersion = 'qpid-java-{}' ORDER BY priority DESC".format(release) issues_url = "https://issues.apache.org/jira/issues/?jql={}".format(urllib.quote_plus(jql)) - output = template.format(**locals()) + vars = locals() + vars["documentation"] = documentation + + output = template.format(**vars) output = output.strip() write(output_path, output) @@ -231,7 +234,10 @@ def gen_trunk_release_page(release_dir): date = now.strftime("%d %B %Y") time = now.strftime("%H:%M %Z") - output = trunk_template.format(documentation=documentation, **locals()) + vars = locals() + vars["documentation"] = documentation + + output = trunk_template.format(**vars) output = output.strip() write(output_path, output)
Modified: qpid/site/scripts/gen-jms-release-page URL: http://svn.apache.org/viewvc/qpid/site/scripts/gen-jms-release-page?rev=1705923&r1=1705922&r2=1705923&view=diff ============================================================================== --- qpid/site/scripts/gen-jms-release-page (original) +++ qpid/site/scripts/gen-jms-release-page Tue Sep 29 20:27:56 2015 @@ -26,6 +26,18 @@ download_records = ( ("apache-qpid-jms-{}-src.tar.gz", "Qpid JMS source code"), ) +documentation = \ +""" +<div class="two-column" markdown="1"> + + - [API reference](http://docs.oracle.com/javaee/1.4/api/javax/jms/package-summary.html) + - [Examples](https://github.com/apache/qpid-jms/tree/{release}/qpid-jms-examples) + - [Configuration](docs/index.html) + - [Building Qpid JMS](building.html) + +</div> +""" + template = \ """ ;; @@ -47,14 +59,6 @@ template = \ ;; under the License. ;; -<script type="text/javascript"> - _deferredFunctions.push(function() {{ - if ("{release}" === "{{{{current_jms_release}}}}") {{ - _modifyCurrentReleaseLinks(); - }} - }}); -</script> - # Qpid JMS {release} Qpid JMS is a complete [Java Message Service][jms] 1.1 client built @@ -76,22 +80,24 @@ files you download. {downloads} The client is also available [via Maven]({{{{site_url}}}}/maven.html). -## Documentation -<div class="two-column" markdown="1"> - - - [API reference](http://docs.oracle.com/javaee/1.4/api/javax/jms/package-summary.html) - - [Examples](https://github.com/apache/qpid-jms/tree/{release}/qpid-jms-examples) - - [Configuration](docs/index.html) - - [Building Qpid JMS](building.html) +## Documentation -</div> +{documentation} ## More information - [All release artefacts](http://archive.apache.org/dist/qpid/jms/{release}) - [Resolved issues in JIRA]({issues_url}) - [Source repository tag](https://git-wip-us.apache.org/repos/asf/qpid-jms.git/tree/refs/tags/{release}) + +<script type="text/javascript"> + _deferredFunctions.push(function() {{ + if ("{release}" === "{{{{current_jms_release}}}}") {{ + _modifyCurrentReleaseLinks(); + }} + }}); +</script> """ def gen_release_page(release, release_dir): @@ -117,12 +123,15 @@ def gen_release_page(release, release_di jql = "project = QPIDJMS AND fixVersion = '{}' ORDER BY priority DESC".format(release) issues_url = "https://issues.apache.org/jira/issues/?jql={}".format(urllib.quote_plus(jql)) - output = template.format(**locals()) + vars = locals() + vars["documentation"] = documentation.format(release=release) + + output = template.format(**vars) output = output.strip() write(output_path, output) -trunk_template = """ +master_template = """ ;; ;; Licensed to the Apache Software Foundation (ASF) under one ;; or more contributor license agreements. See the NOTICE file @@ -158,21 +167,14 @@ This content was generated at {time} on ## Documentation -<div class="two-column" markdown="1"> - - - [API reference](http://docs.oracle.com/javaee/1.4/api/javax/jms/package-summary.html) - - [Examples](https://github.com/apache/qpid-jms/tree/master/qpid-jms-examples) - - [Configuration](docs/index.html) - - [Building Qpid JMS](building.html) - -</div> +{documentation} ## More information - [Source repository](https://git-wip-us.apache.org/repos/asf/qpid-jms.git) """ -def gen_trunk_release_page(release_dir): +def gen_master_release_page(release_dir): output_path = join(release_dir, "index.md") now = datetime.now() @@ -181,15 +183,20 @@ def gen_trunk_release_page(release_dir): date = now.strftime("%d %B %Y") time = now.strftime("%H:%M %Z") - output = trunk_template.format(**locals()) + + + vars = locals() + vars["documentation"] = documentation.format(release="master") + + output = master_template.format(**vars) output = output.strip() write(output_path, output) release, release_dir, checkout_dir = setup_release_script() -if release == "trunk": - gen_trunk_release_page(release_dir) +if release == "master": + gen_master_release_page(release_dir) else: gen_release_page(release, release_dir) Modified: qpid/site/scripts/gen-proton-release-api-doc URL: http://svn.apache.org/viewvc/qpid/site/scripts/gen-proton-release-api-doc?rev=1705923&r1=1705922&r2=1705923&view=diff ============================================================================== --- qpid/site/scripts/gen-proton-release-api-doc (original) +++ qpid/site/scripts/gen-proton-release-api-doc Tue Sep 29 20:27:56 2015 @@ -84,24 +84,25 @@ def gen_python_api_doc(release, source_d input_namespaces=(input_namespace,), output_dir=output_dir) -# Tutorial +# Book -def gen_tutorial(release, source_dir, release_dir): +def gen_book(release, source_dir, release_dir): component_dir = join(release_dir, "proton") input_dir = join(source_dir, "proton-c", "bindings", "python", "tutorial") - output_dir = join(component_dir, "python", "tutorial") + output_dir = join(component_dir, "python", "book") remove(output_dir) - remove(join(input_dir, ".doctrees")) copy(input_dir, output_dir) + remove(join(output_dir, ".doctrees")) + ## Now do stuff ## release, release_dir, checkout_dir = setup_release_script() source_dir = export_release_from_git("proton", release) gen_api_doc(release, source_dir, release_dir) -gen_tutorial(release, source_dir, release_dir) +gen_book(release, source_dir, release_dir) notice("API documentation and tutorial generated") Modified: qpid/site/scripts/gen-proton-release-page URL: http://svn.apache.org/viewvc/qpid/site/scripts/gen-proton-release-page?rev=1705923&r1=1705922&r2=1705923&view=diff ============================================================================== --- qpid/site/scripts/gen-proton-release-page (original) +++ qpid/site/scripts/gen-proton-release-page Tue Sep 29 20:27:56 2015 @@ -25,6 +25,22 @@ download_records = ( ("qpid-proton-{}.tar.gz", "Qpid Proton"), ) +documentation = \ +""" +<div class="two-column" markdown="1"> + + - [C API reference](proton/c/api/files.html) + - [C++ API reference](proton/cpp/api/index.html) + - [Java API reference](proton/java/api/index.html) + - [Python API reference](proton/python/api/index.html) + - [Python tutorial](proton/python/book/tutorial.html) + - [Python examples](proton/python/examples/index.html) + - [Go binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md) + - [Installing Qpid Proton](https://git-wip-us.apache.org/repos/asf?p=qpid-proton.git;a=blob;f=INSTALL.md;hb={release}) + +</div> +""" + template = \ """ ;; @@ -46,14 +62,6 @@ template = \ ;; under the License. ;; -<script type="text/javascript"> - _deferredFunctions.push(function() {{ - if ("{release}" === "{{{{current_proton_release}}}}") {{ - _modifyCurrentReleaseLinks(); - }} - }}); -</script> - # Qpid Proton {release} Qpid Proton is a high-performance, lightweight messaging library. More @@ -74,16 +82,7 @@ the files you download. ## Documentation -<div class="two-column" markdown="1"> - - - [C API reference](proton/c/api/files.html) - - [Java API reference](proton/java/api/index.html) - - [Python tutorial](proton/python/tutorial/tutorial.html) - - [Python API reference](proton/python/api/index.html) - - [Python examples](proton/python/examples/index.html) - - [Installing Qpid Proton](https://git-wip-us.apache.org/repos/asf?p=qpid-proton.git;a=blob_plain;f=INSTALL.md;hb={release}) - -</div> +{documentation} ## More information @@ -91,6 +90,14 @@ the files you download. - [Resolved issues in JIRA]({issues_url}) - [Source repository branch](https://git-wip-us.apache.org/repos/asf?p=qpid-proton.git;a=tree;hb={release}) - [Source repository tag](https://git-wip-us.apache.org/repos/asf?p=qpid-proton.git;a=tag;h={release}) + +<script type="text/javascript"> + _deferredFunctions.push(function() {{ + if ("{release}" === "{{{{current_proton_release}}}}") {{ + _modifyCurrentReleaseLinks(); + }} + }}); +</script> """ def gen_release_page(release, release_dir): @@ -114,7 +121,10 @@ def gen_release_page(release, release_di jql = "project = PROTON AND fixVersion = '{}' ORDER BY priority DESC".format(release) issues_url = "https://issues.apache.org/jira/issues/?jql={}".format(urllib.quote_plus(jql)) - output = template.format(**locals()) + vars = locals() + vars["documentation"] = documentation.format(release=release) + + output = template.format(**vars) output = output.strip() write(output_path, output) @@ -155,16 +165,7 @@ This content was generated at {time} on ## Documentation -<div class="two-column" markdown="1"> - - - [C API reference](proton/c/api/files.html) - - [C++ API reference](proton/cpp/api/index.html) - - [Java API reference](proton/java/api/index.html) - - [Python API reference](proton/python/api/index.html) - - [Go binding](https://github.com/apache/qpid-proton/tree/master/proton-c/bindings/go/README.md) - - [Installing Qpid Proton](https://git-wip-us.apache.org/repos/asf?p=qpid-proton.git;a=blob_plain;f=README;hb=HEAD) - -</div> +{documentation} ## More information @@ -180,7 +181,10 @@ def gen_master_release_page(release_dir) date = now.strftime("%d %B %Y") time = now.strftime("%H:%M %Z") - output = master_template.format(**locals()) + vars = locals() + vars["documentation"] = documentation.format(release="master") + + output = master_template.format(**vars) output = output.strip() write(output_path, output) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
