Author: rinrab
Date: Tue Jul 9 16:44:49 2024
New Revision: 1919068
URL: http://svn.apache.org/viewvc?rev=1919068&view=rev
Log:
On the 'cmake' branch: Sync the branch with 'trunk'.
* Fixes in the build.conf file.
Modified:
subversion/branches/cmake/ (props changed)
subversion/branches/cmake/build.conf
Propchange: subversion/branches/cmake/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1918597-1919067
Modified: subversion/branches/cmake/build.conf
URL:
http://svn.apache.org/viewvc/subversion/branches/cmake/build.conf?rev=1919068&r1=1919067&r2=1919068&view=diff
==============================================================================
--- subversion/branches/cmake/build.conf (original)
+++ subversion/branches/cmake/build.conf Tue Jul 9 16:44:49 2024
@@ -330,7 +330,7 @@ libs = libsvn_delta libsvn_subr ra-libs
add-deps = $(SVN_RA_LIB_DEPS)
add-install-deps = $(SVN_RA_LIB_INSTALL_DEPS)
install = lib
-msvc-export = svn_ra.h private\svn_ra_private.h
+msvc-export = svn_ra.h private/svn_ra_private.h
msvc-delayload = yes
# Accessing repositories via DAV through serf
@@ -388,19 +388,19 @@ msvc-export =
svn_nls.h svn_opt.h svn_path.h svn_pools.h svn_props.h svn_quoprint.h
svn_sorts.h svn_string.h svn_subst.h svn_time.h svn_types.h svn_user.h
svn_utf.h svn_version.h svn_xml.h svn_x509.h
- private\svn_atomic.h private\svn_cache.h private\svn_cmdline_private.h
- private\svn_debug.h private\svn_error_private.h private\svn_fspath.h
- private\svn_log.h private\svn_mergeinfo_private.h
- private\svn_opt_private.h private\svn_skel.h private\svn_sqlite.h
- private\svn_utf_private.h private\svn_eol_private.h
- private\svn_token.h private\svn_adler32.h
- private\svn_temp_serializer.h private\svn_io_private.h
- private\svn_sorts_private.h private\svn_auth_private.h
- private\svn_string_private.h private\svn_magic.h
- private\svn_subr_private.h private\svn_mutex.h private\svn_task.h
- private\svn_thread_cond.h private\svn_waitable_counter.h
- private\svn_packed_data.h private\svn_object_pool.h private\svn_cert.h
- private\svn_config_private.h private\svn_dirent_uri_private.h
+ private/svn_atomic.h private/svn_cache.h private/svn_cmdline_private.h
+ private/svn_debug.h private/svn_error_private.h private/svn_fspath.h
+ private/svn_log.h private/svn_mergeinfo_private.h
+ private/svn_opt_private.h private/svn_skel.h private/svn_sqlite.h
+ private/svn_utf_private.h private/svn_eol_private.h
+ private/svn_token.h private/svn_adler32.h
+ private/svn_temp_serializer.h private/svn_io_private.h
+ private/svn_sorts_private.h private/svn_auth_private.h
+ private/svn_string_private.h private/svn_magic.h
+ private/svn_subr_private.h private/svn_mutex.h private/svn_task.h
+ private/svn_thread_cond.h private/svn_waitable_counter.h
+ private/svn_packed_data.h private/svn_object_pool.h private/svn_cert.h
+ private/svn_config_private.h private/svn_dirent_uri_private.h
# Working copy management lib
[libsvn_wc]
@@ -409,7 +409,7 @@ type = lib
path = subversion/libsvn_wc
libs = libsvn_delta libsvn_diff libsvn_subr aprutil apriconv apr
install = lib
-msvc-export = svn_wc.h private\svn_wc_private.h
+msvc-export = svn_wc.h private/svn_wc_private.h
# Subversion plugin for Apache's mod_dav
[mod_dav_svn]
@@ -831,7 +831,7 @@ libs = libsvn_test libsvn_wc libsvn_fs l
msvc-force-static = yes
[fs-fs-private-test]
-description = Test FSSF private API
+description = Test FSFS private API
type = exe
path = subversion/tests/libsvn_fs_fs
sources = fs-fs-private-test.c
