Mercurial > louis > mq > lightsd
changeset 455:309dc021f81c
wip, some make release_docs fixes
| author | Louis Opter <kalessin@kalessin.fr> |
|---|---|
| date | Mon, 16 May 2016 00:01:52 -0700 |
| parents | d7f316a2ca2f |
| children | c6515904f07f |
| files | add_make_release.patch |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/add_make_release.patch Sat May 14 23:22:05 2016 -0700 +++ b/add_make_release.patch Mon May 16 00:01:52 2016 -0700 @@ -142,7 +142,7 @@ new file mode 100644 --- /dev/null +++ b/dist/CMakeLists.txt -@@ -0,0 +1,68 @@ +@@ -0,0 +1,70 @@ +IF ( + PYTHONINTERP_FOUND + AND PYTHON_VERSION_MAJOR EQUAL 3 @@ -194,6 +194,8 @@ + ) + ENDFOREACH () + ++ ADD_DEPENDENCIES(release_docs docs) ++ + SET( + EXTRA_OUTPUT + "${CMAKE_CURRENT_BINARY_DIR}/debuild" # release_debuild @@ -1051,7 +1053,7 @@ new file mode 100644 --- /dev/null +++ b/dist/release.py.in -@@ -0,0 +1,561 @@ +@@ -0,0 +1,559 @@ +#!/usr/bin/env python3 + +import click @@ -1536,19 +1538,17 @@ +def release_docs(): + version = semver.parse(LIGHTSD_VERSION) + dest_dir = os.path.join(LIGHTSD_DOCS_DIR, LIGHTSD_VERSION) -+ docs_dir = os.path.join(LIGHTSD_BINARY_DIR, "docs", "_build") ++ docs_dir = os.path.join(LIGHTSD_BINARY_DIR, "docs", "_build", ".") + os.makedirs(dest_dir, exist_ok=True) + if version["prerelease"] is None and version["build"] is None: + alias = "current" + else: + alias = "latest" + action_echo("Copying files into {}".format(dest_dir)) -+ subprocess.check_call([ -+ "cp", "-a", docs_dir + os.path.sep, dest_dir + os.path.sep -+ ]) ++ subprocess.check_call(["cp", "-av", docs_dir, dest_dir]) + action_echo("Updating alias {}".format(alias)) + subprocess.check_call([ -+ "ln", "-snf", dest_dir, os.path.join(LIGHTSD_DOCS_DIR, alias) ++ "ln", "-vrsnf", dest_dir, os.path.join(LIGHTSD_DOCS_DIR, alias) + ]) + result_echo("{} ({}) updated".format(dest_dir, alias)) +