svn commit: r1920807 - in /subversion/trunk: CMakeLists.txt build.conf subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_local/ra_init.h subversion/libsvn_ra_serf/ra_init.h subversion/libsvn_ra_svn/ra_init.h

Author: rinrab
Date: Fri Sep 20 13:53:14 2024
New Revision: 1920807

URL: http://svn.apache.org/viewvc?rev=1920807&view=rev
Log:
Revert revisions 1920794, 1920787, 1920786.

* Building shared ra-modules (reverted).

Will be implemented again in a branch.

Removed:
    subversion/trunk/subversion/libsvn_ra_local/ra_init.h
    subversion/trunk/subversion/libsvn_ra_serf/ra_init.h
    subversion/trunk/subversion/libsvn_ra_svn/ra_init.h
Modified:
    subversion/trunk/CMakeLists.txt
    subversion/trunk/build.conf
    subversion/trunk/subversion/libsvn_ra/ra_loader.h

Modified: subversion/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/subversion/trunk/CMakeLists.txt?rev=1920807&r1=1920806&r2=1920807&view=diff
==============================================================================
--- subversion/trunk/CMakeLists.txt (original)
+++ subversion/trunk/CMakeLists.txt Fri Sep 20 13:53:14 2024
@@ -95,7 +95,7 @@ option(SVN_INSTALL_PRIVATE_H "Instal pri
 # Configuration
 option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
 cmake_dependent_option(SVN_BUILD_SHARED_FS "Build shared FS modules" ON "BUILD_SHARED_LIBS" OFF)
-cmake_dependent_option(SVN_BUILD_SHARED_RA "Build shared RA modules" ON "BUILD_SHARED_LIBS" OFF)
+cmake_dependent_option(SVN_BUILD_SHARED_RA "Build shared RA modules" ON "BUILD_SHARED_LIBS;LINUX" OFF)
 option(SVN_DEBUG "Enables specific features for developer builds" OFF)
 cmake_dependent_option(SVN_USE_WIN32_CRASHHANDLER "Enables WIN32 crash handler." ON "WIN32" OFF)
 option(SVN_USE_DSO "Defined if svn should try to load DSOs" OFF)
@@ -162,6 +162,10 @@ else()
   set(SVN_RA_BUILD_TYPE STATIC)
 endif()
 
+if(SVN_BUILD_SHARED_RA AND WIN32)
+  message(FATAL_ERROR "SVN_BUILD_SHARED_RA not yet supported on Windows")
+endif()
+
 if(SVN_ENABLE_FS_BASE)
   message(FATAL_ERROR "SVN_ENABLE_FS_BASE is NOT implemented and deprecated.")
 endif()

Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1920807&r1=1920806&r2=1920807&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Fri Sep 20 13:53:14 2024
@@ -338,7 +338,7 @@ msvc-export = private/svn_fs_util.h
 description = Subversion General Repository Access Library
 type = lib
 path = subversion/libsvn_ra
-libs = libsvn_delta libsvn_subr ra-libs apriconv apr aprutil
+libs = libsvn_delta libsvn_subr ra-libs apriconv apr
 # conditionally add more dependencies
 add-deps = $(SVN_RA_LIB_DEPS)
 add-install-deps = $(SVN_RA_LIB_INSTALL_DEPS)
@@ -355,7 +355,6 @@ install = serf-lib
 libs = libsvn_delta libsvn_subr aprutil apriconv apr serf zlib
 add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS)
 msvc-static = yes
-msvc-export = ../libsvn_ra_serf/ra_init.h
 
 # Accessing repositories via SVN
 [libsvn_ra_svn]
@@ -365,7 +364,6 @@ path = subversion/libsvn_ra_svn
 install = ramod-lib
 libs = libsvn_delta libsvn_subr aprutil apriconv apr sasl
 msvc-static = yes
-msvc-export = ../libsvn_ra_svn/ra_init.h svn_ra_svn.h private/svn_ra_svn_private.h
 
 # Accessing repositories via direct libsvn_fs
 [libsvn_ra_local]
@@ -375,7 +373,6 @@ path = subversion/libsvn_ra_local
 install = ramod-lib
 libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr apriconv apr
 msvc-static = yes
-msvc-export = ../libsvn_ra_local/ra_init.h ../libsvn_ra_local/ra_local.h
 
 # Routines built on top of libsvn_fs
 [libsvn_repos]

Modified: subversion/trunk/subversion/libsvn_ra/ra_loader.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/ra_loader.h?rev=1920807&r1=1920806&r2=1920807&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/ra_loader.h (original)
+++ subversion/trunk/subversion/libsvn_ra/ra_loader.h Fri Sep 20 13:53:14 2024
@@ -420,9 +420,15 @@ typedef svn_error_t *
                        apr_pool_t *pool);
 
 /* Declarations of the init functions for the available RA libraries. */
-#include "../libsvn_ra_local/ra_init.h"
-#include "../libsvn_ra_serf/ra_init.h"
-#include "../libsvn_ra_svn/ra_init.h"
+svn_error_t *svn_ra_local__init(const svn_version_t *loader_version,
+                                const svn_ra__vtable_t **vtable,
+                                apr_pool_t *pool);
+svn_error_t *svn_ra_svn__init(const svn_version_t *loader_version,
+                              const svn_ra__vtable_t **vtable,
+                              apr_pool_t *pool);
+svn_error_t *svn_ra_serf__init(const svn_version_t *loader_version,
+                               const svn_ra__vtable_t **vtable,
+                               apr_pool_t *pool);