Author: ivan
Date: Tue Jun 23 18:33:29 2026
New Revision: 1935599
Log:
On 'xml-schema-validation-improvements' branch:
Catchup merge with trunk.
Modified:
subversion/branches/xml-schema-validation-improvements/ (props changed)
subversion/branches/xml-schema-validation-improvements/.github/workflows/autoconf.yml
subversion/branches/xml-schema-validation-improvements/.github/workflows/cmake.yml
subversion/branches/xml-schema-validation-improvements/CMakeLists.txt
Modified:
subversion/branches/xml-schema-validation-improvements/.github/workflows/autoconf.yml
==============================================================================
---
subversion/branches/xml-schema-validation-improvements/.github/workflows/autoconf.yml
Tue Jun 23 18:32:28 2026 (r1935598)
+++
subversion/branches/xml-schema-validation-improvements/.github/workflows/autoconf.yml
Tue Jun 23 18:33:29 2026 (r1935599)
@@ -94,6 +94,7 @@ jobs:
run: |
python3 -m venv "$HOME/test-python-venv"
"$HOME/test-python-venv/bin/python3" -m pip \
+ -v \
--disable-pip-version-check \
install lxml==6.1.0 rnc2rng==2.7.0
Modified:
subversion/branches/xml-schema-validation-improvements/.github/workflows/cmake.yml
==============================================================================
---
subversion/branches/xml-schema-validation-improvements/.github/workflows/cmake.yml
Tue Jun 23 18:32:28 2026 (r1935598)
+++
subversion/branches/xml-schema-validation-improvements/.github/workflows/cmake.yml
Tue Jun 23 18:33:29 2026 (r1935599)
@@ -149,7 +149,7 @@ jobs:
- name: Install dependencies (Windows, python)
if: runner.os == 'Windows'
- run: python -m pip --disable-pip-version-check install lxml==6.1.0
rnc2rng==2.7.0
+ run: python -m pip -v --disable-pip-version-check install lxml==6.1.0
rnc2rng==2.7.0
- name: Install dependencies (Linux, apt-get)
if: runner.os == 'Linux'
@@ -184,7 +184,7 @@ jobs:
- name: Install dependencies (Mac OS, python)
if: runner.os == 'macOS'
- run: python -m pip --disable-pip-version-check install lxml==6.1.0
rnc2rng==2.7.0
+ run: python -m pip -v --disable-pip-version-check install lxml==6.1.0
rnc2rng==2.7.0
- name: Use LF for Git checkout
run: |
@@ -198,9 +198,6 @@ jobs:
- name: Configure CMake
run: >
- if ($env:RUNNER_OS -eq 'Windows') {
- $env:PATH += ";${env:VCPKG_ROOT}\installed\${{
matrix.vcpkg_triplet }}\bin";
- };
cmake -B out
-DBUILD_SHARED_LIBS=${{ matrix.build_shared }}
-DSVN_ENABLE_TESTS=ON
@@ -212,6 +209,7 @@ jobs:
-DVCPKG_TARGET_TRIPLET=${{ matrix.vcpkg_triplet }}
-DSVN_TEST_CONFIGURE_FOR_PARALLEL=ON
-DPython3_FIND_REGISTRY=NEVER
+ -DPython3_FIND_STRATEGY=LOCATION
${{ matrix.extra_config_opts }}
- name: Build CMake
Modified: subversion/branches/xml-schema-validation-improvements/CMakeLists.txt
==============================================================================
--- subversion/branches/xml-schema-validation-improvements/CMakeLists.txt
Tue Jun 23 18:32:28 2026 (r1935598)
+++ subversion/branches/xml-schema-validation-improvements/CMakeLists.txt
Tue Jun 23 18:33:29 2026 (r1935599)
@@ -113,7 +113,7 @@ mark_as_advanced(SVN_SOVERSION)
find_package(PkgConfig QUIET)
cmake_dependent_option(SVN_USE_PKG_CONFIG "Use pkg-config for the
dependencies" ON "PKG_CONFIG_FOUND" OFF)
-# Dependecies
+# Dependencies
option(SVN_USE_INTERNAL_LZ4 "Use internal version of lz4" ON)
option(SVN_USE_INTERNAL_UTF8PROC "Use internal version of utf8proc" ON)
option(SVN_SQLITE_USE_AMALGAMATION "Use sqlite amalgamation" OFF)
@@ -385,10 +385,10 @@ endif()
### Intl
if(SVN_ENABLE_NLS)
- # Note: when installing these dependecies with vcpkg, you will need to
+ # Note: when installing these dependencies with vcpkg, you will need to
# install 'gettext' package with 'tools' feature. Use the following command
# for this: `./vcpkg install gettext[tools]`. This package contains both,
- # Gettext and Intl dependecies.
+ # Gettext and Intl dependencies.
find_package(Gettext REQUIRED)
find_package(Intl REQUIRED)
