[systemd-commits] 7 commits - docs/.gitignore make-directive-index.py Makefile.am Makefile-man.am make-man-index.py make-man-rules.py README src/python-systemd
Zbigniew Jędrzejewski-Szmek
zbyszek at kemper.freedesktop.org
Sat Mar 9 05:54:39 PST 2013
Makefile-man.am | 403 ++++++++++++++++++++++++++++++++++++
Makefile.am | 92 ++++++--
README | 1
docs/.gitignore | 1
make-directive-index.py | 9
make-man-index.py | 9
make-man-rules.py | 9
src/python-systemd/docs/conf.py | 13 -
src/python-systemd/docs/default.css | 196 +++++++++++++++++
9 files changed, 694 insertions(+), 39 deletions(-)
New commits:
commit fa28d83678ffe84efcabdb45bac6be39d4d91d98
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Fri Mar 8 13:46:21 2013 -0500
html: make python docs look more like the rest
The result is ugly enough, I hope, to motivate someone with
design skills to fix it.
diff --git a/src/python-systemd/docs/conf.py b/src/python-systemd/docs/conf.py
index ad3f002..1919170 100644
--- a/src/python-systemd/docs/conf.py
+++ b/src/python-systemd/docs/conf.py
@@ -28,7 +28,7 @@ import sys, os
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.coverage', 'sphinx.ext.viewcode']
# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ['.']
# The suffix of source filenames.
source_suffix = '.rst'
@@ -110,7 +110,7 @@ html_theme = 'default'
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = []
+html_static_path = ['.']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
diff --git a/src/python-systemd/docs/default.css b/src/python-systemd/docs/default.css
new file mode 100644
index 0000000..7c097d6
--- /dev/null
+++ b/src/python-systemd/docs/default.css
@@ -0,0 +1,196 @@
+ at import url("basic.css");
+
+/* -- page layout ----------------------------------------------------------- */
+
+div.documentwrapper {
+ float: left;
+ width: 100%;
+}
+
+div.bodywrapper {
+ margin: 0 0 0 230px;
+}
+
+div.body {
+ background-color: #ffffff;
+ color: #000000;
+ padding: 0 20px 30px 20px;
+}
+
+div.footer {
+ color: #ffffff;
+ width: 100%;
+ padding: 9px 0 9px 0;
+ text-align: center;
+ font-size: 75%;
+}
+
+div.footer a {
+ color: #ffffff;
+ text-decoration: underline;
+}
+
+div.related {
+ background-color: #133f52;
+ line-height: 30px;
+ color: #ffffff;
+}
+
+div.related a {
+ color: #ffffff;
+}
+
+div.sphinxsidebar {
+ background-color: #dddddd;
+}
+
+div.sphinxsidebar p.topless {
+ margin: 5px 10px 10px 10px;
+}
+
+div.sphinxsidebar ul {
+ margin: 10px;
+ padding: 0;
+}
+
+div.sphinxsidebar input {
+ border: 1px solid #000000;
+ font-family: sans-serif;
+ font-size: 1em;
+}
+
+
+
+/* -- hyperlink styles ------------------------------------------------------ */
+
+a {
+ text-decoration: none;
+}
+
+a:hover {
+ text-decoration: underline;
+}
+
+
+
+/* -- body styles ----------------------------------------------------------- */
+
+div.body h1,
+div.body h2,
+div.body h3,
+div.body h4,
+div.body h5,
+div.body h6 {
+ font-family: 'Trebuchet MS', sans-serif;
+ background-color: #f2f2f2;
+ font-weight: normal;
+ color: #20435c;
+ border-bottom: 1px solid #ccc;
+ margin: 20px -20px 10px -20px;
+ padding: 3px 0 3px 10px;
+}
+
+div.body h1 { margin-top: 0; font-size: 200%; }
+div.body h2 { font-size: 160%; }
+div.body h3 { font-size: 140%; }
+div.body h4 { font-size: 120%; }
+div.body h5 { font-size: 110%; }
+div.body h6 { font-size: 100%; }
+
+a.headerlink {
+ color: #c60f0f;
+ font-size: 0.8em;
+ padding: 0 4px 0 4px;
+ text-decoration: none;
+}
+
+a.headerlink:hover {
+ background-color: #c60f0f;
+ color: white;
+}
+
+div.body p, div.body dd, div.body li {
+ text-align: justify;
+ line-height: 130%;
+}
+
+div.admonition p.admonition-title + p {
+ display: inline;
+}
+
+div.admonition p {
+ margin-bottom: 5px;
+}
+
+div.admonition pre {
+ margin-bottom: 5px;
+}
+
+div.admonition ul, div.admonition ol {
+ margin-bottom: 5px;
+}
+
+div.note {
+ background-color: #eee;
+ border: 1px solid #ccc;
+}
+
+div.seealso {
+ background-color: #ffc;
+ border: 1px solid #ff6;
+}
+
+div.topic {
+ background-color: #eee;
+}
+
+div.warning {
+ background-color: #ffe4e4;
+ border: 1px solid #f66;
+}
+
+p.admonition-title {
+ display: inline;
+}
+
+p.admonition-title:after {
+ content: ":";
+}
+
+pre {
+ padding: 5px;
+ background-color: #eeffcc;
+ color: #333333;
+ line-height: 120%;
+ border: 1px solid #ac9;
+ border-left: none;
+ border-right: none;
+}
+
+tt {
+ background-color: #ecf0f3;
+ padding: 0 1px 0 1px;
+ font-size: 0.95em;
+}
+
+th {
+ background-color: #ede;
+}
+
+.warning tt {
+ background: #efc2c2;
+}
+
+.note tt {
+ background: #d6d6d6;
+}
+
+.viewcode-back {
+ font-family: sans-serif;
+}
+
+div.viewcode-block:target {
+ background-color: #f4debf;
+ border-top: 1px solid #ac9;
+ border-bottom: 1px solid #ac9;
+}
commit 9f06e912f6a0db45c80d41e94eea65caae7a7c90
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Fri Mar 8 11:45:37 2013 -0500
systemd-python: provide version info to sphinx
diff --git a/Makefile.am b/Makefile.am
index bea5452..7b1f17f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3551,7 +3551,7 @@ BUILT_SOURCES += \
src/python-systemd/id128-constants.h
PAPER = $(shell cat /etc/papersize 2>/dev/null || echo a4)
-SPHINXOPTS = -D latex_paper_size=$(PAPER)
+SPHINXOPTS = -D latex_paper_size=$(PAPER) -D version=$(VERSION) -D release=$(VERSION)
sphinx-%:
$(AM_V_at)test -n "$(SPHINX_BUILD)" || { echo " *** sphinx-build is not available"; exit 1; }
$(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/docs/html/python-systemd/
diff --git a/src/python-systemd/docs/conf.py b/src/python-systemd/docs/conf.py
index 4a55778..ad3f002 100644
--- a/src/python-systemd/docs/conf.py
+++ b/src/python-systemd/docs/conf.py
@@ -42,15 +42,6 @@ master_doc = 'index'
# General information about the project.
project = u'python-systemd'
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '197'
-# The full version, including alpha/beta/rc tags.
-release = '197'
-
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#language = None
commit 80cb917e6248c15fd4a95d29954b3fd1e3d66b06
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Thu Mar 7 20:13:40 2013 -0500
man: use lxml for faster generation and pretty printing
diff --git a/README b/README
index 9d7a547..b8d1f42 100644
--- a/README
+++ b/README
@@ -116,6 +116,7 @@ REQUIREMENTS:
gtkdocize (optional)
python (optional)
sphinx (optional)
+ python-lxml (entirely optional)
When systemd-hostnamed is used it is strongly recommended to
install nss-myhostname to ensure that in a world of
diff --git a/make-directive-index.py b/make-directive-index.py
index c61383b..039efaa 100755
--- a/make-directive-index.py
+++ b/make-directive-index.py
@@ -19,7 +19,12 @@
import sys
import collections
-import xml.etree.ElementTree as tree
+try:
+ from lxml import etree as tree
+ PRETTY = dict(pretty_print=True)
+except ImportError:
+ import xml.etree.ElementTree as tree
+ PRETTY = {}
import re
TEMPLATE = '''\
@@ -277,4 +282,4 @@ def make_page(*xml_files):
return _make_page(template, directive_groups, formatting)
if __name__ == '__main__':
- tree.dump(make_page(*sys.argv[1:]))
+ tree.dump(make_page(*sys.argv[1:]), **PRETTY)
diff --git a/make-man-index.py b/make-man-index.py
index d38d5b6..d9ab5cc 100755
--- a/make-man-index.py
+++ b/make-man-index.py
@@ -19,7 +19,12 @@
# along with systemd; If not, see <http://www.gnu.org/licenses/>.
import collections
-import xml.etree.ElementTree as tree
+try:
+ from lxml import etree as tree
+ PRETTY = dict(pretty_print=True)
+except ImportError:
+ import xml.etree.ElementTree as tree
+ PRETTY = {}
import sys
import re
MDASH = ' — ' if sys.version_info.major >= 3 else ' -- '
@@ -130,4 +135,4 @@ def make_page(xml_files):
return template
if __name__ == '__main__':
- tree.dump(make_page(sys.argv[1:]))
+ tree.dump(make_page(sys.argv[1:]), **PRETTY)
commit 87cfe600c7a5c0632f8dcc7713b0b1e3825b75cc
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Fri Mar 8 11:03:50 2013 -0500
build-sys: generate links for html alias pages
diff --git a/Makefile-man.am b/Makefile-man.am
index 8d48ee0..6e63135 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -283,6 +283,288 @@ man/systemd-udevd.8: man/systemd-udevd.service.8
man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8
man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8
man/systemd-user.conf.5: man/systemd-system.conf.5
+man/SD_ALERT.html: man/sd-daemon.html
+ $(html-alias)
+
+man/SD_CRIT.html: man/sd-daemon.html
+ $(html-alias)
+
+man/SD_DEBUG.html: man/sd-daemon.html
+ $(html-alias)
+
+man/SD_EMERG.html: man/sd-daemon.html
+ $(html-alias)
+
+man/SD_ERR.html: man/sd-daemon.html
+ $(html-alias)
+
+man/SD_ID128_CONST_STR.html: man/sd-id128.html
+ $(html-alias)
+
+man/SD_ID128_FORMAT_STR.html: man/sd-id128.html
+ $(html-alias)
+
+man/SD_ID128_FORMAT_VAL.html: man/sd-id128.html
+ $(html-alias)
+
+man/SD_ID128_MAKE.html: man/sd-id128.html
+ $(html-alias)
+
+man/SD_INFO.html: man/sd-daemon.html
+ $(html-alias)
+
+man/SD_JOURNAL_APPEND.html: man/sd_journal_get_fd.html
+ $(html-alias)
+
+man/SD_JOURNAL_FOREACH.html: man/sd_journal_next.html
+ $(html-alias)
+
+man/SD_JOURNAL_FOREACH_BACKWARDS.html: man/sd_journal_next.html
+ $(html-alias)
+
+man/SD_JOURNAL_FOREACH_DATA.html: man/sd_journal_get_data.html
+ $(html-alias)
+
+man/SD_JOURNAL_FOREACH_UNIQUE.html: man/sd_journal_query_unique.html
+ $(html-alias)
+
+man/SD_JOURNAL_INVALIDATE.html: man/sd_journal_get_fd.html
+ $(html-alias)
+
+man/SD_JOURNAL_LOCAL_ONLY.html: man/sd_journal_open.html
+ $(html-alias)
+
+man/SD_JOURNAL_NOP.html: man/sd_journal_get_fd.html
+ $(html-alias)
+
+man/SD_JOURNAL_RUNTIME_ONLY.html: man/sd_journal_open.html
+ $(html-alias)
+
+man/SD_JOURNAL_SUPPRESS_LOCATION.html: man/sd_journal_print.html
+ $(html-alias)
+
+man/SD_JOURNAL_SYSTEM_ONLY.html: man/sd_journal_open.html
+ $(html-alias)
+
+man/SD_LISTEN_FDS_START.html: man/sd_listen_fds.html
+ $(html-alias)
+
+man/SD_NOTICE.html: man/sd-daemon.html
+ $(html-alias)
+
+man/SD_WARNING.html: man/sd-daemon.html
+ $(html-alias)
+
+man/init.html: man/systemd.html
+ $(html-alias)
+
+man/poweroff.html: man/halt.html
+ $(html-alias)
+
+man/reboot.html: man/halt.html
+ $(html-alias)
+
+man/sd_id128_equal.html: man/sd-id128.html
+ $(html-alias)
+
+man/sd_id128_from_string.html: man/sd_id128_to_string.html
+ $(html-alias)
+
+man/sd_id128_get_boot.html: man/sd_id128_get_machine.html
+ $(html-alias)
+
+man/sd_id128_t.html: man/sd-id128.html
+ $(html-alias)
+
+man/sd_is_mq.html: man/sd_is_fifo.html
+ $(html-alias)
+
+man/sd_is_socket.html: man/sd_is_fifo.html
+ $(html-alias)
+
+man/sd_is_socket_inet.html: man/sd_is_fifo.html
+ $(html-alias)
+
+man/sd_is_socket_unix.html: man/sd_is_fifo.html
+ $(html-alias)
+
+man/sd_journal.html: man/sd_journal_open.html
+ $(html-alias)
+
+man/sd_journal_add_disjunction.html: man/sd_journal_add_match.html
+ $(html-alias)
+
+man/sd_journal_close.html: man/sd_journal_open.html
+ $(html-alias)
+
+man/sd_journal_enumerate_data.html: man/sd_journal_get_data.html
+ $(html-alias)
+
+man/sd_journal_enumerate_unique.html: man/sd_journal_query_unique.html
+ $(html-alias)
+
+man/sd_journal_flush_matches.html: man/sd_journal_add_match.html
+ $(html-alias)
+
+man/sd_journal_get_catalog_for_message_id.html: man/sd_journal_get_catalog.html
+ $(html-alias)
+
+man/sd_journal_get_cutoff_monotonic_usec.html: man/sd_journal_get_cutoff_realtime_usec.html
+ $(html-alias)
+
+man/sd_journal_get_data_threshold.html: man/sd_journal_get_data.html
+ $(html-alias)
+
+man/sd_journal_get_monotonic_usec.html: man/sd_journal_get_realtime_usec.html
+ $(html-alias)
+
+man/sd_journal_next_skip.html: man/sd_journal_next.html
+ $(html-alias)
+
+man/sd_journal_open_directory.html: man/sd_journal_open.html
+ $(html-alias)
+
+man/sd_journal_perror.html: man/sd_journal_print.html
+ $(html-alias)
+
+man/sd_journal_previous.html: man/sd_journal_next.html
+ $(html-alias)
+
+man/sd_journal_previous_skip.html: man/sd_journal_next.html
+ $(html-alias)
+
+man/sd_journal_printv.html: man/sd_journal_print.html
+ $(html-alias)
+
+man/sd_journal_process.html: man/sd_journal_get_fd.html
+ $(html-alias)
+
+man/sd_journal_reliable_fd.html: man/sd_journal_get_fd.html
+ $(html-alias)
+
+man/sd_journal_restart_data.html: man/sd_journal_get_data.html
+ $(html-alias)
+
+man/sd_journal_restart_unique.html: man/sd_journal_query_unique.html
+ $(html-alias)
+
+man/sd_journal_seek_cursor.html: man/sd_journal_seek_head.html
+ $(html-alias)
+
+man/sd_journal_seek_monotonic_usec.html: man/sd_journal_seek_head.html
+ $(html-alias)
+
+man/sd_journal_seek_realtime_usec.html: man/sd_journal_seek_head.html
+ $(html-alias)
+
+man/sd_journal_seek_tail.html: man/sd_journal_seek_head.html
+ $(html-alias)
+
+man/sd_journal_send.html: man/sd_journal_print.html
+ $(html-alias)
+
+man/sd_journal_sendv.html: man/sd_journal_print.html
+ $(html-alias)
+
+man/sd_journal_set_data_threshold.html: man/sd_journal_get_data.html
+ $(html-alias)
+
+man/sd_journal_test_cursor.html: man/sd_journal_get_cursor.html
+ $(html-alias)
+
+man/sd_journal_wait.html: man/sd_journal_get_fd.html
+ $(html-alias)
+
+man/sd_notifyf.html: man/sd_notify.html
+ $(html-alias)
+
+man/systemd-ask-password-console.path.html: man/systemd-ask-password-console.service.html
+ $(html-alias)
+
+man/systemd-ask-password-wall.path.html: man/systemd-ask-password-console.service.html
+ $(html-alias)
+
+man/systemd-ask-password-wall.service.html: man/systemd-ask-password-console.service.html
+ $(html-alias)
+
+man/systemd-fsck-root.service.html: man/systemd-fsck at .service.html
+ $(html-alias)
+
+man/systemd-fsck.html: man/systemd-fsck at .service.html
+ $(html-alias)
+
+man/systemd-hibernate.service.html: man/systemd-suspend.service.html
+ $(html-alias)
+
+man/systemd-hybrid-sleep.service.html: man/systemd-suspend.service.html
+ $(html-alias)
+
+man/systemd-initctl.html: man/systemd-initctl.service.html
+ $(html-alias)
+
+man/systemd-initctl.socket.html: man/systemd-initctl.service.html
+ $(html-alias)
+
+man/systemd-journald.html: man/systemd-journald.service.html
+ $(html-alias)
+
+man/systemd-journald.socket.html: man/systemd-journald.service.html
+ $(html-alias)
+
+man/systemd-kexec.service.html: man/systemd-halt.service.html
+ $(html-alias)
+
+man/systemd-poweroff.service.html: man/systemd-halt.service.html
+ $(html-alias)
+
+man/systemd-reboot.service.html: man/systemd-halt.service.html
+ $(html-alias)
+
+man/systemd-remount-fs.html: man/systemd-remount-fs.service.html
+ $(html-alias)
+
+man/systemd-shutdown.html: man/systemd-halt.service.html
+ $(html-alias)
+
+man/systemd-shutdownd.html: man/systemd-shutdownd.service.html
+ $(html-alias)
+
+man/systemd-shutdownd.socket.html: man/systemd-shutdownd.service.html
+ $(html-alias)
+
+man/systemd-sleep.html: man/systemd-suspend.service.html
+ $(html-alias)
+
+man/systemd-sysctl.html: man/systemd-sysctl.service.html
+ $(html-alias)
+
+man/systemd-tmpfiles-clean.service.html: man/systemd-tmpfiles.html
+ $(html-alias)
+
+man/systemd-tmpfiles-clean.timer.html: man/systemd-tmpfiles.html
+ $(html-alias)
+
+man/systemd-tmpfiles-setup.service.html: man/systemd-tmpfiles.html
+ $(html-alias)
+
+man/systemd-udevd-control.socket.html: man/systemd-udevd.service.html
+ $(html-alias)
+
+man/systemd-udevd-kernel.socket.html: man/systemd-udevd.service.html
+ $(html-alias)
+
+man/systemd-udevd.html: man/systemd-udevd.service.html
+ $(html-alias)
+
+man/systemd-update-utmp-shutdown.service.html: man/systemd-update-utmp-runlevel.service.html
+ $(html-alias)
+
+man/systemd-update-utmp.html: man/systemd-update-utmp-runlevel.service.html
+ $(html-alias)
+
+man/systemd-user.conf.html: man/systemd-system.conf.html
+ $(html-alias)
+
if ENABLE_BINFMT
MANPAGES += \
@@ -291,6 +573,9 @@ MANPAGES += \
MANPAGES_ALIAS += \
man/systemd-binfmt.8
man/systemd-binfmt.8: man/systemd-binfmt.service.8
+man/systemd-binfmt.html: man/systemd-binfmt.service.html
+ $(html-alias)
+
endif
if ENABLE_BOOTCHART
@@ -300,6 +585,7 @@ MANPAGES += \
MANPAGES_ALIAS += \
#
+
endif
if ENABLE_COREDUMP
@@ -308,6 +594,7 @@ MANPAGES += \
MANPAGES_ALIAS += \
#
+
endif
if ENABLE_HOSTNAMED
@@ -317,6 +604,9 @@ MANPAGES += \
MANPAGES_ALIAS += \
man/systemd-hostnamed.8
man/systemd-hostnamed.8: man/systemd-hostnamed.service.8
+man/systemd-hostnamed.html: man/systemd-hostnamed.service.html
+ $(html-alias)
+
endif
if ENABLE_LOCALED
@@ -326,6 +616,9 @@ MANPAGES += \
MANPAGES_ALIAS += \
man/systemd-localed.8
man/systemd-localed.8: man/systemd-localed.service.8
+man/systemd-localed.html: man/systemd-localed.service.html
+ $(html-alias)
+
endif
if ENABLE_LOGIND
@@ -335,6 +628,9 @@ MANPAGES += \
MANPAGES_ALIAS += \
man/systemd-logind.8
man/systemd-logind.8: man/systemd-logind.service.8
+man/systemd-logind.html: man/systemd-logind.service.html
+ $(html-alias)
+
endif
if ENABLE_QUOTACHECK
@@ -343,6 +639,9 @@ MANPAGES += \
MANPAGES_ALIAS += \
man/systemd-quotacheck.8
man/systemd-quotacheck.8: man/systemd-quotacheck.service.8
+man/systemd-quotacheck.html: man/systemd-quotacheck.service.html
+ $(html-alias)
+
endif
if ENABLE_RANDOMSEED
@@ -353,6 +652,12 @@ MANPAGES_ALIAS += \
man/systemd-random-seed.8
man/systemd-random-seed-save.service.8: man/systemd-random-seed-load.service.8
man/systemd-random-seed.8: man/systemd-random-seed-load.service.8
+man/systemd-random-seed-save.service.html: man/systemd-random-seed-load.service.html
+ $(html-alias)
+
+man/systemd-random-seed.html: man/systemd-random-seed-load.service.html
+ $(html-alias)
+
endif
if ENABLE_READAHEAD
@@ -369,6 +674,18 @@ man/systemd-readahead-collect.service.8: man/systemd-readahead-replay.service.8
man/systemd-readahead-done.service.8: man/systemd-readahead-replay.service.8
man/systemd-readahead-done.timer.8: man/systemd-readahead-replay.service.8
man/systemd-readahead.8: man/systemd-readahead-replay.service.8
+man/systemd-readahead-collect.service.html: man/systemd-readahead-replay.service.html
+ $(html-alias)
+
+man/systemd-readahead-done.service.html: man/systemd-readahead-replay.service.html
+ $(html-alias)
+
+man/systemd-readahead-done.timer.html: man/systemd-readahead-replay.service.html
+ $(html-alias)
+
+man/systemd-readahead.html: man/systemd-readahead-replay.service.html
+ $(html-alias)
+
endif
if ENABLE_TIMEDATED
@@ -378,6 +695,9 @@ MANPAGES += \
MANPAGES_ALIAS += \
man/systemd-timedated.8
man/systemd-timedated.8: man/systemd-timedated.service.8
+man/systemd-timedated.html: man/systemd-timedated.service.html
+ $(html-alias)
+
endif
if ENABLE_VCONSOLE
@@ -387,6 +707,9 @@ MANPAGES += \
MANPAGES_ALIAS += \
man/systemd-vconsole-setup.8
man/systemd-vconsole-setup.8: man/systemd-vconsole-setup.service.8
+man/systemd-vconsole-setup.html: man/systemd-vconsole-setup.service.html
+ $(html-alias)
+
endif
if HAVE_KMOD
@@ -396,6 +719,9 @@ MANPAGES += \
MANPAGES_ALIAS += \
man/systemd-modules-load.8
man/systemd-modules-load.8: man/systemd-modules-load.service.8
+man/systemd-modules-load.html: man/systemd-modules-load.service.html
+ $(html-alias)
+
endif
if HAVE_LIBCRYPTSETUP
@@ -406,6 +732,9 @@ MANPAGES += \
MANPAGES_ALIAS += \
man/systemd-cryptsetup.8
man/systemd-cryptsetup.8: man/systemd-cryptsetup at .service.8
+man/systemd-cryptsetup.html: man/systemd-cryptsetup at .service.html
+ $(html-alias)
+
endif
if HAVE_MICROHTTPD
@@ -416,6 +745,12 @@ MANPAGES_ALIAS += \
man/systemd-journal-gatewayd.socket.8
man/systemd-journal-gatewayd.8: man/systemd-journal-gatewayd.service.8
man/systemd-journal-gatewayd.socket.8: man/systemd-journal-gatewayd.service.8
+man/systemd-journal-gatewayd.html: man/systemd-journal-gatewayd.service.html
+ $(html-alias)
+
+man/systemd-journal-gatewayd.socket.html: man/systemd-journal-gatewayd.service.html
+ $(html-alias)
+
endif
if HAVE_MYHOSTNAME
@@ -424,6 +759,7 @@ MANPAGES += \
MANPAGES_ALIAS += \
#
+
endif
if HAVE_PAM
@@ -483,6 +819,72 @@ man/sd_uid_get_seats.3: man/sd_uid_get_state.3
man/sd_uid_get_sessions.3: man/sd_uid_get_state.3
man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3
man/systemd-user-sessions.8: man/systemd-user-sessions.service.8
+man/sd_get_sessions.html: man/sd_get_seats.html
+ $(html-alias)
+
+man/sd_get_uids.html: man/sd_get_seats.html
+ $(html-alias)
+
+man/sd_login_monitor.html: man/sd_login_monitor_new.html
+ $(html-alias)
+
+man/sd_login_monitor_flush.html: man/sd_login_monitor_new.html
+ $(html-alias)
+
+man/sd_login_monitor_get_fd.html: man/sd_login_monitor_new.html
+ $(html-alias)
+
+man/sd_login_monitor_unref.html: man/sd_login_monitor_new.html
+ $(html-alias)
+
+man/sd_pid_get_owner_uid.html: man/sd_pid_get_session.html
+ $(html-alias)
+
+man/sd_pid_get_unit.html: man/sd_pid_get_session.html
+ $(html-alias)
+
+man/sd_seat_can_multi_session.html: man/sd_seat_get_active.html
+ $(html-alias)
+
+man/sd_seat_get_sessions.html: man/sd_seat_get_active.html
+ $(html-alias)
+
+man/sd_session_get_class.html: man/sd_session_is_active.html
+ $(html-alias)
+
+man/sd_session_get_display.html: man/sd_session_is_active.html
+ $(html-alias)
+
+man/sd_session_get_seat.html: man/sd_session_is_active.html
+ $(html-alias)
+
+man/sd_session_get_service.html: man/sd_session_is_active.html
+ $(html-alias)
+
+man/sd_session_get_state.html: man/sd_session_is_active.html
+ $(html-alias)
+
+man/sd_session_get_tty.html: man/sd_session_is_active.html
+ $(html-alias)
+
+man/sd_session_get_type.html: man/sd_session_is_active.html
+ $(html-alias)
+
+man/sd_session_get_uid.html: man/sd_session_is_active.html
+ $(html-alias)
+
+man/sd_uid_get_seats.html: man/sd_uid_get_state.html
+ $(html-alias)
+
+man/sd_uid_get_sessions.html: man/sd_uid_get_state.html
+ $(html-alias)
+
+man/sd_uid_is_on_seat.html: man/sd_uid_get_state.html
+ $(html-alias)
+
+man/systemd-user-sessions.html: man/systemd-user-sessions.service.html
+ $(html-alias)
+
endif
if HAVE_PYTHON
@@ -492,6 +894,7 @@ MANPAGES += \
MANPAGES_ALIAS += \
#
+
endif
CLEANFILES += \
diff --git a/Makefile.am b/Makefile.am
index bae7385..bea5452 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -109,6 +109,7 @@ pkginclude_HEADERS =
noinst_LTLIBRARIES =
lib_LTLIBRARIES =
include_HEADERS =
+noinst_DATA =
pkgconfiglib_DATA =
polkitpolicy_in_in_files =
polkitpolicy_in_files =
@@ -260,6 +261,10 @@ AM_V_GPERF = $(AM_V_GPERF_$(V))
AM_V_GPERF_ = $(AM_V_GPERF_$(AM_DEFAULT_VERBOSITY))
AM_V_GPERF_0 = @echo " GPERF " $@;
+AM_V_LN = $(AM_V_LN_$(V))
+AM_V_LN_ = $(AM_V_LN_$(AM_DEFAULT_VERBOSITY))
+AM_V_LN_0 = @echo " LN " $@;
+
# ------------------------------------------------------------------------------
rootbin_PROGRAMS = \
systemctl \
@@ -506,51 +511,43 @@ XML_FILES = \
${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
HTML_FILES = \
${XML_FILES:.xml=.html}
+HTML_ALIAS = \
+ ${patsubst %.1,%.html,${patsubst %.3,%.html,${patsubst %.5,%.html,${patsubst %.7,%.html,${patsubst %.8,%.html,$(MANPAGES_ALIAS)}}}}}
if ENABLE_MANPAGES
man_MANS = \
$(MANPAGES) \
$(MANPAGES_ALIAS)
-noinst_DATA = \
- $(HTML_FILES)
+noinst_DATA += \
+ $(HTML_FILES) \
+ $(HTML_ALIAS)
CLEANFILES += \
$(man_MANS) \
- $(HTML_FILES)
+ $(HTML_FILES) \
+ $(HTML_ALIAS)
+
+docs/html/man:
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_LN)$(LN_S) -f ../../man $@
noinst_DATA += \
- docs/html/libudev \
- docs/html/gudev \
docs/html/man
-DISTCLEAN_LOCAL_HOOKS += clean-html-links
-
-clean-html-links:
- rm -f docs/html/libudev docs/html/gudev docs/html/man
+CLEANFILES += \
+ docs/html/man
if HAVE_PYTHON
+man/index.html: man/systemd.index.html
+ $(AM_V_LN)$(LN_S) -f systemd.index.html $@
+
noinst_DATA += \
man/index.html
CLEANFILES += \
man/index.html
-man/index.html: man/systemd.index.html
- $(AM_V_GEN)$(LN_S) -f systemd.index.html $@
-
-docs/html/libudev:
- $(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_LN)$(LN_S) -f ../libudev/html $@
-
-docs/html/gudev:
- $(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_LN)$(LN_S) -f ../gudev/html $@
-
-docs/html/man:
- $(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_LN)$(LN_S) -f ../../man $@
-
NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_srcdir)/man/*.xml.in $(top_builddir)/man/*.xml)
@@ -583,6 +580,7 @@ endif
EXTRA_DIST += \
$(XML_FILES) \
$(HTML_FILES) \
+ $(HTML_ALIAS) \
$(dist_MANS) \
make-man-index.py \
make-directive-index.py
@@ -1640,6 +1638,10 @@ EXTRA_DIST += \
if ENABLE_GTK_DOC
SUBDIRS += \
docs/libudev
+
+noinst_DATA += \
+ docs/html/libudev \
+ docs/html/gudev
endif
include_HEADERS += \
@@ -1682,7 +1684,17 @@ EXTRA_DIST += \
src/libudev/libudev.sym
CLEANFILES += \
- src/libudev/libudev.pc
+ src/libudev/libudev.pc \
+ docs/html/libudev \
+ docs/html/gudev
+
+docs/html/libudev:
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_LN)$(LN_S) -f ../libudev/html $@
+
+docs/html/gudev:
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_LN)$(LN_S) -f ../gudev/html $@
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libudev-install-hook:
@@ -3537,7 +3549,6 @@ src/python-systemd/id128-constants.h: src/systemd/sd-messages.h Makefile
BUILT_SOURCES += \
src/python-systemd/id128-constants.h
-endif
PAPER = $(shell cat /etc/papersize 2>/dev/null || echo a4)
SPHINXOPTS = -D latex_paper_size=$(PAPER)
@@ -3552,6 +3563,8 @@ destdir-sphinx: all
$(MAKE) DESTDIR="$$dir" sphinx-html && \
rm -rf "$$dir"
+endif
+
CLEAN_LOCAL_HOOKS += clean-sphinx
clean-sphinx:
@@ -3694,6 +3707,11 @@ man/%.8: man/%.xml
man/%.html: man/%.xml man/custom-html.xsl
$(XSLTPROC_PROCESS_HTML)
+
+define html-alias
+ $(AM_V_LN)$(LN_S) $(notdir $<) $@
+endef
+
endif
# ------------------------------------------------------------------------------
diff --git a/make-man-rules.py b/make-man-rules.py
index 5415984..9f53b55 100644
--- a/make-man-rules.py
+++ b/make-man-rules.py
@@ -29,6 +29,7 @@ MANPAGES += \\
MANPAGES_ALIAS += \\
{aliases}
{rules}
+{htmlrules}
'''
CONDITIONAL = '''\
@@ -51,6 +52,11 @@ CLEANFILES += \\
{cleanfiles}
'''
+HTML_ALIAS_RULE = '''\
+{}.html: {}.html
+ $(html-alias)
+'''
+
def man(page, number):
return 'man/{}.{}'.format(page, number)
@@ -91,6 +97,9 @@ def make_makefile(rules, cleanfiles):
rules='\n'.join('{}: {}'.format(k,v)
for k,v in sorted(rulegroup.items())
if k != v),
+ htmlrules='\n'.join(HTML_ALIAS_RULE.format(k[:-2],v[:-2])
+ for k,v in sorted(rulegroup.items())
+ if k != v),
conditional=conditional)
for conditional,rulegroup in sorted(rules.items())) + \
CLEANFILES.format(cleanfiles=mjoin(cleanfiles))
commit 9b2810721d63c6c5daedd4f86c963eb69f7ab120
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Fri Mar 8 10:27:44 2013 -0500
build-sys: assemble HTML in docs/html
The goal is to be able to preview how the documenation
will look when uploaded. Just point your browser at
docs/html/man/index.html.
diff --git a/Makefile.am b/Makefile.am
index 6634a8c..bae7385 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -104,6 +104,7 @@ UNINSTALL_EXEC_HOOKS =
INSTALL_DATA_HOOKS =
UNINSTALL_DATA_HOOKS =
DISTCLEAN_LOCAL_HOOKS =
+CLEAN_LOCAL_HOOKS =
pkginclude_HEADERS =
noinst_LTLIBRARIES =
lib_LTLIBRARIES =
@@ -518,16 +519,38 @@ CLEANFILES += \
$(man_MANS) \
$(HTML_FILES)
+noinst_DATA += \
+ docs/html/libudev \
+ docs/html/gudev \
+ docs/html/man
+
+DISTCLEAN_LOCAL_HOOKS += clean-html-links
+
+clean-html-links:
+ rm -f docs/html/libudev docs/html/gudev docs/html/man
+
if HAVE_PYTHON
noinst_DATA += \
man/index.html
CLEANFILES += \
- man/index.html
+ man/index.html
-man/index.html:
+man/index.html: man/systemd.index.html
$(AM_V_GEN)$(LN_S) -f systemd.index.html $@
+docs/html/libudev:
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_LN)$(LN_S) -f ../libudev/html $@
+
+docs/html/gudev:
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_LN)$(LN_S) -f ../gudev/html $@
+
+docs/html/man:
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_LN)$(LN_S) -f ../../man $@
+
NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_srcdir)/man/*.xml.in $(top_builddir)/man/*.xml)
@@ -3520,8 +3543,8 @@ PAPER = $(shell cat /etc/papersize 2>/dev/null || echo a4)
SPHINXOPTS = -D latex_paper_size=$(PAPER)
sphinx-%:
$(AM_V_at)test -n "$(SPHINX_BUILD)" || { echo " *** sphinx-build is not available"; exit 1; }
- $(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/docs/python-systemd/
- $(AM_V_at)echo Output has been generated in $(abs_top_builddir)/docs/python-systemd/
+ $(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/docs/html/python-systemd/
+ $(AM_V_at)echo Output has been generated in $(abs_top_builddir)/docs/html/python-systemd/
destdir-sphinx: all
dir="$$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
@@ -3529,6 +3552,11 @@ destdir-sphinx: all
$(MAKE) DESTDIR="$$dir" sphinx-html && \
rm -rf "$$dir"
+CLEAN_LOCAL_HOOKS += clean-sphinx
+
+clean-sphinx:
+ -rm -rf docs/html/python-systemd/
+
# ------------------------------------------------------------------------------
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -3802,7 +3830,7 @@ install-data-hook: $(INSTALL_DATA_HOOKS)
distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
-clean-local:
+clean-local: $(CLEAN_LOCAL_HOOKS)
rm -rf $(abs_srcdir)/install-tree
rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt \
$(abs_srcdir)/hwdb/iab.txt
diff --git a/docs/.gitignore b/docs/.gitignore
index e9fed44..f48033d 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1 +1,2 @@
/gtk-doc.make
+/html/
commit 86b4547712d5d8a67c269b3bd737393903c409e3
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Fri Mar 8 09:58:29 2013 -0500
build-sys: clean up make clean
diff --git a/Makefile.am b/Makefile.am
index d85eb70..6634a8c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -114,7 +114,6 @@ polkitpolicy_in_files =
polkitpolicy_files =
dist_udevrules_DATA =
nodist_udevrules_DATA =
-dist_man_MANS =
dist_pkgsysconf_DATA =
dist_pkgdata_DATA =
dist_dbuspolicy_DATA =
@@ -504,6 +503,8 @@ include Makefile-man.am
XML_FILES = \
${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
+HTML_FILES = \
+ ${XML_FILES:.xml=.html}
if ENABLE_MANPAGES
man_MANS = \
@@ -511,12 +512,11 @@ man_MANS = \
$(MANPAGES_ALIAS)
noinst_DATA = \
- ${XML_FILES:.xml=.html}
+ $(HTML_FILES)
CLEANFILES += \
- $(MANPAGES) \
- $(MANPAGES_ALIAS) \
- ${XML_FILES:.xml=.html}
+ $(man_MANS) \
+ $(HTML_FILES)
if HAVE_PYTHON
noinst_DATA += \
@@ -549,15 +549,18 @@ EXTRA_DIST += \
man/index.html \
man/systemd.directives.xml
+CLEANFILES += \
+ man/systemd.index.xml \
+ man/systemd.directives.xml
+
endif
endif
EXTRA_DIST += \
$(XML_FILES) \
- ${XML_FILES:.xml=.html} \
- $(MANPAGES) \
- $(MANPAGES_ALIAS) \
+ $(HTML_FILES) \
+ $(dist_MANS) \
make-man-index.py \
make-directive-index.py
@@ -3624,7 +3627,6 @@ EXTRA_DIST += \
CLEANFILES += \
$(nodist_systemunit_DATA) \
$(nodist_userunit_DATA) \
- $(nodist_man_MANS) \
$(pkgconfigdata_DATA) \
$(pkgconfiglib_DATA) \
$(nodist_polkitpolicy_DATA)
@@ -3664,10 +3666,6 @@ man/%.8: man/%.xml
man/%.html: man/%.xml man/custom-html.xsl
$(XSLTPROC_PROCESS_HTML)
-
-CLEANFILES += \
- $(dist_man_MANS) \
- ${XML_FILES:.xml=.html}
endif
# ------------------------------------------------------------------------------
commit f6354e8c113e9e6e63f4c517b9a2dbccacb9af64
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Fri Mar 8 23:06:55 2013 -0500
build-sys: fix distcheck
diff --git a/Makefile.am b/Makefile.am
index afd259a..d85eb70 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2572,7 +2572,7 @@ endif
# "adm" and "wheel".
libsystemd-journal-install-hook:
libname=libsystemd-journal.so && $(move-to-rootlibdir)
- $(MKDIR_P) $(DESTDIR)/var/log/journal
+ -$(MKDIR_P) $(DESTDIR)/var/log/journal
-chown 0:0 $(DESTDIR)/var/log/journal
-chmod 755 $(DESTDIR)/var/log/journal
-setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/
More information about the systemd-commits
mailing list