diff --git a/general.ent b/general.ent
index a30ee4e966..18935c338f 100644
--- a/general.ent
+++ b/general.ent
@@ -1,12 +1,12 @@
-
+
-
+
diff --git a/general/prog/py3c.xml b/general/prog/py3c.xml
new file mode 100644
index 0000000000..7cbea7f472
--- /dev/null
+++ b/general/prog/py3c.xml
@@ -0,0 +1,149 @@
+
+
+ %general-entities;
+
+
+
+
+
+
+]>
+
+
+
+
+ Py3c-&py3c-version;
+
+
+ Py3c
+
+
+
+ Introduction to Py3c
+
+
+ Py3c helps you port C extensions to
+ Python 3. It provides a detailed guide, and a set of macros to
+ make porting easy and reduce boilerplate.
+
+
+ &lfs91_checked;
+
+ Package Information
+
+
+
+ Download (HTTP):
+
+
+
+
+
+ Download MD5 sum: &py3c-md5sum;
+
+
+
+
+ Download size: &py3c-size;
+
+
+
+
+ Estimated disk space required: &py3c-buildsize;
+
+
+
+
+ Estimated build time: &py3c-time;
+
+
+
+
+
+ User Notes:
+
+
+
+
+
+ Installation of Py3c
+
+
+ The Py3c is a headers-only package
+ and because of that, no configuration and compilation is
+ required.
+
+
+
+ To test the package, issue: make test-python3.
+
+
+
+ To install the Python 3 module,
+ run the following command as the
+ root user:
+
+
+
+make prefix=/usr install
+
+
+
+
+ Contents
+
+
+ Installed Programs
+ Installed Libraries
+ Installed Directories
+
+
+
+ None
+
+
+ None
+
+
+ /usr/include/py3c
+
+
+
+
+
+
+
+
diff --git a/general/prog/python-modules.xml b/general/prog/python-modules.xml
index 50f6d2dd93..262b2330d9 100644
--- a/general/prog/python-modules.xml
+++ b/general/prog/python-modules.xml
@@ -44,6 +44,11 @@
+
+
+
+
+
@@ -161,6 +166,9 @@
+
+
+ (for tests)
(with sqlite support for the tests),
,
(for building Perl, Python and Ruby bindings),
@@ -140,8 +141,7 @@
One of ,
Dante or
Jikes,
- and JUnit 4
- (to test the Java bindings). Note that JUnit is included with
+ JUnit 4 (to test the Java bindings) and
.
@@ -196,9 +196,15 @@ make
doxygen doc/doxygen.conf
- If you passed the parameter to
- configure and wish to build the Java bindings, issue
- the following command:
+ If you wish to build the Java bindings pass the
+ parameter to the configure command. In addition, if
+ you want to run the Java test suite, you have to specify the location
+ of the JUnit file by adding
+ (for
+ instance )
+ to configure. The JUnit jar file is no longer
+ included in and must be downloaded seperatly.
+ To build the Java bindings, issue the following command:
make javahl
@@ -206,14 +212,14 @@ make
If you want to compile Perl,
- Python2, or Ruby
+ Python, or Ruby
bindings, issue any of the following command:
make swig-pl # for Perlmake swig-py \
- swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn \
- swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn # for Python
+ swig_pydir=/usr/lib/python&python3-majorver;/site-packages/libsvn \
+ swig_pydir_extra=/usr/lib/python&python3-majorver;/site-packages/svn # for Pythonmake swig-rb # for Ruby
@@ -224,14 +230,16 @@ make
To test the results of the Java bindings build,
- issue make check-javahl. The
- JUnit testing framework must be installed,
+ issue LANG=C make check-javahl.
+
@@ -241,13 +249,6 @@ make
make check-swig-py, or
make check-swig-rb.
-
Now, as the root user:
@@ -268,7 +269,7 @@ cp -v -R doc/* /usr/share/doc/subversion-&subversion-version;
If you built the Perl,
- Python2, or
+ Python, or
Ruby bindings, issue any of the following
commands as the root user
to install them:
@@ -276,8 +277,8 @@ cp -v -R doc/* /usr/share/doc/subversion-&subversion-version;
make install-swig-plmake install-swig-py \
- swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn \
- swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn
+ swig_pydir=/usr/lib/python&python3-majorver;/site-packages/libsvn \
+ swig_pydir_extra=/usr/lib/python&python3-majorver;/site-packages/svn
make install-swig-rb
@@ -385,7 +386,7 @@ cp -v -R doc/* /usr/share/doc/subversion-&subversion-version;
/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/<x.y.z>/{,<arch-linux>-linux/}svn,
/usr/lib/svn-javahl, and
/usr/share/doc/subversion-&subversion-version;
diff --git a/general/prog/swig.xml b/general/prog/swig.xml
index 129e82944d..5dfbad4445 100644
--- a/general/prog/swig.xml
+++ b/general/prog/swig.xml
@@ -127,16 +127,17 @@
make
- To test the results, issue: make -k check TCL_INCLUDE=.
+ To test the results, issue: PY3=1 make -k check TCL_INCLUDE=.
The unsetting of the variable TCL_INCLUDE is
necessary since it is not correctly set by
configure. The tests are only executed for the
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 installed, the Python-3
+ magnitude. According to
SWIG's documentation, the failure of some
tests should not be considered harmful.
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 82766024d5..7977d1cfde 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,22 @@
-->
+
+ May 29th, 2020
+
+
+ [thomas] - Upgrade subversion-1.14.0. Drop description of Python2 bindings. Fixes
+ #13584.
+
+
+ [thomas] - Make swig using Python3.
+
+
+ [thomas] - Add Python module py3c-1.1 (needed by subversion).
+
+
+
+
May 28th, 2020
diff --git a/packages.ent b/packages.ent
index affefbce6d..982aefe2c6 100644
--- a/packages.ent
+++ b/packages.ent
@@ -363,7 +363,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
-
+
@@ -547,6 +547,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
+