You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2016/08/29 21:29:56 UTC
qpid-site git commit: QPID-7350: Prepare the cpp release scripts for
the changes to the cpp source location
Repository: qpid-site
Updated Branches:
refs/heads/asf-site 48fa05540 -> 3d5184674
QPID-7350: Prepare the cpp release scripts for the changes to the cpp source location
Project: http://git-wip-us.apache.org/repos/asf/qpid-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-site/commit/3d518467
Tree: http://git-wip-us.apache.org/repos/asf/qpid-site/tree/3d518467
Diff: http://git-wip-us.apache.org/repos/asf/qpid-site/diff/3d518467
Branch: refs/heads/asf-site
Commit: 3d5184674e9eebf33253408cc2ebaeac544cfd41
Parents: 48fa055
Author: Justin Ross <jr...@apache.org>
Authored: Mon Aug 29 14:26:27 2016 -0700
Committer: Justin Ross <jr...@apache.org>
Committed: Mon Aug 29 14:26:27 2016 -0700
----------------------------------------------------------------------
python/generate.py | 3 ++-
scripts/gen-cpp-release-api-doc | 14 ++++++-------
scripts/gen-cpp-release-books | 4 ++--
scripts/gen-cpp-release-examples | 24 +++++++++++------------
scripts/gen-cpp-release-page | 37 +++++++++++++----------------------
5 files changed, 37 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/3d518467/python/generate.py
----------------------------------------------------------------------
diff --git a/python/generate.py b/python/generate.py
index 9230fc7..7e7359e 100644
--- a/python/generate.py
+++ b/python/generate.py
@@ -114,7 +114,8 @@ def get_git_release_branch_url(module, release, path=""):
to.
"""
modules = {
- "proton": "https://github.com/apache/qpid-proton/tree"
+ "cpp": "https://github.com/apache/qpid-cpp/tree",
+ "proton": "https://github.com/apache/qpid-proton/tree",
}
if release == "trunk":
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/3d518467/scripts/gen-cpp-release-api-doc
----------------------------------------------------------------------
diff --git a/scripts/gen-cpp-release-api-doc b/scripts/gen-cpp-release-api-doc
index bc4a2b4..6726483 100755
--- a/scripts/gen-cpp-release-api-doc
+++ b/scripts/gen-cpp-release-api-doc
@@ -25,12 +25,12 @@ def gen_messaging_api(release, source_dir, release_dir):
remove(component_dir)
gen_cpp_messaging_api(release, source_dir, component_dir)
- gen_dotnet_messaging_api(release, source_dir, component_dir)
- gen_python_messaging_api(release, source_dir, component_dir)
- gen_ruby_messaging_api(release, source_dir, component_dir)
+ #gen_dotnet_messaging_api(release, source_dir, component_dir)
+ #gen_python_messaging_api(release, source_dir, component_dir)
+ #gen_ruby_messaging_api(release, source_dir, component_dir)
def gen_cpp_messaging_api(release, source_dir, component_dir):
- include_dir = join(source_dir, "cpp", "include")
+ include_dir = join(source_dir, "include")
input_paths = (
join(source_dir, "cpp", "docs", "api", "doxygen_mainpage.h"),
join(include_dir, "qpid", "messaging"),
@@ -45,7 +45,7 @@ def gen_cpp_messaging_api(release, source_dir, component_dir):
output_dir=output_dir)
def gen_dotnet_messaging_api(release, source_dir, component_dir):
- include_dir = join(source_dir, "cpp", "bindings", "qpid", "dotnet", "src")
+ include_dir = join(source_dir, "bindings", "qpid", "dotnet", "src")
input_paths = (include_dir,)
output_dir = join(component_dir, "dotnet", "api")
@@ -67,7 +67,7 @@ def gen_python_messaging_api(release, source_dir, component_dir):
output_dir=output_dir)
def gen_ruby_messaging_api(release, source_dir, component_dir):
- base_input_path = join(source_dir, "cpp", "bindings")
+ base_input_path = join(source_dir, "bindings")
input_path = join("qpid", "ruby", "lib")
output_dir = join(component_dir, "ruby", "api")
@@ -83,7 +83,7 @@ def gen_ruby_messaging_api(release, source_dir, component_dir):
## Now do stuff ##
release, issues_release, source_release, release_dir, checkout_dir = setup_release_script()
-source_dir = export_release("cpp", source_release, checkout_dir)
+source_dir = export_release_from_git("cpp", source_release)
gen_messaging_api(release, source_dir, release_dir)
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/3d518467/scripts/gen-cpp-release-books
----------------------------------------------------------------------
diff --git a/scripts/gen-cpp-release-books b/scripts/gen-cpp-release-books
index 0be67ad..69ba41b 100755
--- a/scripts/gen-cpp-release-books
+++ b/scripts/gen-cpp-release-books
@@ -24,7 +24,7 @@ import uuid
from xml.etree import ElementTree
def gen_books(release, source_dir, output_dir):
- input_dir = join(source_dir, "doc", "book")
+ input_dir = join(source_dir, "docs", "book")
stylesheet = """<?xml version='1.0'?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@@ -85,7 +85,7 @@ def remove_namespace(doc, namespace):
## Now do stuff ##
release, issues_release, source_release, release_dir, checkout_dir = setup_release_script()
-source_dir = export_release("cpp", source_release, checkout_dir)
+source_dir = export_release_from_git("cpp", source_release)
gen_books(release, source_dir, release_dir)
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/3d518467/scripts/gen-cpp-release-examples
----------------------------------------------------------------------
diff --git a/scripts/gen-cpp-release-examples b/scripts/gen-cpp-release-examples
index 4143698..3bf29cf 100755
--- a/scripts/gen-cpp-release-examples
+++ b/scripts/gen-cpp-release-examples
@@ -26,17 +26,17 @@ def gen_messaging_api(release, source_dir, release_dir):
component_dir = join(release_dir, "messaging-api")
gen_cpp_messaging_api(release, source_dir, component_dir)
- gen_dotnet_messaging_api(release, source_dir, component_dir)
- gen_python_messaging_api(release, source_dir, component_dir)
- gen_ruby_messaging_api(release, source_dir, component_dir)
+ #gen_dotnet_messaging_api(release, source_dir, component_dir)
+ #gen_python_messaging_api(release, source_dir, component_dir)
+ #gen_ruby_messaging_api(release, source_dir, component_dir)
def gen_cpp_messaging_api(release, source_dir, component_dir):
- input_dir = join(source_dir, "cpp", "examples", "messaging")
+ input_dir = join(source_dir, "examples", "messaging")
output_dir = join(component_dir, "cpp", "examples")
- release_url = get_svn_release_url("main", release)
- readme_url = "{}/cpp/examples/README.txt".format(release_url)
- source_url = "{}/cpp/examples/messaging".format(release_url)
+ release_url = get_git_release_branch_url("cpp", release)
+ readme_url = "https://git-wip-us.apache.org/repos/asf?p=qpid-cpp.git;a=blob_plain;f=examples/README.txt;hb=refs/heads/{}".format("master")
+ source_url = "https://git-wip-us.apache.org/repos/asf?p=qpid-cpp.git;a=tree;f=examples/messaging;hb=refs/heads/{}".format("master")
input_names = list_dir(input_dir, "*.cpp", "*.h")
@@ -50,11 +50,11 @@ def gen_cpp_messaging_api(release, source_dir, component_dir):
source_url=source_url)
def gen_dotnet_messaging_api(release, source_dir, component_dir):
- input_dir = join(source_dir, "cpp", "bindings", "qpid", "dotnet", "examples")
+ input_dir = join(source_dir, "bindings", "qpid", "dotnet", "examples")
output_dir = join(component_dir, "dotnet", "examples")
release_url = get_svn_release_url("main", release)
- source_url = "{}/cpp/bindings/qpid/dotnet/examples".format(release_url)
+ source_url = "{}/bindings/qpid/dotnet/examples".format(release_url)
# The layout of dotnet examples is funky, so some schlepping to
# normalize it
@@ -101,11 +101,11 @@ def gen_python_messaging_api(release, source_dir, component_dir):
source_url=source_url)
def gen_ruby_messaging_api(release, source_dir, component_dir):
- input_dir = join(source_dir, "cpp", "bindings", "qpid", "ruby", "examples")
+ input_dir = join(source_dir, "bindings", "qpid", "ruby", "examples")
output_dir = join(component_dir, "ruby", "examples")
release_url = get_svn_release_url("main", release)
- source_url = "{}/cpp/bindings/qpid/ruby/examples".format(release_url)
+ source_url = "{}/bindings/qpid/ruby/examples".format(release_url)
input_names = list_dir(input_dir, "*.rb")
@@ -120,7 +120,7 @@ def gen_ruby_messaging_api(release, source_dir, component_dir):
## Now do stuff ##
release, issues_release, source_release, release_dir, checkout_dir = setup_release_script()
-source_dir = export_release("cpp", source_release, checkout_dir)
+source_dir = export_release_from_git("cpp", source_release)
gen_messaging_api(release, source_dir, release_dir)
http://git-wip-us.apache.org/repos/asf/qpid-site/blob/3d518467/scripts/gen-cpp-release-page
----------------------------------------------------------------------
diff --git a/scripts/gen-cpp-release-page b/scripts/gen-cpp-release-page
index b6e541f..bd04089 100755
--- a/scripts/gen-cpp-release-page
+++ b/scripts/gen-cpp-release-page
@@ -23,12 +23,12 @@ from generate import *
from datetime import datetime
source_artefact_records = (
- ("qpid-cpp-{}.tar.gz", "C++ broker, Qpid Messaging API (C++, bindings)"),
+ ("qpid-cpp-{}.tar.gz", "C++ broker, Qpid Messaging API (C++)"),
)
component_records = (
("cpp-broker", "C++ broker", "C++", "Linux, Windows", "1.0, 0-10"),
- ("messaging-api", "Qpid Messaging API", "C++, Perl, Python, Ruby, .NET", "Linux, Windows", "1.0, 0-10"),
+ ("messaging-api", "Qpid Messaging API", "C++", "Linux, Windows", "1.0, 0-10"),
)
documentation = \
@@ -37,14 +37,8 @@ documentation = \
- [Installing Qpid C++](https://git-wip-us.apache.org/repos/asf?p=qpid-cpp.git;a=blob_plain;f=INSTALL.txt;hb=HEAD)
- [C++ broker book](cpp-broker/book/index.html) ([PDF](cpp-broker/cpp-broker-book.pdf))
- - [.NET API reference](messaging-api/dotnet/api/index.html)
- - [.NET examples](messaging-api/dotnet/examples/index.html)
- [C++ API reference](messaging-api/cpp/api/index.html)
- [C++ examples](messaging-api/cpp/examples/index.html)
- - [Python API reference](messaging-api/python/api/index.html)
- - [Python examples](messaging-api/python/examples/index.html)
- - [Ruby API reference](messaging-api/ruby/api/index.html)
- - [Ruby examples](messaging-api/ruby/examples/index.html)
</div>
"""
@@ -72,10 +66,9 @@ template = \
# Qpid C++ {release}
-Qpid C++ offers a connection-oriented messaging API supporting many
-programming languages and a message broker written in C++ that stores,
-routes, and forwards messages using AMQP. More about
-[Qpid]({{{{site_url}}}}/index.html).
+Qpid C++ offers a connection-oriented messaging API and a message
+broker written in C++ that stores, routes, and forwards messages using
+AMQP. More about [Qpid]({{{{site_url}}}}/index.html).
For a detailed list of the changes in this release, see the [release
notes](release-notes.html).
@@ -153,7 +146,7 @@ def gen_release_page(release, issues_release, source_release, release_dir):
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
@@ -173,30 +166,28 @@ trunk_template = """
;; under the License.
;;
-# Qpid C++ Trunk
+# Qpid C++ Master Documentation
<div class="feature" markdown="1">
## Warning! This is a snapshot of work in progress
-Code and documentation found here may be unstable, incorrect, or
-incomplete. For a smoother experience, see the [current stable
+Documentation found here may be unstable, incorrect, or incomplete.
+For a smoother experience, see the [current stable
release]({{{{current_cpp_release_url}}}}/index.html).
This content was generated at {time} on {day}, {date}.
</div>
-## Documentation
-
{documentation}
## More information
- [Source repository](https://git-wip-us.apache.org/repos/asf/qpid-cpp.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()
@@ -208,7 +199,7 @@ def gen_trunk_release_page(release_dir):
vars = locals()
vars["documentation"] = documentation
- output = trunk_template.format(**vars)
+ output = master_template.format(**vars)
output = output.strip()
write(output_path, output)
@@ -217,8 +208,8 @@ def gen_trunk_release_page(release_dir):
release, issues_release, source_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, issues_release, source_release, release_dir)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org