Andrey Kamaev
12 years ago
parent
46c4390a2e
commit
3889b34ec3
5 changed files with 73 additions and 49 deletions
@ -1,80 +1,77 @@ |
||||
ocv_check_dependencies(opencv_java ${OPENCV_MODULE_opencv_java_OPT_DEPS} ${OPENCV_MODULE_opencv_java_REQ_DEPS}) |
||||
|
||||
if(NOT OCV_DEPENDENCIES_FOUND OR NOT ANT_EXECUTABLE) |
||||
if(NOT OCV_DEPENDENCIES_FOUND) |
||||
return() |
||||
endif() |
||||
|
||||
# TODO: This has the same name as the Android test project. That project should |
||||
# probably be renamed. |
||||
project(opencv_test_java) |
||||
|
||||
set(opencv_test_java_bin_dir "${CMAKE_CURRENT_BINARY_DIR}/.build") |
||||
|
||||
set(android_source_dir "${CMAKE_CURRENT_SOURCE_DIR}/../android_test") |
||||
|
||||
set(java_source_dir ${CMAKE_CURRENT_SOURCE_DIR}) |
||||
|
||||
# get project sources |
||||
file(GLOB_RECURSE opencv_test_java_files RELATIVE "${android_source_dir}" "${android_source_dir}/res/*" "${android_source_dir}/src/*") |
||||
ocv_list_filterout(opencv_test_java_files ".svn") |
||||
ocv_list_filterout(opencv_test_java_files ".*#.*") |
||||
file(GLOB_RECURSE opencv_test_java_files RELATIVE "${android_source_dir}" "${android_source_dir}/res/*" "${android_source_dir}/src/*.java") |
||||
# These are the files that need to be updated for pure Java. |
||||
ocv_list_filterout(opencv_test_java_files ".*OpenCVTestCase.*") |
||||
ocv_list_filterout(opencv_test_java_files ".*OpenCVTestRunner.*") |
||||
ocv_list_filterout(opencv_test_java_files "OpenCVTest(Case|Runner).java") |
||||
# These files aren't for desktop Java. |
||||
ocv_list_filterout(opencv_test_java_files ".*android.*") |
||||
ocv_list_filterout(opencv_test_java_files "/android/") |
||||
|
||||
# These are files updated for pure Java. |
||||
file(GLOB_RECURSE modified_files RELATIVE "${java_source_dir}" "${java_source_dir}/src/*") |
||||
ocv_list_filterout(modified_files ".svn") |
||||
ocv_list_filterout(modified_files ".*#.*") |
||||
|
||||
# These are extra jars needed to run the tests. |
||||
file(GLOB_RECURSE lib_files RELATIVE "${java_source_dir}" "${java_source_dir}/lib/*") |
||||
ocv_list_filterout(lib_files ".svn") |
||||
ocv_list_filterout(lib_files ".*#.*") |
||||
file(GLOB_RECURSE lib_files RELATIVE "${java_source_dir}" "${java_source_dir}/lib/*.jar") |
||||
|
||||
# copy sources out from the build tree |
||||
set(opencv_test_java_file_deps "") |
||||
foreach(f ${opencv_test_java_files}) |
||||
add_custom_command( |
||||
OUTPUT "${opencv_test_java_bin_dir}/${f}" |
||||
COMMAND ${CMAKE_COMMAND} -E copy "${android_source_dir}/${f}" "${opencv_test_java_bin_dir}/${f}" |
||||
MAIN_DEPENDENCY "${android_source_dir}/${f}" |
||||
COMMENT "Copying ${f}") |
||||
add_custom_command(OUTPUT "${opencv_test_java_bin_dir}/${f}" |
||||
COMMAND ${CMAKE_COMMAND} -E copy "${android_source_dir}/${f}" "${opencv_test_java_bin_dir}/${f}" |
||||
DEPENDS "${android_source_dir}/${f}" |
||||
COMMENT "Copying ${f}" |
||||
) |
||||
list(APPEND opencv_test_java_file_deps "${android_source_dir}/${f}" "${opencv_test_java_bin_dir}/${f}") |
||||
endforeach() |
||||
|
||||
# Overwrite select Android sources with Java-specific sources. |
||||
# Also, copy over the libs we'll need for testing. |
||||
foreach(f ${modified_files} ${lib_files}) |
||||
add_custom_command( |
||||
OUTPUT "${opencv_test_java_bin_dir}/${f}" |
||||
COMMAND ${CMAKE_COMMAND} -E copy "${java_source_dir}/${f}" "${opencv_test_java_bin_dir}/${f}" |
||||
MAIN_DEPENDENCY "${java_source_dir}/${f}" |
||||
COMMENT "Copying ${f}") |
||||
list(APPEND opencv_test_java_file_deps "${java_source_dir}/${f}") |
||||
add_custom_command(OUTPUT "${opencv_test_java_bin_dir}/${f}" |
||||
COMMAND ${CMAKE_COMMAND} -E copy "${java_source_dir}/${f}" "${opencv_test_java_bin_dir}/${f}" |
||||
DEPENDS "${java_source_dir}/${f}" |
||||
COMMENT "Copying ${f}" |
||||
) |
||||
list(APPEND opencv_test_java_file_deps "${java_source_dir}/${f}" "${opencv_test_java_bin_dir}/${f}") |
||||
endforeach() |
||||
|
||||
# Copy the OpenCV jar after it has been generated. |
||||
add_custom_command( |
||||
OUTPUT "${opencv_test_java_bin_dir}/bin/${JAR_NAME}" |
||||
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/bin/${JAR_NAME}" "${opencv_test_java_bin_dir}/bin/${JAR_NAME}" |
||||
COMMENT "Copying the OpenCV jar") |
||||
add_custom_target(copy_opencv_jar ALL SOURCES "${opencv_test_java_bin_dir}/bin/${JAR_NAME}") |
||||
# ${the_module} is the target for the Java jar. |
||||
add_dependencies(copy_opencv_jar ${the_module}) |
||||
add_custom_command(OUTPUT "${opencv_test_java_bin_dir}/bin/${JAR_NAME}" |
||||
COMMAND ${CMAKE_COMMAND} -E copy "${JAR_FILE}" "${opencv_test_java_bin_dir}/bin/${JAR_NAME}" |
||||
DEPENDS "${JAR_FILE}" |
||||
COMMENT "Copying the OpenCV jar" |
||||
) |
||||
|
||||
# Copy the ant build file. |
||||
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/build.xml" DESTINATION "${opencv_test_java_bin_dir}") |
||||
add_custom_command(OUTPUT "${opencv_test_java_bin_dir}/build.xml" |
||||
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/build.xml" "${opencv_test_java_bin_dir}/build.xml" |
||||
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/build.xml" |
||||
COMMENT "Copying build.xml" |
||||
) |
||||
|
||||
# Create a script for running the Java tests and place it in build/bin. |
||||
if(WIN32) |
||||
file(WRITE "${CMAKE_BINARY_DIR}/bin/opencv_test_java.cmd" "cd ${opencv_test_java_bin_dir}\nset PATH=${EXECUTABLE_OUTPUT_PATH}/Release;%PATH%\nant -DjavaLibraryPath=${EXECUTABLE_OUTPUT_PATH}/Release buildAndTest") |
||||
file(WRITE "${CMAKE_BINARY_DIR}/bin/opencv_test_java_D.cmd" "cd ${opencv_test_java_bin_dir}\nset PATH=${EXECUTABLE_OUTPUT_PATH}/Debug;%PATH%\nant -DjavaLibraryPath=${EXECUTABLE_OUTPUT_PATH}/Debug buildAndTest") |
||||
else() |
||||
file(WRITE "${CMAKE_BINARY_DIR}/bin/opencv_test_java.sh" "cd ${opencv_test_java_bin_dir};\nant -DjavaLibraryPath=${LIBRARY_OUTPUT_PATH} buildAndTest;\ncd -") |
||||
endif() |
||||
#if(WIN32) |
||||
#file(WRITE "${CMAKE_BINARY_DIR}/bin/opencv_test_java.cmd" "cd ${opencv_test_java_bin_dir}\nset PATH=${EXECUTABLE_OUTPUT_PATH}/Release;%PATH%\nant -DjavaLibraryPath=${EXECUTABLE_OUTPUT_PATH}/Release buildAndTest") |
||||
#file(WRITE "${CMAKE_BINARY_DIR}/bin/opencv_test_java_D.cmd" "cd ${opencv_test_java_bin_dir}\nset PATH=${EXECUTABLE_OUTPUT_PATH}/Debug;%PATH%\nant -DjavaLibraryPath=${EXECUTABLE_OUTPUT_PATH}/Debug buildAndTest") |
||||
#else() |
||||
#file(WRITE "${CMAKE_BINARY_DIR}/bin/opencv_test_java.sh" "cd ${opencv_test_java_bin_dir};\nant -DjavaLibraryPath=${LIBRARY_OUTPUT_PATH} buildAndTest;\ncd -") |
||||
#endif() |
||||
|
||||
add_custom_command(OUTPUT "${opencv_test_java_bin_dir}/build/jar/opencv-test.jar" |
||||
COMMAND "${ANT_EXECUTABLE}" build |
||||
WORKING_DIRECTORY "${opencv_test_java_bin_dir}" |
||||
DEPENDS ${opencv_test_java_file_deps} "${opencv_test_java_bin_dir}/build.xml" "${CMAKE_CURRENT_SOURCE_DIR}/build.xml" "${JAR_FILE}" "${opencv_test_java_bin_dir}/bin/${JAR_NAME}" |
||||
COMMENT "Build Java tests" |
||||
) |
||||
|
||||
add_custom_target(${PROJECT_NAME} ALL SOURCES ${opencv_test_java_file_deps}) |
||||
add_dependencies(opencv_tests ${PROJECT_NAME}) |
||||
add_custom_target(${PROJECT_NAME} ALL SOURCES "${opencv_test_java_bin_dir}/build/jar/opencv-test.jar") |
||||
add_dependencies(${PROJECT_NAME} ${the_module}) |
||||
|
||||
Loading…
Reference in new issue