Author: pierre
Date: Sat Jan 12 06:57:16 2019
New Revision: 20960
Log:
Make docutils P3 only and tweak mercurial doc for using docutils
Make P2 recommended for dbus-python, and fix an url
Modified:
trunk/BOOK/general/prog/dbus-python.xml
trunk/BOOK/general/prog/docutils.xml
trunk/BOOK/general/prog/mercurial.xml
trunk/BOOK/introduction/welcome/changelog.xml
Modified: trunk/BOOK/general/prog/dbus-python.xml
==============================================================================
--- trunk/BOOK/general/prog/dbus-python.xml Sat Jan 12 02:22:08 2019
(r20959)
+++ trunk/BOOK/general/prog/dbus-python.xml Sat Jan 12 06:57:16 2019
(r20960)
@@ -73,9 +73,14 @@
<xref linkend="glib2"/>
</para>
+ <bridgehead renderas="sect5">Recommended</bridgehead>
+ <para role="recommended">
+ <xref linkend="python2"/> (some applications in the book require
+ the Python 2 module)
+ </para>
+
<bridgehead renderas="sect5">Optional</bridgehead>
<para role="optional">
- <xref linkend="python2"/> and
<ulink url="https://pypi.python.org/pypi/tap.py/";>tap.py</ulink>
(required for tests)
</para>
@@ -84,7 +89,8 @@
Optional (Required to build the API and HTML Documentation)</bridgehead>
<para role="optional">
<xref linkend="docutils"/> and
- <ulink url="http://sphinxsearch.com/downloads/";>Sphinx</ulink>
+ <ulink url="http://www.sphinx-doc.org/en/master/";>Sphinx</ulink> with
+ <ulink
url="https://github.com/rtfd/sphinx_rtd_theme";>sphinx_rtd_theme</ulink>
</para>
<para condition="html" role="usernotes">User Notes:
Modified: trunk/BOOK/general/prog/docutils.xml
==============================================================================
--- trunk/BOOK/general/prog/docutils.xml Sat Jan 12 02:22:08 2019
(r20959)
+++ trunk/BOOK/general/prog/docutils.xml Sat Jan 12 06:57:16 2019
(r20960)
@@ -8,7 +8,7 @@
<!ENTITY docutils-download-ftp " ">
<!ENTITY docutils-md5sum "c53768d63db3873b7d452833553469de">
<!ENTITY docutils-size "1.6 MB">
- <!ENTITY docutils-buildsize "12 MB">
+ <!ENTITY docutils-buildsize "17 MB">
<!ENTITY docutils-time "0.4 SBU">
]>
@@ -68,15 +68,11 @@
<bridgehead renderas="sect4">Docutils Dependencies</bridgehead>
- <bridgehead renderas="sect5">Recommended</bridgehead>
- <para role="recommended">
+ <bridgehead renderas="sect5">Optional</bridgehead>
+ <para role="optional">
<xref linkend="python2"/>
</para>
- <note><para>This package can be installed with
- <application>Python 3</application>, but some packages require
- <application>Python 2</application>.</para></note>
-
<para condition="html" role="usernotes">
User Notes: <ulink url="&blfs-wiki;/docutils"/>
</para>
@@ -88,11 +84,11 @@
<!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
<para>
- To build the <application>Python 2</application> applications,
+ To build the <application>Python 3</application> applications,
run the following command:
</para>
-<screen><userinput>python setup.py build</userinput></screen>
+<screen><userinput>python3 setup.py build</userinput></screen>
<para>
To install the <application>Python</application> applications
@@ -100,7 +96,7 @@
<systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>python setup.py install --optimize=1 &&
+<screen role="root"><userinput>python3 setup.py install --optimize=1 &&
for f in /usr/bin/rst*.py; do
ln -svf $(basename $f) /usr/bin/$(basename $f .py)
Modified: trunk/BOOK/general/prog/mercurial.xml
==============================================================================
--- trunk/BOOK/general/prog/mercurial.xml Sat Jan 12 02:22:08 2019
(r20959)
+++ trunk/BOOK/general/prog/mercurial.xml Sat Jan 12 06:57:16 2019
(r20960)
@@ -99,7 +99,9 @@
<para>To build the documentation (requires <xref linkend="docutils"/>),
issue:</para>
-<screen><userinput>make doc</userinput></screen>
+<screen><userinput>sed -i '/runrst/s/N)/N)3/' doc/Makefile &&
+2to3-3.7 -w doc/hgmanpage.py &&
+make doc</userinput></screen>
<!-- All tests pass (or are skipped) at version 3.8.2
<para>Running the test suite is optional. Tests which fail may be disabled,
@@ -172,6 +174,22 @@
</sect2>
+ <sect2 role="commands">
+ <title>Command Explanations</title>
+
+ <para>
+ <command>sed -i '/runrst/s/N)/N)3/' doc/Makefile</command>: force use
+ of <application>Python 3</application> for commands using docutils,
+ allowing to use the docutils <application>Python 3</application>
module.
+ </para>
+
+ <para>
+ <command>2to3-3.7 -w doc/hgmanpage.py</command>: Since <application>
+ Python 3</application> is used with docutils, one file needs to be
+ converted in order to be compatible.
+ </para>
+
+ </sect2>
<sect2 role="configuration">
<title>Configuring Mercurial</title>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Sat Jan 12 02:22:08
2019 (r20959)
+++ trunk/BOOK/introduction/welcome/changelog.xml Sat Jan 12 06:57:16
2019 (r20960)
@@ -46,6 +46,14 @@
<para>January 12th, 2019</para>
<itemizedlist>
<listitem>
+ <para>[pierre] - Only build Python 3 module for docutils. Tweak
+ mercurial doc generation to work with docutils-P3.</para>
+ </listitem>
+ <listitem>
+ <para>[pierre] - Make Python 2 recommended for dbus-python, and fix
+ an url.</para>
+ </listitem>
+ <listitem>
<para>[pierre] - Update to six-1.12.0. Make Python 2 recommended.
Fixes <ulink url="&blfs-ticket-root;11428">#11428</ulink>.</para>
</listitem>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
