Changeset d445316 for general/prog/mercurial.xml

Timestamp:

05/03/2020 02:20:59 AM (3 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, kea, ken/inkscape-core-mods, lazarus, lxqt, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

3a833af

Parents:

8ddf6d5

Message:

Update to Mercurial-5.4 (and convert it to Python3)
Update to NSS-3.52

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23066 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• general/prog/mercurial.xml (modified) (10 diffs)

general/prog/mercurial.xml

@@ -7 +7 @@
   <!ENTITY mercurial-download-http "https://www.mercurial-scm.org/release/mercurial-&mercurial-version;.tar.gz">
   <!ENTITY mercurial-download-ftp  " ">
-  <!ENTITY mercurial-md5sum        "824b839a6e948844b81c757968f888bc">
-  <!ENTITY mercurial-size          "7.2 MB">
-  <!ENTITY mercurial-buildsize     "78 MB (with docs, add 1.0 GB for tests)">
-  <!ENTITY mercurial-time          "0.5 SBU (with docs, add 11 SBU for tests using -j4)">
+  <!ENTITY mercurial-md5sum        "0859029d0bb54bcf7c583c55680573cb">
+  <!ENTITY mercurial-size          "7.4 MB">
+  <!ENTITY mercurial-buildsize     "112 MB (with docs, add 1.1 GB for tests)">
+  <!ENTITY mercurial-time          "0.4 SBU (with docs, add 17 SBU for tests using -j4)">
 ]>
 
@@ -76 +76 @@
     <bridgehead renderas="sect3">Mercurial Dependencies</bridgehead>
 
+    <!--
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="python2"/>
     </para>
+    -->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -90 +92 @@
       (runtime, to access ssh://... repositories),
     <xref linkend="pygments"/>,
+    <xref linkend="rust"/>,
     <xref linkend="subversion"/> (with Python bindings),
     <ulink url="https://launchpad.net/bzr">Bazaar</ulink>,
     <ulink url="http://www.nongnu.org/cvs/">CVS</ulink>,
     <ulink url="https://pypi.python.org/pypi/pyflakes">pyflakes</ulink>, and
-    <ulink url="https://github.com/pyca/pyopenssl">pyOpenSSL</ulink>
+    <ulink url="https://www.pyopenssl.org/en/stable/">pyOpenSSL</ulink>
 
     </para>
@@ -105 +108 @@
   <sect2 role="installation">
     <title>Installation of Mercurial</title>
-    <!-- seems to have a development rust port -->
+    <!-- Rust port is now part of the standard tests -->
+
+    <para>
+      First, force the build system to use Python 3:
+    </para>
+
+<screen><userinput remap="pre">export PYTHON=python3</userinput></screen>
 
     <para>
@@ -118 +127 @@
     </para>
 
-<screen remap="doc"><userinput>2to3 -w doc/hgmanpage.py &amp;&amp;
-PYTHON=python3 make doc</userinput></screen>
+<screen remap="doc"><userinput>make doc</userinput></screen>
 
     <para>
       To run the test suite, issue:
     </para>
-<screen remap="test"><userinput>rm -rf tests/tmp &amp;&amp;
-TESTFLAGS="-j<replaceable>&lt;N&gt;</replaceable> --tmpdir tmp --blacklist blacklists/fsmonitor --blacklist blacklists/linux-vfat" make check</userinput></screen>
+<screen remap="test"><userinput>TESTFLAGS="-j<replaceable>&lt;N&gt;</replaceable> --tmpdir tmp --blacklist blacklists/fsmonitor --blacklist blacklists/linux-vfat" make check</userinput></screen>
 <!-- The blacklists have to be checked every release of Mercurial, do a listing
      of tests/blacklists, but do not include the makefile. -->
@@ -150 +157 @@
       seems to be a problem with the test suite. If this happens, normally,
       from now on, there will be no more such failures whether you use the
-      debug switch or not. Three tests, test-alias.t, test-install.t, and
-      test-bundle2-exchange.t (intermittently), are known to fail.
+      debug switch or not. One test, test-doctest.py, is known to fail.
     </para>
 
@@ -176 +182 @@
 <screen role="root"
         remap="doc"><userinput>make PREFIX=/usr install-doc</userinput></screen>
+
+    <para>
+      Next, clean up the environment variable set earlier:
+    </para>
+
+<screen><userinput>unset PYTHON</userinput></screen>
 
     <para>
@@ -198 +210 @@
   </sect2>
 
+<!--
   <sect2 role="commands">
     <title>Command Explanations</title>
@@ -207 +220 @@
       </para>
 
-  </sect2>
+   </sect2>
+-->
+   
   <sect2 role="configuration">
     <title>Configuring Mercurial</title>
@@ -265 +280 @@
         <seg>
           several internal modules under
-          /usr/lib/python&python2-majorver;/site-packages/mercurial
+          /usr/lib/python&python3-majorver;/site-packages/mercurial
         </seg>
         <seg>
           /etc/mercurial and
-          /usr/lib/python&python2-majorver;/site-packages/{hgdemandimport,hgext,hgext3rd,mercurial}
+          /usr/lib/python&python3-majorver;/site-packages/{hgdemandimport,hgext,hgext3rd,mercurial}
         </seg>
       </seglistitem>