Repository: qpid-site Updated Branches: refs/heads/asf-site f74d600bf -> 0cf607fac
QPID-7265: update svn based release content generation to default to using tags by default, optionally branches via setting SOURCE_RELEASE with format 'branches/<version>' Project: http://git-wip-us.apache.org/repos/asf/qpid-site/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-site/commit/0cf607fa Tree: http://git-wip-us.apache.org/repos/asf/qpid-site/tree/0cf607fa Diff: http://git-wip-us.apache.org/repos/asf/qpid-site/diff/0cf607fa Branch: refs/heads/asf-site Commit: 0cf607fac7a1b9d65b2ce8c435895711cd748777 Parents: f74d600 Author: Robert Gemmell <[email protected]> Authored: Sun May 15 18:30:41 2016 +0100 Committer: Robert Gemmell <[email protected]> Committed: Sun May 15 18:30:41 2016 +0100 ---------------------------------------------------------------------- python/generate.py | 8 ++++---- scripts/gen-cpp-release-examples | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0cf607fa/python/generate.py ---------------------------------------------------------------------- diff --git a/python/generate.py b/python/generate.py index ff2e496..9230fc7 100644 --- a/python/generate.py +++ b/python/generate.py @@ -77,11 +77,11 @@ def setup_release_script(): return (release, issues_release, source_release, release_dir, checkout_dir) -def get_release_branch_url(module, release): +def get_svn_release_url(module, release): project_url = "http://svn.apache.org/repos/asf/qpid"; - release_path_prefix = "branches/" - if release.startswith("tags/"): + release_path_prefix = "tags/" + if release.startswith("branches/"): release_path_prefix = "" if module == "main": @@ -134,7 +134,7 @@ def export_release(module, release, checkout_dir): remove(export_dir) make_dir(split(export_dir)[0]) - uri = get_release_branch_url(module, release) + uri = get_svn_release_url(module, release) if checkout_dir is not None: uri = checkout_dir http://git-wip-us.apache.org/repos/asf/qpid-site/blob/0cf607fa/scripts/gen-cpp-release-examples ---------------------------------------------------------------------- diff --git a/scripts/gen-cpp-release-examples b/scripts/gen-cpp-release-examples index 98a08f5..4143698 100755 --- a/scripts/gen-cpp-release-examples +++ b/scripts/gen-cpp-release-examples @@ -34,7 +34,7 @@ def gen_cpp_messaging_api(release, source_dir, component_dir): input_dir = join(source_dir, "cpp", "examples", "messaging") output_dir = join(component_dir, "cpp", "examples") - release_url = get_release_branch_url("main", release) + 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) @@ -53,7 +53,7 @@ def gen_dotnet_messaging_api(release, source_dir, component_dir): input_dir = join(source_dir, "cpp", "bindings", "qpid", "dotnet", "examples") output_dir = join(component_dir, "dotnet", "examples") - release_url = get_release_branch_url("main", release) + release_url = get_svn_release_url("main", release) source_url = "{}/cpp/bindings/qpid/dotnet/examples".format(release_url) # The layout of dotnet examples is funky, so some schlepping to @@ -85,7 +85,7 @@ def gen_python_messaging_api(release, source_dir, component_dir): input_dir = join(source_dir, "python", "examples", "api") output_dir = join(component_dir, "python", "examples") - release_url = get_release_branch_url("main", release) + release_url = get_svn_release_url("main", release) readme_url = "{}/python/examples/README.txt".format(release_url) source_url = "{}/python/examples".format(release_url) @@ -104,7 +104,7 @@ def gen_ruby_messaging_api(release, source_dir, component_dir): input_dir = join(source_dir, "cpp", "bindings", "qpid", "ruby", "examples") output_dir = join(component_dir, "ruby", "examples") - release_url = get_release_branch_url("main", release) + release_url = get_svn_release_url("main", release) source_url = "{}/cpp/bindings/qpid/ruby/examples".format(release_url) input_names = list_dir(input_dir, "*.rb") --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
