svn commit: r1150821 - in /subversion/trunk: build/generator/gen_make.py subversion/bindings/swig/core.i

[st...@apache.org]

Author: stsp
Date: Mon Jul 25 18:20:28 2011
New Revision: 1150821

URL: http://svn.apache.org/viewvc?rev=1150821&view=rev
Log:
Fix problems in the bindings tests that occured since the reintegration
of the gpg-agent-password-store branch.

* subversion/bindings/swig/core.i: Ignore functions related to the
   platform-specific GPG-Agent auth provider.

* build/generator/gen_make.py: Treat libsvn_auth_gpg_agent the same
   way as libsvn_auth_gnome_keyring and libsvn_auth_kwallet. (Not really
   sure what this special-casing here does, but keeping this consistent
   is probably good.)

Modified:
    subversion/trunk/build/generator/gen_make.py
    subversion/trunk/subversion/bindings/swig/core.i

Modified: subversion/trunk/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_make.py?rev=1150821&r1=1150820&r2=1150821&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_make.py (original)
+++ subversion/trunk/build/generator/gen_make.py Mon Jul 25 18:20:28 2011
@@ -531,7 +531,8 @@ DIR=`pwd`
 ''')
     libdep_cache = {}
     paths = {}
-    for lib in ('libsvn_auth_gnome_keyring', 'libsvn_auth_kwallet'):
+    for lib in ('libsvn_auth_gnome_keyring', 'libsvn_auth_kwallet',
+                'libsvn_auth_gpg_agent'):
       paths[lib] = self.sections[lib].options.get('path')
     for target_ob in install_sources:
       if not isinstance(target_ob, gen_base.TargetExe):
@@ -563,7 +564,8 @@ DIR=`pwd`
             for lib in self._get_all_lib_deps(lib_name, libdep_cache, paths):
               libs.add(lib)
       if target_name == 'libsvn_subr':
-        libs.update(('libsvn_auth_gnome_keyring', 'libsvn_auth_kwallet'))
+        libs.update(('libsvn_auth_gnome_keyring', 'libsvn_auth_kwallet',
+                     'libsvn_auth_gpg_agent'))
       libdep_cache[target_name] = sorted(libs)
     return libdep_cache[target_name]
 

Modified: subversion/trunk/subversion/bindings/swig/core.i
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/core.i?rev=1150821&r1=1150820&r2=1150821&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/core.i (original)
+++ subversion/trunk/subversion/bindings/swig/core.i Mon Jul 25 18:20:28 2011
@@ -244,6 +244,8 @@
 %ignore svn_auth_kwallet_version;
 %ignore svn_auth_get_kwallet_simple_provider;
 %ignore svn_auth_get_kwallet_ssl_client_cert_pw_provider;
+%ignore svn_auth_gpg_agent_version;
+%ignore svn_auth_get_gpg_agent_simple_provider;
 
 /* bad pool convention */
 %ignore svn_opt_print_generic_help;