Changeset 3aee187 for general

Timestamp:

05/29/2020 09:43:04 AM (4 years ago)

Author:

Thomas Trepl <thomas@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

432f6a2

Parents:

26cceda

Message:

Upgrade subversion-1.14.0; add py3c

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

Location:

general/prog

Files:

• py3c.xml (added)
• python-modules.xml (modified) (2 diffs)
• subversion.xml (modified) (10 diffs)
• swig.xml (modified) (2 diffs)

general/prog/python-modules.xml

@@ -47 +47 @@
       <listitem>
         <para>
+          <xref linkend="py3c"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           <xref linkend="pyatspi2"/>
         </para>
@@ -163 +168 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="py3c.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="pyatspi2.xml"/>
 <!--

general/prog/subversion.xml

@@ -129 +129 @@
       <xref linkend="libsecret"/>,
 <!--      <xref linkend="kdelibs"/> (for <ulink url="http://utils.kde.org/projects/kwalletmanager/">KWallet</ulink> support), -->
+      <xref linkend="py3c"/> (for tests)
       <xref linkend="python2"/> (with sqlite support for the tests),
       <xref linkend="ruby"/>,
@@ -141 +142 @@
       <ulink url="http://www.inet.no/dante/">Dante</ulink> or
       <ulink url="http://jikes.sourceforge.net/">Jikes</ulink>,
-      and <ulink url="https://junit.org/junit4/">JUnit 4</ulink>
-      (to test the Java bindings). Note that JUnit is included with
+      <ulink url="https://junit.org/junit4/">JUnit 4</ulink> (to test the Java bindings) and
       <xref linkend="apache-ant"/>.
     </para>
@@ -197 +197 @@
 
     <para>
-      If you passed the <option>--enable-javahl</option> parameter to
-      <command>configure</command> and wish to build the Java bindings, issue
-      the following command:
+      If you wish to build the Java bindings pass the <option>--enable-javahl</option>
+      parameter to the <command>configure</command> command. In addition, if
+      you want to run the Java test suite, you have to specify the location
+      of the <application>JUnit</application> file by adding
+      <option>--with-junit=&lt;path to junit jar&gt;</option> (for
+      instance <option>--with-junit=/usr/local/java/lib/junit-4.13.jar</option>)
+      to <command>configure</command>. The JUnit jar file is no longer 
+      included in <xref linkend="apache-ant"/> and must be downloaded seperatly.
+      To build the Java bindings, issue the following command:
     </para>
     <para>
@@ -207 +213 @@
     <para>
       If you want to compile <application>Perl</application>,
-      <application>Python2</application>, or <application>Ruby</application>
+      <application>Python</application>, or <application>Ruby</application>
       bindings, issue any of the following command:
     </para>
@@ -213 +219 @@
       <screen><command>make swig-pl</command> # for <application>Perl</application>
 <command>make swig-py \
-     swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn \
-     swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn</command> # for <application>Python</application>
+     swig_pydir=/usr/lib/python&python3-majorver;/site-packages/libsvn \
+     swig_pydir_extra=/usr/lib/python&python3-majorver;/site-packages/svn</command> # for <application>Python</application>
 <command>make swig-rb</command> # for <application>Ruby</application></screen>
     </para>
@@ -225 +231 @@
     <para>
       To test the results of the Java bindings build,
-      issue <command>make check-javahl</command>. The
-      <application>JUnit</application> testing framework must be installed,
+      issue <command>LANG=C make check-javahl</command>.
+      <!-- ~~ This explanation is added to the configure above ~~
+      The <application>JUnit</application> testing framework must be installed,
       and the location of the JUnit jar has to be specified by passing the
-      <option>--with-junit=&lt;path to junit jar&gt;</option> parameter to
+      <option>- -with-junit=&lt;path to junit jar&gt;</option> parameter to
       <command>configure</command>. Note that <application>JUnit</application>
       is included in <xref linkend="apache-ant"/>, and can be accessed by
-      passing <option>--with-junit=/opt/ant/lib/junit-4.12.jar</option>
+      passing <option>- -with-junit=/opt/ant/lib/junit-4.12.jar</option>
       to <command>configure</command>.
+      -->
     </para>
 
@@ -242 +250 @@
       <command>make check-swig-rb</command>.
     </para>
-    <!-- I can no longer confirm this with 9.0-rc1 -renodr
-    <note><para>
-      The Python Bindings test suite (<command>make check-swig-py</command>)
-      is broken with SWIG-4.0.0, however the bindings themselves work as
-      expected.
-    </para></note>
-    -->
 
     <para>
@@ -269 +270 @@
     <para>
       If you built the <application>Perl</application>,
-      <application>Python2</application>, or
+      <application>Python</application>, or
       <application>Ruby</application> bindings, issue any of the following
       commands as the <systemitem class="username">root</systemitem> user
@@ -277 +278 @@
 <screen><command>make install-swig-pl</command>
 <command>make install-swig-py \
-      swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn \
-      swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn</command>
+      swig_pydir=/usr/lib/python&python3-majorver;/site-packages/libsvn \
+      swig_pydir_extra=/usr/lib/python&python3-majorver;/site-packages/svn</command>
 <command>make install-swig-rb</command></screen>
     </para>
@@ -386 +387 @@
           /usr/include/subversion-1,
           /usr/lib/perl5/site_perl/&lfs-perl-version;/{,auto/}SVN,
-          /usr/lib/python2.7/site-packages/{libsvn,svn},
+          /usr/lib/python&python3-majorver;/site-packages/{libsvn,svn},
           /usr/lib/ruby/site_ruby/&lt;x.y.z&gt;/{,&lt;arch-linux&gt;-linux/}svn,
           /usr/lib/svn-javahl, and

general/prog/swig.xml

@@ -128 +128 @@
 
     <para>
-      To test the results, issue: <command>make -k check TCL_INCLUDE=</command>.
+      To test the results, issue: <command>PY3=1 make -k check TCL_INCLUDE=</command>.
       The unsetting of the variable <envar>TCL_INCLUDE</envar> is
       necessary since it is not correctly set by
@@ -134 +134 @@
       languages installed on your machine, so the disk space and SBU values
       given for the tests may vary, and should be considered as mere orders of
-      magnitude. If you have <xref linkend="python2"/> installed, the Python-3
+      magnitude. <!-- Phase out P2 support
+      If you have <xref linkend="python2"/> installed, the Python-3
       tests are not run.  You can run tests for Python-3 by issuing
       <command>PY3=1 make check-python-examples</command> followed by
-      <command>PY3=1 make check-python-test-suite</command>.  According to
+      <command>PY3=1 make check-python-test-suite</command>. --> According to
       <application>SWIG</application>'s documentation, the failure of some
       tests should not be considered harmful.