Re: svn commit: r1937024 - subversion/trunk

[Daniel Sahlberg]

Thanks Jun for taking care of this!


Den mån 10 aug. 2026 kl 10:46 skrev <jun6...@apache.org>:

> Author: jun66j5
> Date: Mon Aug 10 08:46:42 2026
> New Revision: 1937024
>
> Log:
> cmake: The `svn-javahl.jar` file now includes test classes to ensure
> results
> consistent with autoconf builds. As the result, the junit jar file is now
> required when building javahl with cmake as well. See also r1936939.
>
> * CMakeLists.txt
>   (JUNIT_JAR): Add a file existent check.
>   (svn-javahl): Add the test source files to SOURCES.
>   (svn-javahl-tests): Remove. This target is no longer needed.
>
> Modified:
>    subversion/trunk/CMakeLists.txt
>
> Modified: subversion/trunk/CMakeLists.txt
>
> ==============================================================================
> --- subversion/trunk/CMakeLists.txt     Mon Aug 10 08:30:58 2026
> (r1937023)
> +++ subversion/trunk/CMakeLists.txt     Mon Aug 10 08:46:42 2026
> (r1937024)
> @@ -335,9 +335,10 @@ if(SVN_ENABLE_JAVAHL)
>    endif()
>
>    set(SVN_JAVAHL_SOURCES)
> -  if(SVN_ENABLE_JAVAHL_TESTS)
> -    set(SVN_JAVAHL_TESTS_SOURCES)
> -    find_jar(JUNIT_JAR NAMES junit4 junit)
> +  set(SVN_JAVAHL_TESTS_SOURCES)
> +  find_jar(JUNIT_JAR NAMES junit4 junit)
> +  if(NOT JUNIT_JAR OR NOT EXISTS "${JUNIT_JAR}")
> +    message(SEND_ERROR "The junit jar file does not exist;
> JUNIT_JAR=${JUNIT_JAR}")
>    endif()
>  endif()
>
> @@ -1138,7 +1139,9 @@ if(SVN_ENABLE_JAVAHL)
>    file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/javahl/Manifest"
>      "${SVN_JAVAHL_MANIFEST}"
>    )
> -  add_jar(svn-javahl SOURCES ${SVN_JAVAHL_SOURCES}
> +  add_jar(svn-javahl
> +    SOURCES ${SVN_JAVAHL_SOURCES} ${SVN_JAVAHL_TESTS_SOURCES}
> +    INCLUDE_JARS "${JUNIT_JAR}"
>      MANIFEST "${CMAKE_CURRENT_BINARY_DIR}/javahl/Manifest"
>      GENERATE_NATIVE_HEADERS svn-javahl.headers
>        DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/javahl/include"
> @@ -1164,15 +1167,6 @@ if(SVN_ENABLE_JAVAHL)
>    )
>
>    if(SVN_ENABLE_JAVAHL_TESTS)
> -    add_jar(svn-javahl-tests
> -      SOURCES ${SVN_JAVAHL_TESTS_SOURCES}
> -      INCLUDE_JARS
> -        "${CMAKE_CURRENT_BINARY_DIR}/javahl/lib/svn-javahl.jar"
> -        "${JUNIT_JAR}"
> -      OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/javahl/lib"
> -    )
> -    add_dependencies(svn-javahl-tests svn-javahl)
> -
>      function(add_javahl_tests target)
>        if(WIN32)
>          set(sep "\\;")
> @@ -1180,7 +1174,6 @@ if(SVN_ENABLE_JAVAHL)
>          set(sep ":")
>        endif()
>        string(JOIN ${sep} classpath
> -        "${CMAKE_CURRENT_BINARY_DIR}/javahl/lib/svn-javahl-tests.jar"
>          "${CMAKE_CURRENT_BINARY_DIR}/javahl/lib/svn-javahl.jar"
>          "${JUNIT_JAR}"
>        )
>
>