Checkout Tools
  • last updated 2 hours ago
Constraints: committers
Constraints: files
Constraints: dates
Merge the swig-py3 branch to trunk.
  1. … 61 more files in changeset.
Test out my new and fancy ASF commit priviledges by changing the copyright

wording in our license headers to reflect ownership by the ASF.


Change terminology to ASF, and update a link.

* subversion/libsvn_subr/opt.c

(svn_opt__print_version_info): Note that the product as a whole is

copyrighted by the ASF, and update the project website.

* everywhere:

Change license text to reflect ASF ownership.

  1. … 891 more files in changeset.
Relicense Subversion under the Apache License, Version 2.0.

* NOTICE: New.



subversion/LICENSE: Remove.

* subversion/libsvn_subr/opt.c

(svn_opt__print_version_info): Note that the product as a whole is

copyrighted by the SVN Corp, and that it contains contributions from

many people, as referenced in NOTICE.

* subversion/bindings/swig/python/LICENSE_FOR_PYTHON_BINDINGS:

Relicense the SVN parts under Apache 2.0.

* everywhere:

Change copyright notices in file headers to reflect the Apache 2.0 license.

  1. … 882 more files in changeset.
Respect CFLAGS in SWIG bindings.

* build/ac-macros/swig.m4


* build/ Don't print BASECFLAGS and OPT.


(COMPILE_SWIG_PY): Delete $(CFLAGS) which is now in $(SWIG_PY_COMPILE).

(COMPILE_SWIG_RB): Delete $(CFLAGS) which is now in $(SWIG_RB_COMPILE).

(swig-pl): Appropriately set OPTIMIZE when calling $(MAKE) in

subversion/bindings/swig/perl/native directory.

* subversion/bindings/swig/perl/native/ Respect CFLAGS.

  1. … 3 more files in changeset.
* build/ Fix syntax of the '--site' print call.

Suggested by: arfrever

Approved by: cmpilato

* build/ Add the ability to retrieve the Python site-packages


Approved by: gstein

Follow-up to r33335:

Fix compatibility with Python 2.*.

* build/generator/

* build/

* build/win32/

* Fix calls to print().

Found by: lgo

Suggested by: gstein

  1. … 3 more files in changeset.
Python 3 compatibility:

Update calls to print() in 'build' directory, '' and ''.

* build/generator/

* build/generator/

* build/generator/swig/

* build/generator/swig/

* build/generator/swig/

* build/

* build/

* build/

* build/

* build/win32/


* Call print() or file.write().

  1. … 11 more files in changeset.
Channeling Erik Hülsmann, remove all trailing whitespace within our source


for extsn in c h cpp java py pl rb; do

sed -i -e 's/[ \t]*$//' `find . -name "*.$extsn" | xargs grep '[ \t]$' -l`


Inspired by: ehu

  1. … 449 more files in changeset.
Update copyright years to reflect reality.

* build/

Update copyright year based on files actual history.

Suggested by: Karl Fogel

* build/

Add license block.

A follow-up to r17910 (r18156 on the 1.3.x branch) to allow

libsvn_swig_py to link on OpenBSD. Linking with Python 2.3 needs the

-L /.../config and -lpython2.3 arguments. (Unsure what happens on

OpenBSD with a version of Python which has no -- it's

apparently been removed from the ports tree.)

A more correct fix down the road for cases like OpenBSD should be to

inspect the tool chain (e.g. linker, Python library version, etc.),

rather than the OS.

* build/

(link_options): Add -LSTATIC_LIDIR and -lpythonVER arguments on


Found by: Sigfred H. <>

Per discussion with Max Bowsher, unbreak the ability to link

libsvn_swig_py on Solaris 10 after compiling with GCC 3.4.2 (a

follow-up to r10450).

* build/

(link_options): Change final "else" block to a conditional which

checks whether sys.platform is 'cygwin' to gate addition of the

"-L/path/to/python/configdir -lpythonVER" flags to the output of --libs and --link (which influences the SWIG_PY_LINK

and SWIG_PY_LIBS Makefile variables).

* build/

* build/

Revert part of r17905, removing the svn:executable property for

these scripts. They're meant to be run with the version of python

detected by configure -- clarify usage text accordingly.

* build/

Add #! line to allow invocation from the command-line.

  1. … 2 more files in changeset.
* build/

* build/

* build/

Set the svn:executable property for these scripts.

  1. … 2 more files in changeset.
Check that distutils module exists when configuring Python bindings.

* build/ac-macros/swig.m4

(SVN_FIND_SWIG): Warn if distutils module cannot be found.

* build/

Output "none" if distutils module cannot be found.

Suggested by: julianfoad

  1. … 1 more file in changeset.
Fix python library options when we have separate platform-specific

library directories, or when we are compiling on Mac OS X without a


* build/

(string): Remove include.

(ldshared_process): Remove function.

(add_option): New function. Adds an option to a list of options.

(add_option_if_missing): New function. Adds an option to a list of

options, if it is not already present.

(link_options): New function. Gets a list of the Python linker options.

(lib_options): New function. Gets a list of the Python library options.

(__main__): Use link_options and lib_options instead of ldshared_process.

Review by: jerenkrantz

Approved by: jerenkrantz

Teach where the Python libraries can be found. This resolves

the linking problems with the Swig Python bindings that Justin has seen.

Tested on Solaris, Ubuntu Linux, and Mac OS X.

(Ubuntu comes with a shared Python library.)

* build/

(ldshared_process): Import in LIBDIR, LDLIBRARY, PYTHONFRAMEWORK,

PYTHONFRAMEWORKDIR from sysconfig; use the Python framework if available

(only Mac OS X); try to see if a shared Python library exists in libdir

and try to use that (Ubuntu does this); if all else fails, hope there is

a libpython<version>.a sitting in the config directory (which is what we

used to do for cygwin; but is also typical of most self-compiles too).

Submitted by: David James

Tweaked by: Justin Erenkrantz

Explicitly link the python bindings against libpython.

* New substitution variable, SWIG_PY_LIBS.

* build.conf: Add SWIG_PY_LIBS to the libsvn_swig_py link.

* build/ac-macros/swig.m4: Set and substitute SWIG_PY_LIBS.

* build/ New --libs option to provide SWIG_PY_LIBS.

Teach how to escape OS X -framework options so libtool doesn't eat them.

Teach how to add extra library arguments on Cygwin, like distutils does.

  1. … 3 more files in changeset.
Borrow an idea from Python distutils, to stop all the 'type-punned' warnings

when building the Python bindings.

* build/ (--compile): Add BASECFLAGS to the compile command.

* build/ (usage): Fixup out-of-date usage message.

build/ was always intended to be a superset of ac-helpers (autoconf

macros, build tools, scripts, etc), and to obsolete the ac-helpers

directory. Get a bunch of stuff moved from ac-helpers to build.

* build/ moved from ac-helpers

* build/ moved from ac-helpers

* build/ac-macros: new directory to hold autoconf (m4) macros

* build/ac-macros/apr.m4,







build/ac-macros/svn-macros.m4: moved from ac-helpers

* build/ac-macros/neon.m4: moved from ac-helpers. changed path to

* build/ac-macros/swig.m4: moved from ac-helpers. changed path to

* build/ac-diff-test: new directory to hold the gnu-diff test

* build/ac-diff-test/check-diff-input-1.txt,






build/ac-diff-test/yours.txt: moved from ac-helpers

* build/

- change path to

- change paths to find_apr.m4 and find_apu.m4


- change paths in the sinclude() macros

- change path in SVN_LIB_DIFFUTILS() invocation

  1. … 41 more files in changeset.