Checkout Tools
  • last updated 2 hours ago
Constraints: committers
Constraints: files
Constraints: dates

Changeset 1150950 is being indexed.

Remove libsvn_auth_gpg_agent and move gpg-agent support into libsvn_subr.

There is no need to put gpg-agent support into a library loaded at runtime.

The svn code talks to the GPG agent via a UNIX stream socket.

There are no massive external library dependencies involved that

we need to keep at a distance, as with GNOME or KDE.

This should also fix the problem where svn fails to enable gpg-agent

support on Mac OS X because of a filename mismatch (*.so vs. *.dylib).

* subversion/include/svn_auth.h

(svn_auth_gpg_agent_version): Remove declaration. A version function

is only needed for DSOs.

(svn_auth_get_gpg_agent_simple_provider): Declare this function on Darwin.

Remove mention of libsvn_auth_gpg_agent from docstring.

* subversion/libsvn_auth_gpg_agent,

subversion/libsvn_auth_gpg_agent/version.c: Remove.

* subversion/libsvn_auth_gpg_agent/gpg_agent.c: Move to ...

* subversion/libsvn_subr/gpg_agent.c: ... here. Wrap all code into

the SVN_HAVE_GPG_AGENT define.

* subversion/libsvn_subr/auth.c

(svn_auth_get_platform_specific_provider): Directly call

svn_auth_get_gpg_agent_simple_provider() if SVN_HAVE_GPG_AGENT is defined

instead of loading gpg-agent support as a DSO.

* subversion/bindings/swig/core.i: Remove svn_auth_gpg_agent_version.




build/generator/ Remove references to libsvn_auth_gpg_agent.

  1. … 8 more files in changeset.
* build/generator/

(parse_options): Don't generate a libsvn_auth_gpg_agent project on Windows.

* build/generator/


write_serf_project_file): Fix compilation agains serf trunk (2.0) which

currently still creates a serf-1.lib on Windows.

Make Visual C++ link to the right library for serf 1.0.

* build/generator/

(write_serf_project_file): Add serf_lib argument.

* build/generator/templates/serf.dsp.ezt

* build/generator/templates/serf.vcxproj.ezt

* build/generator/templates/serf.vcproj.ezt

Replace serf.lib with [serf_lib].

  1. … 3 more files in changeset.
Support forthcoming serf 1.0.0 on Windows (and fix Windows build when using

serf trunk).

* build/generator/

(WinGeneratorBase.get_win_libs.): Support serf-1.lib or serf.lib as


(WinGeneratorBase._get_serf_version): Keep the major, minor, and patch

version of serf as instance attributes.

The semi-annual trailing whitespace cleansing ritual.

* everywhere:

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

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


  1. … 144 more files in changeset.
Remove a few double '\'-s from the constructed paths in MSBuild by

not using a '\' after $(SolutionDir).

* build/generator/

(find_rootpath): Include the final '\' in the result.

(path, apath): Assume the rootpath has a final '\'

* build/generator/templates/vcnet_vcxproj.ezt

Assume $(SolutionDir) has a final '\'

  1. … 1 more file in changeset.
Remove a bit more ..\..\.. magic from the Visual C++ project system to allow more

automatic dependency reduction in MSBuild via simple path comparing.

Note that $(SolutionDir) always ends in a final '\', but double slashes are


* build/generator/

(find_rootpath): New function.

* build/generator/

(WinGeneratorBase.__init__): Use find_rootpath instead of a number of ..\


(find_rootpath): New function.

* build/generator/templates/vcnet_vcxproj.ezt

Replace another ..\ style path with a variable pointing to the right path.

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

(get_proj_sources): Quote path to Python executable in generated project


Allow building Subversion with a statically linked apr and apr-util on Windows.

Note that this currently only works when you are not using serf, as

the serf makefile doesn't support this scenario yet.

* build.conf

(apr): Add a few required system libraries which are used by apr internally.


(locate): Don't copy apr dlls if compiling staticly.


Add support for --with-static-apr.

* build/generator/

(parse_options): Parse --with-static-apr.

(get_win_defines): Add necessary defines.

(_find_apr, _find_aprutil): Find static apr.

(write_serf_project_file): Forward static linkage information to serf ezt.

  1. … 3 more files in changeset.
* build/generator/

(get_win_includes): Add 'perl5' subdir of swigwin to the include path to

fix compilation with recent swigwin releases.

The python scripts we use to generate the swig wrappers require that the

custom swig path is absolute and fail with an unspecified error if the path

is not valid. Just convert it to an absolute path if the user specifies a

relative path instead of updating documentation everywhere.

* build/generator/

(_find_swig): Store the swig path as absolute path.

* generator/

(get_proj_sources): Following up on r1075869, temporarily remove quotes

around arguments to unbreak VC 2002-2008 build of DLL projects until

the proper quoting is enabled in the .ezt files.

* build/generator/

(get_proj_sources): Write the path to python.exe in project files instead

of just 'python' to allow using a not-installed python on Windows.

Fix build with recent Expat on Windows.

* build/generator/

(get_linked_win_depends): Add XML_STATIC to list of preprocessor defines.

Increase the minimum required version of SQLite from 3.4.0 to 3.6.18. This

allows us to enable recursive triggers so that triggers will fire on both

the delete and insert parts of an "INSERT OR REPLACE" statement. A

subsequent patch will use such triggers to maintain the reference counts in

the "pristine" table.


build/generator/ (WinGeneratorBase):

Bump the minimum version to 3.6.18.

  1. … 2 more files in changeset.
Just padding my stats.

(Actually, doing my regular trailing whitespace removal, similar to r875968.)

* everywhere:

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

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


  1. … 166 more files in changeset.
Move projects generated by the Windows build to the right locations. The

necessary changes in the python scripting to handle this also allowed moving

the remaining project templates .ezt files to the templates directory.

Please let me know if this patch breaks something for you.

* build/generator/build_locale.ezt

* build/generator/msvc_dsp.ezt

* build/generator/svn_locale.vcxproj.ezt

* build/generator/build_zlib.ezt

* build/generator/neon.dsp.ezt

* build/generator/serf.dsp.ezt

* build/generator/zlib.dsp.ezt

* build/generator/svn_config.vcproj.ezt

* build/generator/svn_config.vcxproj.ezt

* build/generator/msvc_dsw.ezt

* build/generator/svn_locale.vcproj.ezt

* build/generator/serf.vcxproj.ezt

* build/generator/neon.vcxproj.ezt

* build/generator/zlib.vcxproj.ezt

* build/generator/neon.vcproj.ezt

* build/generator/serf.vcproj.ezt

* build/generator/zlib.vcproj.ezt Moved to build/generator/templates/.

* build/win32/svn_config.dsp

* build/win32/svn_locale.dsp

Moved to build/generator/templates/ with extension .dsp.ezt.

* build/generator/

(write): Move svn_config and svn_locale output to the projects directory.

* build/generator/

(write): Generate svn_config and svn_locale projects from a .ezt file, just

like the Visual Studio 2002-2010 versions.

* build/generator/

(WinGeneratorBase::__init__): Generate all files in the projectfiles directory

instead of a few in build/win32.

* build/generator/templates/msvc_dsp.ezt

* build/generator/templates/build_locale.ezt

* build/generator/templates/build_zlib.ezt

* build/generator/templates/svn_locale.vcxproj.ezt

* build/generator/templates/svn_config.dsp.ezt

* build/generator/templates/neon.dsp.ezt

* build/generator/templates/serf.dsp.ezt

* build/generator/templates/msvc_dsw.ezt

* build/generator/templates/zlib.dsp.ezt

* build/generator/templates/svn_locale.vcproj.ezt

* build/generator/templates/neon.vcxproj.ezt

* build/generator/templates/serf.vcxproj.ezt

* build/generator/templates/zlib.vcxproj.ezt

* build/generator/templates/neon.vcproj.ezt

* build/generator/templates/serf.vcproj.ezt

* build/generator/templates/zlib.vcproj.ezt

* build/generator/templates/svn_locale.dsp.ezt

Moved here from their old locations

* build/generator/templates/svn_config.vcxproj.ezt

* build/generator/templates/svn_config.vcproj.ezt

Moved here. Fix relative path to .sql files

  1. … 40 more files in changeset.
Detect the version of ZLib we build as part of the Windows build. This in

preparation of handling newer ZLibs different then older versions.

* build/generator/

(WinGeneratorBase::__init__): Call _find_zlib() to detect the zlib version

and pass zlib version to build_zlib.ezt

(WinGeneratorBase::write_zlib_project_file): Pass zlib version to project


(WinGeneratorBase::_find_zlib): New function.

Allow setting an explicit jdk version to use for building on Windows. This

allows building with a 64 bit JDK when using a 32 bit python (or the

other way around) on Windows x64.


(_usage_exit): Show help for --with-jdk.

(global): Parse 'with-jdk' option.

* build/generator/

(parse_options): Set jdk_path to None and fill

from options.

(_find_jdk): If already set, just print the jdk path.

  1. … 1 more file in changeset.
Follow-up to r875957, check for rb_errinfo() when using Ruby 1.9 on Windows.

Define HAVE_RB_ERRINFO if rb_errinfo() is available.

* build/generator/

Import string.

(get_win_defines): Define HAVE_RB_ERRINFO if rb_errinfo() is available.

(_find_ruby): Get the version of Ruby we are linking to.

Remove generation of sql headers from since they're already

generated by on all platforms.

* build/generator/

(WinGeneratorBase. __init__): Remove call to _create_sqlite_headers().

(WinGeneratorBase._create_sqlite_headers): Remove.

Follow-up to r953308.

* build/generator/

(write_serf_project_file): Use *.h wildcard for header files.

Update Visual Studio generator to work with latest serf 0.6.x release.

* build/generator/

(write_serf_project_file): Include auth/*.c and auth/*.h files to generated

serf project.

* build/generator/

(WinGeneratorBase): Allow building agains Sqlite Ignore the patch number

* build/generator/

(get_proj_sources): Following up on r926613, apply the same fix as

r930042 did for the swig build for a shared library build. Also

remove some accidentally added whitespace.

Fix the swig build on Windows (broken since r926613) and use a simpler

construct to check a prefix.

* build/generator/

(get_proj_sources): Add description to swig custom build operations

(get_proj_sources): Use .startswith() instead of a range check.

I love doing parallel builds... but it would be nice if it shows the

same errors every time, instead of generating different ones.

* build.conf

(javahl-tests, javahl-compat-tests):

Add more missing dependencies in the javahl support.

* build/generator/


Following up on r926876 and r926884 apply a more generic

java check, to hopefully avoid further patches here.

  1. … 1 more file in changeset.
* build.conf

(javahl-compat-java): Add dependency on javahl-java

* build/generator/

(adjust_win_depends): Apply transformations on javahl-compat-java.

  1. … 1 more file in changeset.
Fix JavaHL dependency calculation on Windows.

* build.conf

(libsvnjavahl): Add dependency on javahl_callback_javah.

* build/generator/

(adjust_win_depends): Apply dependency transformations on


  1. … 1 more file in changeset.