Author: rinrab
Date: Wed Sep 25 16:03:48 2024
New Revision: 1920916
URL: http://svn.apache.org/viewvc?rev=1920916&view=rev
Log:
On the 'windows-shared-ra-modules' branch: Sync with trunk@1920915.
Modified:
subversion/branches/windows-shared-ra-modules/ (props changed)
subversion/branches/windows-shared-ra-modules/.github/workflows/cmake.yml (contents, props changed)
subversion/branches/windows-shared-ra-modules/CHANGES
subversion/branches/windows-shared-ra-modules/CMakeLists.txt
subversion/branches/windows-shared-ra-modules/NOTICE
subversion/branches/windows-shared-ra-modules/build/generator/templates/targets.cmake.ezt
subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs/fs-loader.c
subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs/fs-loader.h
subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_base/fs.c
subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_base/fs_init.h
subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_fs/fs.c
subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_fs/fs_init.h
subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_x/ (props changed)
subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_x/fs.c
subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_x/fs_init.h
subversion/branches/windows-shared-ra-modules/subversion/libsvn_subr/version.c
subversion/branches/windows-shared-ra-modules/tools/dist/release.py
Propchange: subversion/branches/windows-shared-ra-modules/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1920808-1920915
Modified: subversion/branches/windows-shared-ra-modules/.github/workflows/cmake.yml
URL: http://svn.apache.org/viewvc/subversion/branches/windows-shared-ra-modules/.github/workflows/cmake.yml?rev=1920916&r1=1920915&r2=1920916&view=diff
==============================================================================
--- subversion/branches/windows-shared-ra-modules/.github/workflows/cmake.yml (original)
+++ subversion/branches/windows-shared-ra-modules/.github/workflows/cmake.yml Wed Sep 25 16:03:48 2024
@@ -1,126 +1,138 @@
-name: Build and Test Subversion with CMake
-
-on:
- push:
- branches: ["*"]
-
-concurrency:
- group: ${{ github.ref }}
- cancel-in-progress: false
-
-defaults:
- run:
- shell: pwsh
-
-jobs:
- build:
- strategy:
- fail-fast: false
- matrix:
- include:
- - name: Windows, shared, x64, with tests
- os: windows-latest
- build_shared: ON
- vcpkg_triplet: x64-windows
- arch: x64
- run_tests: true
- - name: Windows, shared, x86
- os: windows-latest
- build_shared: ON
- vcpkg_triplet: x86-windows
- arch: x86
- - name: Windows, static, x64, with tests
- os: windows-latest
- build_shared: OFF
- vcpkg_triplet: x64-windows-static
- arch: x64
- run_tests: true
- - name: Linux, shared, with tests
- os: ubuntu-latest
- build_shared: ON
- run_tests: true
-
- runs-on: ${{ matrix.os }}
- name: ${{ matrix.name }}
-
- env:
- VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
-
- steps:
- - name: Prepare Enviroment (Windows)
- if: runner.os == 'Windows'
- run: |
- $root = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
- Import-Module "$root\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
- Enter-VsDevShell -VsInstallPath $root -DevCmdArguments "-arch=${{ matrix.arch }}"
-
- ls env: | foreach { "$($_.Name)=$($_.Value)" >> $env:GITHUB_ENV }
-
- - name: Prepare Enviroment (Linux)
- if: runner.os == 'Windows'
- run: |
- # nothing yet
-
- - name: Export GitHub Actions cache environment variables
- if: runner.os == 'Windows'
- uses: actions/github-script@v7
- with:
- script: |
- core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
- core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-
- - name: Install dependecies (Windows, vcpkg)
- if: runner.os == 'Windows'
- run: |
- C:\vcpkg\vcpkg.exe install --triplet ${{ matrix.vcpkg_triplet }} `
- apr apr-util expat zlib sqlite3
-
- "CMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake" >> $env:GITHUB_ENV
-
- - name: Install dependecies (Linux, apt-get)
- if: runner.os == 'Linux'
- run: >
- sudo apt-get install
- libtool
- libtool-bin
- libapr1-dev
- libaprutil1-dev
- libexpat1-dev
- zlib1g-dev
- libsqlite3-dev
- ninja-build
-
- - name: Use LF for Git checkout
- run: |
- git config --global core.autocrlf false
- git config --global core.eol lf
-
- - uses: actions/checkout@v4
-
- - name: gen-make
- run: python ./gen-make.py -t cmake
-
- - name: Configure CMake
- run: >
- cmake -B out -G Ninja
- -DBUILD_SHARED_LIBS=${{ matrix.build_shared }}
- -DSVN_ENABLE_TESTS=ON
- -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/installdir
- -DVCPKG_TARGET_TRIPLET=${{ matrix.vcpkg_triplet }}
-
- - name: Build CMake
- run: cmake --build out
-
- - name: Install
- run: cmake --install out
-
- - name: Run all tests
- id: run_all_tests
- if: matrix.run_tests
- working-directory: out
- run: ctest --output-on-failure --verbose
-
- - name: Rerun failed tests
- if: ${{ matrix.run_tests && failure() && steps.run_all_tests.conclusion == 'failure' }}
- working-directory: out
- run: ctest --output-on-failure --verbose --rerun-failed
+name: Build and Test Subversion with CMake
+
+on:
+ push:
+ branches: ["*"]
+
+concurrency:
+ group: ${{ github.ref }}
+ cancel-in-progress: false
+
+defaults:
+ run:
+ shell: pwsh
+
+jobs:
+ build:
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - name: Windows, shared, x64, with tests
+ os: windows-latest
+ build_shared: ON
+ cmake_generator: Ninja
+ vcpkg_triplet: x64-windows
+ arch: x64
+ run_tests: true
+ - name: Windows, shared, x64, vs2022, with tests
+ os: windows-latest
+ build_shared: ON
+ cmake_generator: 'Visual Studio 17 2022'
+ vcpkg_triplet: x64-windows
+ arch: x64
+ run_tests: true
+ - name: Windows, shared, x86
+ os: windows-latest
+ build_shared: ON
+ cmake_generator: Ninja
+ vcpkg_triplet: x86-windows
+ arch: x86
+ - name: Windows, static, x64, with tests
+ os: windows-latest
+ build_shared: OFF
+ cmake_generator: Ninja
+ vcpkg_triplet: x64-windows-static
+ arch: x64
+ run_tests: true
+ - name: Linux, shared, with tests
+ os: ubuntu-latest
+ cmake_generator: Ninja
+ build_shared: ON
+ run_tests: true
+
+ runs-on: ${{ matrix.os }}
+ name: ${{ matrix.name }}
+
+ env:
+ VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+ CMAKE_GENERATOR: ${{ matrix.cmake_generator }}
+
+ steps:
+ - name: Prepare Enviroment (Windows)
+ if: runner.os == 'Windows'
+ run: |
+ $root = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
+ Import-Module "$root\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
+ Enter-VsDevShell -VsInstallPath $root -DevCmdArguments "-arch=${{ matrix.arch }}"
+
+ ls env: | foreach { "$($_.Name)=$($_.Value)" >> $env:GITHUB_ENV }
+
+ - name: Prepare Enviroment (Linux)
+ if: runner.os == 'Windows'
+ run: |
+ # nothing yet
+
+ - name: Export GitHub Actions cache environment variables
+ if: runner.os == 'Windows'
+ uses: actions/github-script@v7
+ with:
+ script: |
+ core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+ core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+
+ - name: Install dependecies (Windows, vcpkg)
+ if: runner.os == 'Windows'
+ run: |
+ C:\vcpkg\vcpkg.exe install --triplet ${{ matrix.vcpkg_triplet }} `
+ apr apr-util expat zlib sqlite3
+
+ "CMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake" >> $env:GITHUB_ENV
+
+ - name: Install dependecies (Linux, apt-get)
+ if: runner.os == 'Linux'
+ run: >
+ sudo apt-get install
+ libtool
+ libtool-bin
+ libapr1-dev
+ libaprutil1-dev
+ libexpat1-dev
+ zlib1g-dev
+ libsqlite3-dev
+ ninja-build
+
+ - name: Use LF for Git checkout
+ run: |
+ git config --global core.autocrlf false
+ git config --global core.eol lf
+
+ - uses: actions/checkout@v4
+
+ - name: gen-make
+ run: python ./gen-make.py -t cmake
+
+ - name: Configure CMake
+ run: >
+ cmake -B out
+ -DBUILD_SHARED_LIBS=${{ matrix.build_shared }}
+ -DSVN_ENABLE_TESTS=ON
+ -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/installdir
+ -DVCPKG_TARGET_TRIPLET=${{ matrix.vcpkg_triplet }}
+
+ - name: Build CMake
+ run: cmake --build out --config Release
+
+ - name: Install
+ run: cmake --install out --config Release
+
+ - name: Run all tests
+ id: run_all_tests
+ if: matrix.run_tests
+ working-directory: out
+ run: ctest --output-on-failure --verbose -C Release
+
+ - name: Rerun failed tests
+ if: ${{ matrix.run_tests && failure() && steps.run_all_tests.conclusion == 'failure' }}
+ working-directory: out
+ run: ctest --output-on-failure --verbose -C Release --rerun-failed
Propchange: subversion/branches/windows-shared-ra-modules/.github/workflows/cmake.yml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/branches/windows-shared-ra-modules/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/windows-shared-ra-modules/CHANGES?rev=1920916&r1=1920915&r2=1920916&view=diff
==============================================================================
--- subversion/branches/windows-shared-ra-modules/CHANGES (original)
+++ subversion/branches/windows-shared-ra-modules/CHANGES Wed Sep 25 16:03:48 2024
@@ -17,6 +17,25 @@ https://svn.apache.org/repos/asf/subvers
time with --disable-plaintext-password-storage. This reverts r1845377
(r1909351).
+Version 1.14.4
+(8 Oct 2024, from /branches/1.14.x)
+https://svn.apache.org/repos/asf/subversion/tags/1.14.4
+ User-visible changes:
+ - Client-side improvements and bugfixes:
+ * Fix unbounded memory usage in propget and proplist --xml (r1918138, -39)
+ * Fix cmdline parsing bugs in --change (-c) argument (r1917864, -944)
+ * Improve help message for svnmucc PUT (r1914222)
+ - Server-side bugfixes:
+ * mailer.py: Fix inconsistency in Config.which_group() arguments (r1914518)
+
+ Developer-visible changes:
+ * Fix svnadmin_tests.py failing with Python 3.11+ on Windows (r1910464)
+ * Support building swig-rb with clang 16 / GCC14 (r1915236, -39)
+ * Convert path to local style in error message from diff API (r1917946)
+ * Fix `invalid escape sequence` in .py scripts for Python 3.12 (r1912632)
+ * swig-py: Fix `none_dealloc` error caused by refcount issue (r1915316)
+ * Fix a msgid in svnadmin.c which was not a valid C string (r1887710)
+
Version 1.14.3
(20 Dec 2023, from /branches/1.14.x)
https://svn.apache.org/repos/asf/subversion/tags/1.14.3
Modified: subversion/branches/windows-shared-ra-modules/CMakeLists.txt
URL: http://svn.apache.org/viewvc/subversion/branches/windows-shared-ra-modules/CMakeLists.txt?rev=1920916&r1=1920915&r2=1920916&view=diff
==============================================================================
--- subversion/branches/windows-shared-ra-modules/CMakeLists.txt (original)
+++ subversion/branches/windows-shared-ra-modules/CMakeLists.txt Wed Sep 25 16:03:48 2024
@@ -658,29 +658,28 @@ if(SVN_ENABLE_TESTS)
find_package(Python3 COMPONENTS Interpreter REQUIRED)
file(GLOB PYTHON_TESTS
- "subversion/tests/cmdline/*.py"
+ "subversion/tests/cmdline/*_tests.py"
)
foreach(py_test_path ${PYTHON_TESTS})
# Keep `.py'.
get_filename_component(py_test_name ${py_test_path} NAME_WLE)
+ set(binary_dir $<TARGET_FILE_DIR:svn>)
- if(NOT ${py_test_name} STREQUAL "svneditor")
- add_test(
- NAME
- "cmdline.${py_test_name}"
- COMMAND
- "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/build/run_tests.py"
- --bin ${CMAKE_CURRENT_BINARY_DIR}
- --tools-bin ${CMAKE_CURRENT_BINARY_DIR}
- --verbose
- --log-to-stdout
- --set-log-level=WARNING
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}
- ${py_test_path}
- )
- endif()
+ add_test(
+ NAME
+ "cmdline.${py_test_name}"
+ COMMAND
+ "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/build/run_tests.py"
+ --bin ${binary_dir}
+ --tools-bin ${binary_dir}
+ --verbose
+ --log-to-stdout
+ --set-log-level=WARNING
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${binary_dir}
+ ${py_test_path}
+ )
endforeach()
endif()
Modified: subversion/branches/windows-shared-ra-modules/NOTICE
URL: http://svn.apache.org/viewvc/subversion/branches/windows-shared-ra-modules/NOTICE?rev=1920916&r1=1920915&r2=1920916&view=diff
==============================================================================
--- subversion/branches/windows-shared-ra-modules/NOTICE (original)
+++ subversion/branches/windows-shared-ra-modules/NOTICE Wed Sep 25 16:03:48 2024
@@ -1,5 +1,5 @@
Apache Subversion
-Copyright 2023 The Apache Software Foundation
+Copyright 2024 The Apache Software Foundation
This product includes software developed by many people, and distributed
under Contributor License Agreements to The Apache Software Foundation
Modified: subversion/branches/windows-shared-ra-modules/build/generator/templates/targets.cmake.ezt
URL: http://svn.apache.org/viewvc/subversion/branches/windows-shared-ra-modules/build/generator/templates/targets.cmake.ezt?rev=1920916&r1=1920915&r2=1920916&view=diff
==============================================================================
--- subversion/branches/windows-shared-ra-modules/build/generator/templates/targets.cmake.ezt (original)
+++ subversion/branches/windows-shared-ra-modules/build/generator/templates/targets.cmake.ezt Wed Sep 25 16:03:48 2024
@@ -62,7 +62,11 @@ if ([targets.enable_condition])[is targe
add_executable([targets.name][for targets.sources]
[targets.sources][end]
)
- add_test([targets.namespace].[targets.name] [targets.name] --srcdir ${CMAKE_SOURCE_DIR}/[targets.srcdir])
+ add_test(
+ NAME [targets.namespace].[targets.name]
+ COMMAND [targets.name] --srcdir ${CMAKE_SOURCE_DIR}/[targets.srcdir]
+ WORKING_DIRECTORY $<TARGET_FILE_DIR:[targets.name]>
+ )
[end]target_link_libraries([targets.name] PRIVATE[for targets.libs]
[targets.libs][end]
)[if-any targets.msvc_libs]
Modified: subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs/fs-loader.c?rev=1920916&r1=1920915&r2=1920916&view=diff
==============================================================================
--- subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs/fs-loader.c Wed Sep 25 16:03:48 2024
@@ -52,6 +52,18 @@
#include "fs-loader.h"
+/* Here are the declarations for the FS module init functions. If we
+ are using DSO loading, they won't actually be linked into
+ libsvn_fs. Note that these private functions have a common_pool
+ parameter that may be used for fs module scoped variables such as
+ the bdb cache. This will be the same common_pool that is passed
+ to the create and open functions and these init functions (as well
+ as the open and create functions) are globally serialized so that
+ they have exclusive access to the common_pool. */
+#include "../libsvn_fs_base/fs_init.h"
+#include "../libsvn_fs_fs/fs_init.h"
+#include "../libsvn_fs_x/fs_init.h"
+
/* This is defined by configure on platforms which use configure, but
we need to define a fallback for Windows. */
#ifndef DEFAULT_FS_TYPE
Modified: subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs/fs-loader.h
URL: http://svn.apache.org/viewvc/subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs/fs-loader.h?rev=1920916&r1=1920915&r2=1920916&view=diff
==============================================================================
--- subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs/fs-loader.h (original)
+++ subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs/fs-loader.h Wed Sep 25 16:03:48 2024
@@ -183,18 +183,6 @@ typedef svn_error_t *(*fs_init_func_t)(c
fs_library_vtable_t **vtable,
apr_pool_t* common_pool);
-/* Here are the declarations for the FS module init functions. If we
- are using DSO loading, they won't actually be linked into
- libsvn_fs. Note that these private functions have a common_pool
- parameter that may be used for fs module scoped variables such as
- the bdb cache. This will be the same common_pool that is passed
- to the create and open functions and these init functions (as well
- as the open and create functions) are globally serialized so that
- they have exclusive access to the common_pool. */
-#include "../libsvn_fs_base/fs_init.h"
-#include "../libsvn_fs_fs/fs_init.h"
-#include "../libsvn_fs_x/fs_init.h"
-
/*** vtable types for the abstract FS objects ***/
Modified: subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_base/fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_base/fs.c?rev=1920916&r1=1920915&r2=1920916&view=diff
==============================================================================
--- subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_base/fs.c (original)
+++ subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_base/fs.c Wed Sep 25 16:03:48 2024
@@ -36,6 +36,7 @@
#include "svn_delta.h"
#include "svn_version.h"
#include "fs.h"
+#include "fs_init.h"
#include "err.h"
#include "dag.h"
#include "revs-txns.h"
Modified: subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_base/fs_init.h
URL: http://svn.apache.org/viewvc/subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_base/fs_init.h?rev=1920916&r1=1920915&r2=1920916&view=diff
==============================================================================
--- subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_base/fs_init.h (original)
+++ subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_base/fs_init.h Wed Sep 25 16:03:48 2024
@@ -22,9 +22,10 @@
* ====================================================================
*/
-#ifndef LIBSVN_FS_LOADER_H
-#error Please include libsvn_fs/fs_loader.h instead of this file
-#else
+#ifndef SVN_LIBSVN_FS_BASE_INIT
+#define SVN_LIBSVN_FS_BASE_INIT
+
+#include "../libsvn_fs/fs-loader.h"
svn_error_t *svn_fs_base__init(const svn_version_t *loader_version,
fs_library_vtable_t **vtable,
Modified: subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_fs/fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_fs/fs.c?rev=1920916&r1=1920915&r2=1920916&view=diff
==============================================================================
--- subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_fs/fs.c (original)
+++ subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_fs/fs.c Wed Sep 25 16:03:48 2024
@@ -34,6 +34,7 @@
#include "svn_pools.h"
#include "fs.h"
#include "fs_fs.h"
+#include "fs_init.h"
#include "tree.h"
#include "lock.h"
#include "hotcopy.h"
Modified: subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_fs/fs_init.h
URL: http://svn.apache.org/viewvc/subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_fs/fs_init.h?rev=1920916&r1=1920915&r2=1920916&view=diff
==============================================================================
--- subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_fs/fs_init.h (original)
+++ subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_fs/fs_init.h Wed Sep 25 16:03:48 2024
@@ -21,12 +21,13 @@
* ====================================================================
*/
-#ifndef LIBSVN_FS_LOADER_H
-#error Please include libsvn_fs/fs_loader.h instead of this file
-#else
+#ifndef SVN_LIBSVN_FS_FS_INIT
+#define SVN_LIBSVN_FS_FS_INIT
+
+#include "../libsvn_fs/fs-loader.h"
svn_error_t *svn_fs_fs__init(const svn_version_t *loader_version,
- fs_library_vtable_t **vtable,
- apr_pool_t* common_pool);
+ fs_library_vtable_t **vtable,
+ apr_pool_t *common_pool);
#endif
Propchange: subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_x/
------------------------------------------------------------------------------
Merged /subversion/trunk/subversion/libsvn_fs_x:r1920808-1920915
Modified: subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_x/fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_x/fs.c?rev=1920916&r1=1920915&r2=1920916&view=diff
==============================================================================
--- subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_x/fs.c (original)
+++ subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_x/fs.c Wed Sep 25 16:03:48 2024
@@ -35,6 +35,7 @@
#include "batch_fsync.h"
#include "fs.h"
#include "fs_x.h"
+#include "fs_init.h"
#include "pack.h"
#include "recovery.h"
#include "hotcopy.h"
Modified: subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_x/fs_init.h
URL: http://svn.apache.org/viewvc/subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_x/fs_init.h?rev=1920916&r1=1920915&r2=1920916&view=diff
==============================================================================
--- subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_x/fs_init.h (original)
+++ subversion/branches/windows-shared-ra-modules/subversion/libsvn_fs_x/fs_init.h Wed Sep 25 16:03:48 2024
@@ -21,13 +21,14 @@
* ====================================================================
*/
-#ifndef LIBSVN_FS_LOADER_H
-#error Please include libsvn_fs/fs_loader.h instead of this file
-#else
+#ifndef SVN_LIBSVN_FS_X_INIT
+#define SVN_LIBSVN_FS_X_INIT
+
+#include "../libsvn_fs/fs-loader.h"
svn_error_t *svn_fs_x__init(const svn_version_t *loader_version,
- fs_library_vtable_t **vtable,
- apr_pool_t* common_pool);
+ fs_library_vtable_t **vtable,
+ apr_pool_t *common_pool);
#endif
Modified: subversion/branches/windows-shared-ra-modules/subversion/libsvn_subr/version.c
URL: http://svn.apache.org/viewvc/subversion/branches/windows-shared-ra-modules/subversion/libsvn_subr/version.c?rev=1920916&r1=1920915&r2=1920916&view=diff
==============================================================================
--- subversion/branches/windows-shared-ra-modules/subversion/libsvn_subr/version.c (original)
+++ subversion/branches/windows-shared-ra-modules/subversion/libsvn_subr/version.c Wed Sep 25 16:03:48 2024
@@ -143,7 +143,7 @@ svn_version_extended(svn_boolean_t verbo
info->build_time = __TIME__;
info->build_host = SVN_BUILD_HOST;
info->copyright = apr_pstrdup
- (pool, _("Copyright (C) 2023 The Apache Software Foundation.\n"
+ (pool, _("Copyright (C) 2024 The Apache Software Foundation.\n"
"This software consists of contributions made by many people;\n"
"see the NOTICE file for more information.\n"
"Subversion is open source software, see "
Modified: subversion/branches/windows-shared-ra-modules/tools/dist/release.py
URL: http://svn.apache.org/viewvc/subversion/branches/windows-shared-ra-modules/tools/dist/release.py?rev=1920916&r1=1920915&r2=1920916&view=diff
==============================================================================
--- subversion/branches/windows-shared-ra-modules/tools/dist/release.py (original)
+++ subversion/branches/windows-shared-ra-modules/tools/dist/release.py Wed Sep 25 16:03:48 2024
@@ -910,8 +910,9 @@ def roll_tarballs(args):
# line endings and won't run, so use the one in the working copy.
run_script(args.verbose,
'%s/tools/po/po-update.sh pot' % get_workdir(args.base_dir))
- run_script(args.verbose,
- 'python gen-make.py -t cmake --release')
+ if not args.version < Version("1.15.0"):
+ run_script(args.verbose,
+ 'python gen-make.py -t cmake --release')
clean_pycache() # as with clean_autom4te, is this pointless on Windows?
os.chdir(cwd)
clean_autom4te() # dist.sh does it but pointless on Windows?
@@ -928,8 +929,9 @@ def roll_tarballs(args):
'''tools/po/po-update.sh pot
./autogen.sh --release''',
hide_stderr=True) # SWIG is noisy
- run_script(args.verbose,
- 'python gen-make.py -t cmake --release')
+ if not args.version < Version("1.15.0"):
+ run_script(args.verbose,
+ 'python gen-make.py -t cmake --release')
clean_pycache() # without this, tarballs contain empty __pycache__ dirs
os.chdir(cwd)
clean_autom4te() # dist.sh does it but probably pointless
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.