You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/12/02 08:48:15 UTC
svn commit: r1717577 - in /subversion/trunk:
build/generator/gen_win_dependencies.py configure.ac
subversion/libsvn_ra/ra_loader.c subversion/libsvn_ra_local/ra_plugin.c
subversion/svn_private_config.hw
Author: rhuijben
Date: Wed Dec 2 07:48:14 2015
New Revision: 1717577
URL: http://svn.apache.org/viewvc?rev=1717577&view=rev
Log:
Rename the ill-defined SVN_LIBSVN_CLIENT_LINKS_* defines to an
easier to maintain SVN_LIBSVN_RA_LINKS_*. LIBSVN_CLIENT didn't
link any of this since well before 1.0.
* trunk/build/generator/gen_win_dependencies.py
* trunk/configure.ac
* trunk/subversion/libsvn_ra/ra_loader.c
* trunk/subversion/libsvn_ra_local/ra_plugin.c
* trunk/subversion/svn_private_config.hw
Update references.
Modified:
subversion/trunk/build/generator/gen_win_dependencies.py
subversion/trunk/configure.ac
subversion/trunk/subversion/libsvn_ra/ra_loader.c
subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c
subversion/trunk/subversion/svn_private_config.hw
Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1717577&r1=1717576&r2=1717577&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Wed Dec 2 07:48:14 2015
@@ -1238,7 +1238,7 @@ class GenDependenciesBase(gen_base.Gener
else:
lib_name = 'serf.lib'
- defines = ['SVN_HAVE_SERF', 'SVN_LIBSVN_CLIENT_LINKS_RA_SERF']
+ defines = ['SVN_HAVE_SERF', 'SVN_LIBSVN_RA_LINKS_RA_SERF']
self._libraries['serf'] = SVNCommonLibrary('serf', inc_dir, lib_dir,
lib_name, serf_version,
Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1717577&r1=1717576&r2=1717577&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Wed Dec 2 07:48:14 2015
@@ -1371,19 +1371,19 @@ AS_HELP_STRING([--enable-runtime-module-
])
if test "$svn_enable_shared" = "no" || test "$use_dso" != "yes"; then
- AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_LOCAL, 1,
+ AC_DEFINE(SVN_LIBSVN_RA_LINKS_RA_LOCAL, 1,
[Defined if libsvn_client should link against libsvn_ra_local])
svn_ra_lib_deps="\$(RA_LOCAL_DEPS)"
svn_ra_lib_install_deps="install-ramod-lib"
svn_ra_lib_link="\$(RA_LOCAL_LINK)"
- AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_SVN, 1,
+ AC_DEFINE(SVN_LIBSVN_RA_LINKS_RA_SVN, 1,
[Defined if libsvn_client should link against libsvn_ra_svn])
svn_ra_lib_deps="$svn_ra_lib_deps \$(RA_SVN_DEPS)"
svn_ra_lib_link="$svn_ra_lib_link \$(RA_SVN_LINK)"
if test "$svn_lib_serf" = "yes"; then
- AC_DEFINE(SVN_LIBSVN_CLIENT_LINKS_RA_SERF, 1,
+ AC_DEFINE(SVN_LIBSVN_RA_LINKS_RA_SERF, 1,
[Defined if libsvn_client should link against libsvn_ra_serf])
svn_ra_lib_deps="$svn_ra_lib_deps \$(RA_SERF_DEPS)"
svn_ra_lib_install_deps="$svn_ra_lib_install_deps install-serf-lib"
Modified: subversion/trunk/subversion/libsvn_ra/ra_loader.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/ra_loader.c?rev=1717577&r1=1717576&r2=1717577&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/trunk/subversion/libsvn_ra/ra_loader.c Wed Dec 2 07:48:14 2015
@@ -80,7 +80,7 @@ static const struct ra_lib_defn {
{
"svn",
svn_schemes,
-#ifdef SVN_LIBSVN_CLIENT_LINKS_RA_SVN
+#ifdef SVN_LIBSVN_RA_LINKS_RA_SVN
svn_ra_svn__init,
svn_ra_svn__deprecated_init
#endif
@@ -89,7 +89,7 @@ static const struct ra_lib_defn {
{
"local",
local_schemes,
-#ifdef SVN_LIBSVN_CLIENT_LINKS_RA_LOCAL
+#ifdef SVN_LIBSVN_RA_LINKS_RA_LOCAL
svn_ra_local__init,
svn_ra_local__deprecated_init
#endif
@@ -98,7 +98,7 @@ static const struct ra_lib_defn {
{
"serf",
dav_schemes,
-#ifdef SVN_LIBSVN_CLIENT_LINKS_RA_SERF
+#ifdef SVN_LIBSVN_RA_LINKS_RA_SERF
svn_ra_serf__init,
svn_ra_serf__deprecated_init
#endif
@@ -1534,7 +1534,7 @@ svn_ra_get_ra_library(svn_ra_plugin_t **
implementation for svn_ra_foo_init which returns a "not implemented"
error. */
-#ifndef SVN_LIBSVN_CLIENT_LINKS_RA_NEON
+#ifndef SVN_LIBSVN_RA_LINKS_RA_NEON
svn_error_t *
svn_ra_dav_init(int abi_version,
apr_pool_t *pool,
@@ -1542,9 +1542,9 @@ svn_ra_dav_init(int abi_version,
{
return svn_error_create(SVN_ERR_RA_NOT_IMPLEMENTED, NULL, NULL);
}
-#endif /* ! SVN_LIBSVN_CLIENT_LINKS_RA_NEON */
+#endif /* ! SVN_LIBSVN_RA_LINKS_RA_NEON */
-#ifndef SVN_LIBSVN_CLIENT_LINKS_RA_SVN
+#ifndef SVN_LIBSVN_RA_LINKS_RA_SVN
svn_error_t *
svn_ra_svn_init(int abi_version,
apr_pool_t *pool,
@@ -1552,9 +1552,9 @@ svn_ra_svn_init(int abi_version,
{
return svn_error_create(SVN_ERR_RA_NOT_IMPLEMENTED, NULL, NULL);
}
-#endif /* ! SVN_LIBSVN_CLIENT_LINKS_RA_SVN */
+#endif /* ! SVN_LIBSVN_RA_LINKS_RA_SVN */
-#ifndef SVN_LIBSVN_CLIENT_LINKS_RA_LOCAL
+#ifndef SVN_LIBSVN_RA_LINKS_RA_LOCAL
svn_error_t *
svn_ra_local_init(int abi_version,
apr_pool_t *pool,
@@ -1562,9 +1562,9 @@ svn_ra_local_init(int abi_version,
{
return svn_error_create(SVN_ERR_RA_NOT_IMPLEMENTED, NULL, NULL);
}
-#endif /* ! SVN_LIBSVN_CLIENT_LINKS_RA_LOCAL */
+#endif /* ! SVN_LIBSVN_RA_LINKS_RA_LOCAL */
-#ifndef SVN_LIBSVN_CLIENT_LINKS_RA_SERF
+#ifndef SVN_LIBSVN_RA_LINKS_RA_SERF
svn_error_t *
svn_ra_serf_init(int abi_version,
apr_pool_t *pool,
@@ -1572,4 +1572,4 @@ svn_ra_serf_init(int abi_version,
{
return svn_error_create(SVN_ERR_RA_NOT_IMPLEMENTED, NULL, NULL);
}
-#endif /* ! SVN_LIBSVN_CLIENT_LINKS_RA_SERF */
+#endif /* ! SVN_LIBSVN_RA_LINKS_RA_SERF */
Modified: subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c?rev=1717577&r1=1717576&r2=1717577&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c (original)
+++ subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c Wed Dec 2 07:48:14 2015
@@ -1870,7 +1870,7 @@ svn_ra_local__init(const svn_version_t *
SVN_ERR(svn_ver_check_list2(ra_local_version(), checklist, svn_ver_equal));
-#ifndef SVN_LIBSVN_CLIENT_LINKS_RA_LOCAL
+#ifndef SVN_LIBSVN_RA_LINKS_RA_LOCAL
/* This means the library was loaded as a DSO, so use the DSO pool. */
SVN_ERR(svn_fs_initialize(svn_dso__pool()));
#endif
Modified: subversion/trunk/subversion/svn_private_config.hw
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn_private_config.hw?rev=1717577&r1=1717576&r2=1717577&view=diff
==============================================================================
--- subversion/trunk/subversion/svn_private_config.hw (original)
+++ subversion/trunk/subversion/svn_private_config.hw Wed Dec 2 07:48:14 2015
@@ -61,10 +61,10 @@
#define SVN_LIBSVN_FS_LINKS_FS_X
/* Link local repos access library to client */
-#define SVN_LIBSVN_CLIENT_LINKS_RA_LOCAL
+#define SVN_LIBSVN_RA_LINKS_RA_LOCAL
/* Link pipe repos access library to client */
-#define SVN_LIBSVN_CLIENT_LINKS_RA_SVN
+#define SVN_LIBSVN_RA_LINKS_RA_SVN
/* Defined to be the path to the installed binaries */
#define SVN_BINDIR "/usr/local/bin"