Commit Graph

284 Commits

Author SHA1 Message Date
Andrey Kamaev
2bf56961c0 Merge pull request #204 from asmorkalov/manager_internal_lib
Feature #2565 implementation
2012-12-10 08:07:39 -08:00
Alexander Smorkalov
257d8df1d4 Bug with skiped packages fixed. 2012-12-06 14:11:30 +04:00
Alexander Smorkalov
d2ed8e5f30 Bug #2595 in OpenCV Manager fixed.
OpenCV Manager 2.x marks old 2.4.2 binary package for Tegra as "in use".
The latest version of OpenCV library compatible with platform is used now.
2012-12-05 18:03:42 +04:00
Alexander Smorkalov
4ebcf2b224 GetPublicName function removed for OpenCV LibraryInfo class;
Some OpenCV Manager UI behavior updates;
CMake build fix.
2012-12-05 13:19:28 +04:00
Alexander Smorkalov
0f64f847b2 Info library loading implemeneted. 2012-12-04 16:34:53 +04:00
Alexander Smorkalov
9823b7cd08 Internal version of OpenCV inside OpenCV Manager added to the list of installed packages. 2012-12-04 15:37:27 +04:00
Alexander Smorkalov
a0c504aabc Initial stub for OpenCVLibraryInfo class added. 2012-12-04 15:36:52 +04:00
Alexander Smorkalov
be80ad1607 Native camera warper libraries build improved
Environment variables support added to Android tree path;
Default config updated to use env variable.
2012-12-03 13:25:44 +04:00
Andrey Kamaev
e10ee89ec4 Merge branch 2.4 2012-11-30 19:54:24 +04:00
Andrey Kamaev
f6ca38a579 Adjust Android Manager version from 2.2 to 2.3 2012-11-30 17:09:30 +04:00
Andrey Kamaev
e1a4d22da6 Merge pull request #192 from taka-no-me/ndk_selection_fix
Android: always sort list of NDK toolchains
2012-11-28 07:17:49 -08:00
Andrey Kamaev
cbe22fb5d1 Android: always sort list of NDK toolchains
Order returned by CMake is unreliable but we need clang to go after gcc for
automatic toolchain selection.
2012-11-27 18:16:36 +04:00
Alexander Smorkalov
383e04d9e4 OpenCV Manager build via ninja (Bug #2575) fixed. 2012-11-27 17:30:05 +04:00
Alexander Smorkalov
845e52b676 OpenCV Manager headers refactoring.
All constants moved to android independent header file.
2012-11-22 12:39:06 +04:00
Andrey Kamaev
8579666b03 Merge pull request #171 from asmorkalov:android_8_neon_fix 2012-11-21 14:55:38 +04:00
Andrey Kamaev
24af691843 Merge pull request #168 from asmorkalov:android_42_camera_fix 2012-11-21 14:50:53 +04:00
Alexander Smorkalov
8ecd22ba48 Automatic minsdkversion setup added;
Linker problems on armeabi-v7a+NEON with Android 2.2 fixed;
2012-11-21 14:03:11 +04:00
Alexander Smorkalov
aa4e6a8a83 Issue #2547 Native camera does not work on Google Nexus 7 with Android 4.2 fixed;
Issue #2506 Unnecessary log printouts in OpenCV::camera fixed;
Native camera for MIPS Android 4.1.1 added.
Build script for camera updated.
2012-11-21 11:37:29 +04:00
Andrey Kamaev
7f542e391a Merge branch 2.4
Conflicts:
	android/service/engine/AndroidManifest.xml - use file from 2.4
	modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
	modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4
2012-11-20 19:12:00 +04:00
Andrey Kamaev
4fce5a5e83 Merge pull request #170 from asmorkalov:engine_build_fix 2012-11-20 18:27:43 +04:00
Andrey Kamaev
934b623fa9 Merging pull request #169 from taka-no-me:android-ndk-r8c 2012-11-20 17:56:12 +04:00
Alexander Smorkalov
5b148083fe Libinfo build fix;
Libinfo revision formating fix;
HW dependent VersionCode for Manager implemented.
2012-11-20 17:39:45 +04:00
Andrey Kamaev
ab9311947a Update Android CMake toolchain for NDK r8c 2012-11-20 15:20:04 +04:00
Andrey Kamaev
6cd70c83fb Merge pull request #160 from asmorkalov/android_4_2_manager_fix 2012-11-16 17:44:34 +04:00
Alexander Smorkalov
759863d95c Issue #2537 OpenCV Manager doesn't work on Android 4.2 fixed. 2012-11-16 17:01:25 +04:00
Alexander Smorkalov
1e0bff3268 Issue #2541 make install does not work for Android build fixed. 2012-11-15 11:24:41 +04:00
Andrey Kamaev
0938358002 Merge pull requests #136, #142, #150, #152 from asmorkalov/new_framework_tutorial, asmorkalov/fd_package_fix, asmorkalov/java_test_fix and asmorkalov/engine_build_fix 2012-11-13 19:47:16 +04:00
Alexander Smorkalov
dda2eb0f76 Libinfo build fix;
Libinfo revision formating fix;
HW dependent VersionCode for Manager implemented.
2012-11-12 12:57:09 +04:00
Andrey Kamaev
4d059e9e5b Merge release 2.4.3 2012-11-02 17:58:02 +04:00
Kirill Kornyakov
c5fb2de887 Updated link to OpenCV for Android page in README.android 2012-11-01 22:28:46 +04:00
marina.kolpakova
9b92de9a88 Merge pull request #121 from branch asmorkalov:android_samples_fix 2012-11-01 19:11:53 +04:00
Alexander Smorkalov
fc085d9dbd info library for OpenCV added. 2012-10-31 20:48:37 +04:00
Alexander Smorkalov
a1a2cb0aeb OpenCV Samples testing problems fixed:
Memory leak in color-blob-detection sample fixed;
Default face size in face-detection is set to 20%;
Error handling improved;
Some possible mat leak fixed;
Manager verison and engine interface version incremented to fix incompatibilities;
Docs updated;
2012-10-31 17:24:50 +04:00
Alexander Smorkalov
da31e12fed CMake for OpenCV Manager updated;
Some repo normalization problems fixed;
Deprecated cmake keys removed;
Warning fixed.
2012-10-31 11:47:27 +04:00
Andrey Kamaev
6211f156e6 Merge 2.4.3-rc 2012-10-24 19:56:27 +04:00
Alexander Smorkalov
e7e14b20cd OpenCV Manager version ++. 2012-10-24 13:25:07 +04:00
Alexander Smorkalov
293063eed3 Code normalization problems fixed.
Rair hangs on library installation fixed.
2012-10-24 12:47:43 +04:00
Alexander Smorkalov
680fba7e0d Repo normalization problems fixed. 2012-10-24 12:46:36 +04:00
Alexander Smorkalov
76bcf72ded 2.4.3 version support added to OpenCV Manager. Docs updated. Samples updated. 2012-10-24 09:51:01 +04:00
Andrey Kamaev
cb66dd8000 Normalize android/scripts/wincfg.cmd.tmpl 2012-10-19 15:06:32 +04:00
Andrey Kamaev
0e7ca71dcc Normalize whitespace in documentation and text files 2012-10-17 21:42:09 +04:00
OpenCV Buildbot
81f826db2b Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Alexander Smorkalov
0c70b45625 Clickable optin turned off. Text disapearing fixed. 2012-10-11 16:27:01 +04:00
Andrey Kamaev
c46affe63e android.toolchain.cmake: restore implicit link with math library for C++ objects
Ticket #2426
2012-10-11 16:10:01 +04:00
Alexander Smorkalov
eb189713ae Issue #2431 OpenCV Manager UI crashes at start fixed.
Data rase in OpenCV Manager connection fixed.
2012-10-11 14:39:42 +04:00
Alexander Smorkalov
306ed9801a Issue #2284 BaseLoaderCallback requires use of Activity fixed. 2012-10-10 11:44:01 +04:00
Alexander Smorkalov
705b4724cb ABI Compatibility config generator bug fix. 2012-10-09 18:30:58 +04:00
Alexander Smorkalov
9ab19691d4 OpenCV Manager documentation updated.
Diagram rendering script updated.
2012-10-09 10:34:40 +04:00
Alexander Smorkalov
601b87e3ed Java tests updated. Build fix. 2012-10-08 14:37:59 +04:00
Alexander Smorkalov
9085fbe1e0 Native cameras build script output colorized. 2012-10-05 18:00:20 +04:00
Alexander Smorkalov
d40a2c28c5 Ant build.xml and deps added. 2012-10-02 16:21:53 +04:00
Alexander Smorkalov
5ffbcf1e16 MIPS arch support added to OpenCV manager;
Internal OpenCV library in OpenCV Manager support added;
Unit tests improved, platform specific tests added, MIPS related tests added;
Code refactoring done.
2012-10-02 16:21:53 +04:00
Alexander Smorkalov
ad58e96581 Automation for build and test OpenCV Manager on several devices added. 2012-10-02 16:21:53 +04:00
Alexander Smorkalov
d64d76086e MIPS architecture support added. Native camera library built for MIPS device. 2012-10-02 16:21:53 +04:00
Alexander Smorkalov
b1d14f766d Bug with several "in use" labels fixed in OpenCV Manager UI. 2012-09-18 11:07:26 +04:00
Alexander Smorkalov
0105d0a241 "in use" label update fix in OpenCV Manager UI. 2012-09-18 11:07:26 +04:00
Alexander Smorkalov
92b0cc541e Minor bug fix in building all native camera libs for android 2012-09-18 11:07:26 +04:00
Alexander Smorkalov
ada27b54eb NDK detection bug fix. 2012-09-18 11:07:26 +04:00
Alexander Smorkalov
dc5c7ee68f Link to OpenCV website updated. Full Manager version added to UI. Screen orientation fixed. 2012-09-14 17:45:29 +04:00
Alexander Smorkalov
d55e114f96 Issue #2357 OpenCV manager fails to determine hardware platfrom on Tegra2 fixed. 2012-09-14 17:45:29 +04:00
Vsevolod Glumov
415636a677 Fixed a minor issue in OpenCV4Android Reference. 2012-09-14 17:06:59 +04:00
Vsevolod Glumov
1052a0b4eb Fixed some language issues in OpenCV4Android Reference. 2012-09-14 11:10:53 +04:00
Andrey Kamaev
1e69d47ba5 Remove -g from Android complier flags in release mode (used by NDK but inconvenient for CMake) 2012-09-13 20:27:54 +04:00
Alexander Smorkalov
afe30d0f8a Native camera fix for Nexus 7 with Android JB. Camera build script updated. 2012-09-12 14:29:00 +04:00
Alexander Smorkalov
ccafed3d90 ABI compatibility check config generator updated. Command line params added. NDK searching added. 2012-09-12 11:18:28 +04:00
Alexander Smorkalov
ec8b79cc91 Small camera build script improvements. 2012-09-12 11:18:28 +04:00
Alexander Smorkalov
f22a3af483 Issue #2345 Adapt OpenCV Manager UI for different screen resolution partially fixed. Layout for small resolution added.
Layout for small display resolution added.
2012-09-11 17:10:26 +04:00
Alexander Smorkalov
a699594854 Issue # 2344 OpenCV Manager doesn't tell which pack is used fixed. 2012-09-11 17:10:26 +04:00
Alexander Smorkalov
43a401ba19 OpenCV Manager version incremented. 2012-09-10 11:37:36 +04:00
Alexander Smorkalov
1de829c359 abi-compatibility-check tool configuration script for adnroid added. 2012-09-10 11:37:36 +04:00
Andrey Kamaev
4bd2c6b50d Android toolchain: added fixes/workarounds for NDK r8b and NDK r6 bugs 2012-09-07 18:27:47 +04:00
Alexander Smorkalov
b16b50d61b Build script for all native cameras added. 2012-09-07 17:22:48 +04:00
Alexander Smorkalov
db3a35f901 Issue #2248 OpenCV manager fails to determine hardware platfrom on Android Emulator fixed.
Search keys for /proc/sysinfo updated.
2012-09-07 17:22:48 +04:00
Andrey Kamaev
2cc262bce4 Fix Android CMake toolchain compiler and linker flags 2012-09-06 18:54:38 +04:00
Andrey Kamaev
d3501f1545 Android toolchain: restored explicit include_directories of system /usr/include
It is needed because of explicit STL include paths.
Otherwise some standard headers (like fenv.h) can not not be correctly found by the compiler.
2012-09-05 16:29:05 +04:00
Andrey Kamaev
8325a28d09 Merge branch 'android-toolchain' 2012-09-04 17:10:52 +04:00
Andrey Kamaev
b0c7280978 Android toolchain: protect from changes of NDK_CCACHE on subsequent cmake 2012-09-04 16:33:24 +04:00
Andrey Kamaev
53d219c857 Improved CMake warnings about known problems of Android NDKs 2012-09-04 16:21:44 +04:00
Alexander Smorkalov
a08290d843 Merge branch 'master' of git://code.opencv.org/opencv 2012-09-04 10:50:35 +04:00
Alexander Smorkalov
457c878538 Issue #2270 OpenCV Manager fails with JNI error fixed.
Local reference table overflow in JNI code fixed.
2012-09-04 10:39:44 +04:00
Andrey Kamaev
a3125c0b8d Added C++ runtime search for standalone toolchain 2012-09-04 02:08:27 +04:00
Andrey Kamaev
ac808b51a5 Fixing STL support in case of standalone toolchain 2012-09-03 19:13:51 +04:00
Andrey Kamaev
c91850ec2e Fix executable and C objects linking 2012-09-03 18:42:13 +04:00
Andrey Kamaev
e402bb496d Add support for all NDK runtimes 2012-09-03 03:54:06 +04:00
Andrey Kamaev
21a536f999 Add NDK release detection into CMake toolchain 2012-09-02 19:56:12 +04:00
Andrey Kamaev
c9dbb0d314 Several small fixes in Android CMake toolchain
* fix formatting
* honor Windows-style paths
* suppress warnings inside try_compile
* correct caching of toolchain variables
2012-09-02 18:59:41 +04:00
Andrey Kamaev
e9392d1466 Fix Android build with cmake 2.6.3 2012-08-30 00:23:41 +04:00
Andrey Kamaev
0adbead654 Android toolchain: fix CCache program search 2012-08-28 20:39:10 +04:00
Andrey Kamaev
d421ec26e2 Android toolchain: fixed ccache search 2012-08-28 13:26:57 +04:00
Andrey Kamaev
bbbe77e05e Fix Android build for mips platform 2012-08-27 20:16:54 +04:00
Andrey Kamaev
c0786e9d33 Support for the gold linker (NDK r8b is required) 2012-08-27 19:45:24 +04:00
Andrey Kamaev
bcf8dd510f Added CCache support to Android build
To speed up rebuilds, define the NDK_CCACHE environment or CMake variable
to the path to your ccache binary. When declared, the android.cmake.toolchain
automatically uses CCache when compiling any C/C++ source file. For example:

export NDK_CCACHE=ccache
2012-08-27 18:22:00 +04:00
Andrey Kamaev
6da9b9f137 Android toolchain: libstdc++ and libsupc are removed from explicit link libraries
# Please enter the commit message for your changes. Lines starting
# with '#' will be kept; you may remove them yourself if you want to.
# An empty message aborts the commit.
# On branch master
# Your branch is ahead of 'origin/master' by 1 commit.
#
# Changes to be committed:
#   (use "git reset HEAD^1 <file>..." to unstage)
#
#	modified:   android/android.toolchain.cmake
#
2012-08-17 16:23:57 +04:00
Andrey Pavlenko
c1571e21ff android tutorial v2, initial draft commit 2012-08-07 17:27:48 +04:00
Andrey Kamaev
5100ca7508 svn repository web references are replaced with links to git 2012-08-07 14:30:36 +04:00
Andrey Kamaev
bc227ab075 Intermediate files generated by Android toolchain are moved into CMakeFiles subfolder 2012-08-06 19:10:55 +04:00
andrey.kamaev
5b4297cccf Android CMake toolchain is updated for NDK r8b 2012-08-03 17:00:46 +04:00
Alexander Smorkalov
ddcc839519 Tegra3 package support enabled;
Version code incremented;
2012-07-16 07:56:12 +00:00
Andrey Kamaev
bb51626573 Build pdf for Android Manager documentation 2012-07-13 13:00:29 +00:00