From 9a76573172f6493e5633f900a4a4ecf4c695e875 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 9 Oct 2012 18:29:25 +0400 Subject: [PATCH] Auto expand of OpenCV version for Android Library prject and some documentation pages added. --- .../android_binary_package/android_dev_intro.rst | 2 +- .../introduction/windows_install/windows_install.rst | 2 +- modules/java/CMakeLists.txt | 12 ++++-------- modules/java/android_lib/.classpath | 14 +++++++------- modules/java/android_lib/.project | 2 +- modules/java/android_lib/AndroidManifest.xml | 4 ++-- 6 files changed, 16 insertions(+), 20 deletions(-) diff --git a/doc/tutorials/introduction/android_binary_package/android_dev_intro.rst b/doc/tutorials/introduction/android_binary_package/android_dev_intro.rst index db109ad..5dd1c40 100644 --- a/doc/tutorials/introduction/android_binary_package/android_dev_intro.rst +++ b/doc/tutorials/introduction/android_binary_package/android_dev_intro.rst @@ -323,7 +323,7 @@ We recommend the approach based on Eclipse :abbr:`CDT(C/C++ Development Tooling) :alt: Eclipse About :align: center -.. important:: OpenCV for Android 2.4.2 package contains sample projects pre-configured CDT Builders. For your own projects follow the steps below. +.. important:: OpenCV for Android package since version 2.4.2 contains sample projects pre-configured CDT Builders. For your own projects follow the steps below. #. Define the ``NDKROOT`` environment variable containing the path to Android NDK in your system (e.g. ``"X:\\Apps\\android-ndk-r8"`` or ``"/opt/android-ndk-r8"``). **On Windows** an environment variable can be set via :guilabel:`My Computer -> Properties -> Advanced -> Environment variables` and restarting Eclipse. diff --git a/doc/tutorials/introduction/windows_install/windows_install.rst b/doc/tutorials/introduction/windows_install/windows_install.rst index bf48f89..f6397ae 100644 --- a/doc/tutorials/introduction/windows_install/windows_install.rst +++ b/doc/tutorials/introduction/windows_install/windows_install.rst @@ -16,7 +16,7 @@ Installation by using the pre-built libraries 1. Open up a web browser and go to: http://sourceforge.net/projects/opencvlibrary/files/opencv-win/ -#. Open the folder for the latest version (currently this is 2.4.2). +#. Open the folder for the latest version (currently this is |release|). #. Choose a build you want to use and download it. The naming conventions used will show what kind of support they offer. For example: diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt index 4b23eff..7b8d0c1 100644 --- a/modules/java/CMakeLists.txt +++ b/modules/java/CMakeLists.txt @@ -210,13 +210,7 @@ if(ANDROID) list(REMOVE_ITEM android_lib_project_files "${ANDROID_MANIFEST_FILE}") foreach(f ${android_lib_project_files}) if(NOT f MATCHES "\\.svn") - add_custom_command( - OUTPUT "${OpenCV_BINARY_DIR}/${f}" - COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/android_lib/${f}" "${OpenCV_BINARY_DIR}/${f}" - MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/android_lib/${f}" - COMMENT "Generating ${f}" - ) - + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/android_lib/${f}" "${OpenCV_BINARY_DIR}/${f}") list(APPEND lib_proj_files "${OpenCV_BINARY_DIR}/${f}") if(NOT f MATCHES "jni/.+") @@ -250,11 +244,13 @@ if(ANDROID) COMMAND ${CMAKE_COMMAND} -E remove ${lib_target_files} COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/android_lib/${ANDROID_MANIFEST_FILE}" "${OpenCV_BINARY_DIR}/${ANDROID_MANIFEST_FILE}" COMMAND ${ANDROID_EXECUTABLE} --silent create lib-project --path \"${OpenCV_BINARY_DIR}\" --target \"${lib_target_sdk_target}\" --name OpenCV --package org.opencv 2>\"${CMAKE_CURRENT_BINARY_DIR}/create_lib_project.log\" - COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/android_lib/${ANDROID_MANIFEST_FILE}" "${OpenCV_BINARY_DIR}/${ANDROID_MANIFEST_FILE}" MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/android_lib/${ANDROID_MANIFEST_FILE}" DEPENDS ${lib_proj_files} COMMENT "Generating OpenCV Android library project. SDK target: ${lib_target_sdk_target}" ) + + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/android_lib/${ANDROID_MANIFEST_FILE}" "${OpenCV_BINARY_DIR}/${ANDROID_MANIFEST_FILE}") + install(FILES "${OpenCV_BINARY_DIR}/${ANDROID_PROJECT_PROPERTIES_FILE}" DESTINATION ${JAVA_INSTALL_ROOT} COMPONENT main) install(FILES "${OpenCV_BINARY_DIR}/${ANDROID_MANIFEST_FILE}" DESTINATION ${JAVA_INSTALL_ROOT} COMPONENT main) # creating empty 'gen' and 'res' folders diff --git a/modules/java/android_lib/.classpath b/modules/java/android_lib/.classpath index dd19757..9884576 100644 --- a/modules/java/android_lib/.classpath +++ b/modules/java/android_lib/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/modules/java/android_lib/.project b/modules/java/android_lib/.project index 11eed73..174e529 100644 --- a/modules/java/android_lib/.project +++ b/modules/java/android_lib/.project @@ -1,6 +1,6 @@ - OpenCV Library - 2.4.2 + OpenCV Library - @OPENCV_VERSION_MAJOR@.@OPENCV_VERSION_MINOR@.@OPENCV_VERSION_PATCH@ diff --git a/modules/java/android_lib/AndroidManifest.xml b/modules/java/android_lib/AndroidManifest.xml index 86008bf..3559718 100644 --- a/modules/java/android_lib/AndroidManifest.xml +++ b/modules/java/android_lib/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="@OPENCV_VERSION_MAJOR@@OPENCV_VERSION_MINOR@@OPENCV_VERSION_PATCH@" + android:versionName="@OPENCV_VERSION_MAJOR@.@OPENCV_VERSION_MINOR@.@OPENCV_VERSION_PATCH@" -- 2.7.4