Re: Subversion 1.15.0-rc3 up for testing/signing

[Timofei Zhakov]

On Tue, Jul 14, 2026 at 3:12 PM Branko Čibej <br...@apache.org> wrote:

> On 13. 7. 2026 13:37, Evgeny Kotkov via dev wrote:
>
> The 1.15.0-rc3 release artifacts are now available for testing/signing.
> Please get the tarballs from
>   https://dist.apache.org/repos/dist/dev/subversion
> and add your signatures there.
>
> Thanks!
>
>
> I found this difference in the generated targets.cmake between the tar.gz
> and zip archives. There's no semantic difference but I wonder if it's
> relevant, given that the generator is supposed to be the same, the
> conditions shouldn't be reversed like this:
>
> --- subversion-1.15.0-rc3/build/cmake/targets.cmake     2026-07-13 12:31:42
> +++ zip/build/cmake/targets.cmake       2026-07-13 12:31:23
> @@ -193,7 +193,7 @@
>  endif()
>
>  # Test changes in libsvn_fs_base
> -if (SVN_ENABLE_PROGRAMS AND SVN_ENABLE_FS_BASE)
> +if (SVN_ENABLE_FS_BASE AND SVN_ENABLE_PROGRAMS)
>    add_executable(changes-test
>      subversion/tests/libsvn_fs_base/changes-test.c
>    )
> @@ -747,7 +747,7 @@
>  endif()
>
>  # Tests for *public* fs API (svn_fs.h)
> -if (SVN_ENABLE_PROGRAMS AND SVN_ENABLE_FS_BASE)
> +if (SVN_ENABLE_FS_BASE AND SVN_ENABLE_PROGRAMS)
>    add_executable(fs-base-test
>      subversion/tests/libsvn_fs_base/fs-base-test.c
>    )
> @@ -3541,7 +3541,7 @@
>  endif()
>
>  # Test strings/reps in libsvn_fs_base
> -if (SVN_ENABLE_PROGRAMS AND SVN_ENABLE_FS_BASE)
> +if (SVN_ENABLE_FS_BASE AND SVN_ENABLE_PROGRAMS)
>    add_executable(strings-reps-test
>      subversion/tests/libsvn_fs_base/strings-reps-test.c
>    )
> @@ -4091,7 +4091,7 @@
>  endif()
>
>  # Subversion Server
> -if (SVN_ENABLE_PROGRAMS AND SVN_ENABLE_RA_SVN)
> +if (SVN_ENABLE_RA_SVN AND SVN_ENABLE_PROGRAMS)
>    add_executable(svnserve
>      subversion/svnserve/cyrus_auth.c
>      subversion/svnserve/log-escape.c
>
>
> -- Brane
>
>
That is a nice find.

I just checked the code to refresh this bit. The conditions are built from
the features of the target itself and its dependencies. But when the
dependencies are collected, they might be in any random order.

Oh and then they are put into a set that messes them up one more time.
Blame says it was done to eliminate duplicates. I think piping this whole
thing into sorted() should do the job.

[[[
Index: build/generator/gen_cmake.py
===================================================================
--- build/generator/gen_cmake.py (revision 1935890)
+++ build/generator/gen_cmake.py (working copy)
@@ -210,7 +210,7 @@ class Generator(gen_base.GeneratorBase):
         else:
           install_target = False

-        enable_condition = list(set(enable_condition))
+        enable_condition = sorted(list(set(enable_condition)))
         if len(enable_condition) > 0:
           enable_condition_str = " AND ".join(enable_condition)
         else:
]]]

This worked for me.

-- 
Timofei Zhakov