Ignore:
Timestamp:
12/04/2021 08:32:42 AM (2 years ago)
Author:
Pierre Labastie <pierre.labastie@…>
Branches:
qt5new
Children:
104ff4e
Parents:
ce5723af (diff), edd2feb7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'trunk' into qt5new

File:
1 edited

Legend:

Unmodified
Added
Removed
  • general/prog/subversion.xml

    rce5723af r1daaab6d  
    1010  <!ENTITY subversion-size          "8.1 MB">
    1111  <!-- for 1.12.0                    1.12.2         1.13.0
    12        make javahl: 0.5 SBU  28 MB; not avail 
    13        swig-pl:     0.8      42 MB; 0.7 SBU  43 MB; 0.6 SBU 44 MB 
     12       make javahl: 0.5 SBU  28 MB; not avail
     13       swig-pl:     0.8      42 MB; 0.7 SBU  43 MB; 0.6 SBU 44 MB
    1414       swig-py:     0.6      26 MB; 0.5      28 MB; 0.5     28 MB
    1515       swig-rb:     0.4      22 MB; 0.4      21 MB; 0.3     21 MB
     
    130130      <xref linkend="libsecret"/>,
    131131<!--      <xref linkend="kdelibs"/> (for <ulink url="http://utils.kde.org/projects/kwalletmanager/">KWallet</ulink> support), -->
    132       <xref linkend="py3c"/> (for tests)
     132      <xref linkend="py3c"/> (for the python bindings, and tests)
    133133      <xref linkend="python2"/> (with sqlite support for the tests),
    134134      <xref linkend="ruby"/>,
     
    175175      First, apply a fix to adapt subversion to <xref linkend="swig"/>:
    176176    </para>
    177  
     177
    178178<screen><userinput remap="pre">sed -i 's/classic/nofastunpack/' build.conf</userinput></screen>
    179179-->
     
    210210      <option>--with-junit=&lt;path to junit jar&gt;</option> (for
    211211      instance <option>--with-junit=/usr/local/java/lib/junit-4.13.jar</option>)
    212       to <command>configure</command>. The JUnit jar file is no longer 
    213       included in <xref linkend="apache-ant"/> and must be downloaded seperatly.
    214       To build the Java bindings, issue the following command:
     212      to <command>configure</command>. The JUnit jar file is no longer
     213      included in <xref linkend="apache-ant"/> and must be downloaded
     214      separately. To build the Java bindings, issue the following command:
    215215    </para>
    216216    <para>
     
    233233    <para>
    234234      To test the results, issue: <command>make check</command>. Four tests in
    235       the <filename>commit_tests.py</filename>, 
     235      the <filename>commit_tests.py</filename>,
    236236      <filename>prop_tests.py</filename>, and
    237237      <filename>update_tests.py</filename> suites are known to fail.
Note: See TracChangeset for help on using the changeset viewer.